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

Merge pull request #3651 from nirvn/processing_modeler_fix

Browse Source 
[processing] fix broken modeler under pyqt5/python3 (fixes #15734)
This commit is contained in:
volaya 2016-10-21 08:09:03 +02:00 committed by GitHub
commit 81e86accc3
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/plugins/processing/gui/EditRenderingStylesDialog.py
View File

@ -50,7 +50,7 @@ class EditRenderingStylesDialog(BASE, WIDGET):
self.alg = alg.getCopy() self.alg = alg.getCopy()
self.tblStyles.horizontalHeader().setResizeMode(QHeaderView.Stretch) self.tblStyles.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch)
self.setWindowTitle(self.alg.name) self.setWindowTitle(self.alg.name)
self.valueItems = {} self.valueItems = {}

2
python/plugins/processing/modeler/ModelerAlgorithm.py
View File

@ -237,7 +237,7 @@ class ModelerAlgorithm(GeoAlgorithm):
newone.provider = self.provider newone.provider = self.provider
newone.algs = {} newone.algs = {}
for algname, alg in self.algs.iteritems(): for algname, alg in self.algs.items():
newone.algs[algname] = Algorithm() newone.algs[algname] = Algorithm()
newone.algs[algname].__dict__.update(copy.deepcopy(alg.todict())) newone.algs[algname].__dict__.update(copy.deepcopy(alg.todict()))
newone.inputs = copy.deepcopy(self.inputs) newone.inputs = copy.deepcopy(self.inputs)

2
python/plugins/processing/modeler/ModelerArrowItem.py
View File

@ -57,7 +57,7 @@ class ModelerArrowItem(QGraphicsPathItem):
def __init__(self, startItem, startIndex, endItem, endIndex, def __init__(self, startItem, startIndex, endItem, endIndex,
parent=None, scene=None): parent=None, scene=None):
super(ModelerArrowItem, self).__init__(parent, scene) super(ModelerArrowItem, self).__init__(parent)
self.arrowHead = QPolygonF() self.arrowHead = QPolygonF()
self.endIndex = endIndex self.endIndex = endIndex
self.startIndex = startIndex self.startIndex = startIndex

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

@ -43,7 +43,7 @@ class ModelerGraphicItem(QGraphicsItem):
BOX_WIDTH = 200 BOX_WIDTH = 200
def __init__(self, element, model): def __init__(self, element, model):
super(ModelerGraphicItem, self).__init__(None, None) super(ModelerGraphicItem, self).__init__(None)
self.model = model self.model = model
self.element = element self.element = element
if isinstance(element, ModelerParameter): if isinstance(element, ModelerParameter):
@ -337,7 +337,7 @@ class FlatButtonGraphicItem(QGraphicsItem):
HEIGHT = 16 HEIGHT = 16
def __init__(self, icon, position, action): def __init__(self, icon, position, action):
super(FlatButtonGraphicItem, self).__init__(None, None) super(FlatButtonGraphicItem, self).__init__(None)
self.setAcceptHoverEvents(True) self.setAcceptHoverEvents(True)
self.setFlag(QGraphicsItem.ItemIsMovable, False) self.setFlag(QGraphicsItem.ItemIsMovable, False)
self.pixmap = icon.pixmap(self.WIDTH, self.HEIGHT, self.pixmap = icon.pixmap(self.WIDTH, self.HEIGHT,