kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 20:50:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug Fix: correct Folio List folio display. Bug Fix: correct arrow key move behavior

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4693 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
dfochi
2016-09-05 21:19:00 +00:00
parent f9a0f5a13d
commit b1c465528d
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/bordertitleblock.h
View File

@@ -95,6 +95,8 @@ class BorderTitleBlock : public QObject
QString title() const { return(btb_title_); } QString title() const { return(btb_title_); }
/// @return the value of the title block "Folio" field /// @return the value of the title block "Folio" field
QString folio() const { return(btb_folio_); } QString folio() const { return(btb_folio_); }
/// @return the value of the title block "Folio" field as displayed
QString finalfolio() const { return(btb_final_folio_); }
/// @return the value of the title block "Machine" field /// @return the value of the title block "Machine" field
QString machine() const { return(btb_machine_); } QString machine() const { return(btb_machine_); }
/// @return the value of the title block "Locmach" field /// @return the value of the title block "Locmach" field

4
sources/diagram.cpp
View File

@@ -251,7 +251,7 @@ void Diagram::keyPressEvent(QKeyEvent *e)
if (!this->selectedContent().items(255).isEmpty()) { if (!this->selectedContent().items(255).isEmpty()) {
switch(e -> key()) { switch(e -> key()) {
case Qt::Key_Left: case Qt::Key_Left:
foreach (QGraphicsItem *item, selected_elmts) { foreach (Element *item, selectedContent().elements) {
left_position = item->mapRectFromScene(item->boundingRect()).x(); left_position = item->mapRectFromScene(item->boundingRect()).x();
if (left_position >= this->sceneRect().left() - item->boundingRect().width()) if (left_position >= this->sceneRect().left() - item->boundingRect().width())
return; return;
@@ -260,7 +260,7 @@ void Diagram::keyPressEvent(QKeyEvent *e)
break; break;
case Qt::Key_Right: movement = QPointF(+xGrid, 0.0); break; case Qt::Key_Right: movement = QPointF(+xGrid, 0.0); break;
case Qt::Key_Up: case Qt::Key_Up:
foreach (QGraphicsItem *item, selected_elmts) { foreach (Element *item, selectedContent().elements) {
top_position = item->mapRectFromScene(item->boundingRect()).y(); top_position = item->mapRectFromScene(item->boundingRect()).y();
if (top_position >= this->sceneRect().top() - item->boundingRect().height()) if (top_position >= this->sceneRect().top() - item->boundingRect().height())
return; return;

2
sources/diagramfoliolist.cpp
View File

@@ -92,7 +92,7 @@ void DiagramFolioList::drawBackground(QPainter *p, const QRectF &r)
if (settings.value("genericpanel/folio", true).toBool()){ if (settings.value("genericpanel/folio", true).toBool()){
fillRow(p, row_rect, diagram_list[i] -> border_and_titleblock.author(), fillRow(p, row_rect, diagram_list[i] -> border_and_titleblock.author(),
diagram_list[i] -> title(), diagram_list[i] -> title(),
diagram_list[i] -> border_and_titleblock.folio(), diagram_list[i] -> border_and_titleblock.finalfolio(),
diagram_list[i] -> border_and_titleblock.machine(), diagram_list[i] -> border_and_titleblock.machine(),
diagram_list[i] -> border_and_titleblock.locmach(), diagram_list[i] -> border_and_titleblock.locmach(),
diagram_list[i] -> border_and_titleblock.indexrev(), diagram_list[i] -> border_and_titleblock.indexrev(),

3
sources/diagramview.cpp
View File

@@ -44,6 +44,7 @@
#include "dveventinterface.h" #include "dveventinterface.h"
#include "diagrameventaddelement.h" #include "diagrameventaddelement.h"
#include "QPropertyUndoCommand/qpropertyundocommand.h" #include "QPropertyUndoCommand/qpropertyundocommand.h"
#include "qetshapeitem.h"
/** /**
Constructeur Constructeur
@@ -683,6 +684,8 @@ void DiagramView::scrollOnMovement(QKeyEvent *e){
QList<QGraphicsItem *> selected_elmts = scene->selectedContent().items(255); QList<QGraphicsItem *> selected_elmts = scene->selectedContent().items(255);
QRectF viewed_scene = viewedSceneRect(); QRectF viewed_scene = viewedSceneRect();
foreach (QGraphicsItem *qgi, selected_elmts){ foreach (QGraphicsItem *qgi, selected_elmts){
if (qgraphicsitem_cast<Conductor *>(qgi)) continue;
if (qgraphicsitem_cast<QetShapeItem *>(qgi)) continue;
qreal x = qgi->pos().x(); qreal x = qgi->pos().x();
qreal y = qgi->pos().y(); qreal y = qgi->pos().y();
qreal bottom = viewed_scene.bottom(); qreal bottom = viewed_scene.bottom();