sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-15 00:07:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use signals to avoid storing arrows in graphic item

Browse Source
This commit is contained in:
Nyall Dawson 2020-03-02 11:36:14 +10:00
parent 0df4e35a02
commit 6c98448a7f
2 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
python/plugins/processing/modeler/ModelerGraphicItem.py
View File

@ -23,7 +23,7 @@ __copyright__ = '(C) 2012, Victor Olaya'
import os
from qgis.PyQt.QtCore import Qt, QPointF, QRectF
from qgis.PyQt.QtCore import Qt, QPointF, QRectF, pyqtSignal
from qgis.PyQt.QtGui import QFont, QFontMetricsF, QPen, QBrush, QColor, QPicture, QPainter, QPalette
from qgis.PyQt.QtWidgets import QApplication, QGraphicsItem, QMessageBox, QMenu
from qgis.PyQt.QtSvg import QSvgRenderer
@ -54,6 +54,9 @@ class ModelerGraphicItem(QgsModelComponentGraphicItem):
BUTTON_WIDTH = 16
BUTTON_HEIGHT = 16
repaintArrows = pyqtSignal()
updateArrowPaths = pyqtSignal()
def __init__(self, element, model):
super().__init__(element, model, None)
self.box_width = ModelerGraphicItem.BOX_WIDTH
@ -63,7 +66,6 @@ class ModelerGraphicItem(QgsModelComponentGraphicItem):
self.pixmap = None
self.picture = None
self.hover_over_item = False
self.arrows = []
svg = QSvgRenderer(os.path.join(pluginPath, 'images', 'edit.svg'))
picture = QPicture()
@ -88,9 +90,6 @@ class ModelerGraphicItem(QgsModelComponentGraphicItem):
self.deleteButton = QgsModelDesignerFlatButtonGraphicItem(self, picture, pt)
self.deleteButton.clicked.connect(self.removeComponent)
def addArrow(self, arrow):
self.arrows.append(arrow)
def boundingRect(self):
fm = QFontMetricsF(self.item_font)
unfolded = isinstance(self.component(),
@ -123,7 +122,7 @@ class ModelerGraphicItem(QgsModelComponentGraphicItem):
if self.hover_over_item:
self.hover_over_item = False
self.update()
self.repaintArrows()
self.repaintArrows.emit()
def updateToolTip(self, event):
prev_status = self.hover_over_item
@ -135,7 +134,7 @@ class ModelerGraphicItem(QgsModelComponentGraphicItem):
self.hover_over_item = False
if self.hover_over_item != prev_status:
self.update()
self.repaintArrows()
self.repaintArrows.emit()
def getAdjustedText(self, text):
fm = QFontMetricsF(self.item_font)
@ -256,14 +255,9 @@ class ModelerGraphicItem(QgsModelComponentGraphicItem):
else:
return QPointF(0, 0)
def repaintArrows(self):
for arrow in self.arrows:
arrow.update()
def itemChange(self, change, value):
if change == QGraphicsItem.ItemPositionHasChanged:
for arrow in self.arrows:
arrow.updatePath()
self.updateArrowPaths.emit()
self.component().setPosition(self.pos())
# also need to update the model's stored component's position
@ -275,7 +269,7 @@ class ModelerGraphicItem(QgsModelComponentGraphicItem):
self.model().childAlgorithm(self.component().childId()).modelOutput(
self.component().name()).setPosition(self.pos())
elif change == QGraphicsItem.ItemSelectedChange:
self.repaintArrows()
self.repaintArrows.emit()
return super().itemChange(change, value)
@ -398,8 +392,8 @@ class ModelerChildAlgorithmGraphicItem(ModelerGraphicItem):
pt = self.getLinkPointForOutput(-1)
pt = QPointF(0, pt.y())
self.outButton.position = pt
for arrow in self.arrows:
arrow.updatePath()
self.updateArrowPaths.emit()
self.update()
def foldOutput(self, folded):
@ -407,8 +401,7 @@ class ModelerChildAlgorithmGraphicItem(ModelerGraphicItem):
# also need to update the model's stored component
self.model().childAlgorithm(self.component().childId()).setOutputsCollapsed(folded)
self.prepareGeometryChange()
for arrow in self.arrows:
arrow.updatePath()
self.updateArrowPaths.emit()
self.update()
def editComponent(self):

34
python/plugins/processing/modeler/ModelerScene.py
View File

@ -129,8 +129,12 @@ class ModelerScene(QgsModelGraphicsScene):
input_item = self.paramItems[input_name]
parent_item = self.paramItems[parent_name]
arrow = ModelerArrowItem(parent_item, -1, input_item, -1)
input_item.addArrow(arrow)
parent_item.addArrow(arrow)
input_item.repaintArrows.connect(arrow.update)
input_item.updateArrowPaths.connect(arrow.updatePath)
parent_item.repaintArrows.connect(arrow.update)
parent_item.updateArrowPaths.connect(arrow.updatePath)
arrow.setPenStyle(Qt.DotLine)
arrow.updatePath()
self.addItem(arrow)
@ -159,16 +163,25 @@ class ModelerScene(QgsModelGraphicsScene):
sourceItems = self.getItemsFromParamValue(source, alg.childId(), context)
for sourceItem, sourceIdx in sourceItems:
arrow = ModelerArrowItem(sourceItem, sourceIdx, self.algItems[alg.childId()], idx)
sourceItem.addArrow(arrow)
self.algItems[alg.childId()].addArrow(arrow)
sourceItem.repaintArrows.connect(arrow.update)
sourceItem.updateArrowPaths.connect(arrow.updatePath)
self.algItems[alg.childId()].repaintArrows.connect(arrow.update)
self.algItems[alg.childId()].updateArrowPaths.connect(arrow.updatePath)
arrow.updatePath()
self.addItem(arrow)
idx += 1
for depend in alg.dependencies():
arrow = ModelerArrowItem(self.algItems[depend], -1,
self.algItems[alg.childId()], -1)
self.algItems[depend].addArrow(arrow)
self.algItems[alg.childId()].addArrow(arrow)
self.algItems[depend].repaintArrows.connect(arrow.update)
self.algItems[depend].updateArrowPaths.connect(arrow.updatePath)
self.algItems[alg.childId()].repaintArrows.connect(arrow.update)
self.algItems[alg.childId()].updateArrowPaths.connect(arrow.updatePath)
arrow.updatePath()
self.addItem(arrow)
@ -201,8 +214,13 @@ class ModelerScene(QgsModelGraphicsScene):
outputItems[key] = item
arrow = ModelerArrowItem(self.algItems[alg.childId()], idx, item,
-1)
self.algItems[alg.childId()].addArrow(arrow)
item.addArrow(arrow)
self.algItems[alg.childId()].repaintArrows.connect(arrow.update)
self.algItems[alg.childId()].updateArrowPaths.connect(arrow.updatePath)
item.repaintArrows.connect(arrow.update)
item.updateArrowPaths.connect(arrow.updatePath)
arrow.updatePath()
self.addItem(arrow)
else: