Skip to content

Commit 8a2f150

Browse files
volayavolaya
committedAug 14, 2014
[processing] renamed Input and Output classes in modeler, to avoid confusion
·
ltr-3_40archive/master_2
1 parent e02f004 commit 8a2f150

File tree

4 files changed

+18
-21
lines changed

4 files changed

+18
-21
lines changed
 

‎python/plugins/processing/modeler/ModelerAlgorithm.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,11 @@
3939
GeoAlgorithmExecutionException
4040
from processing.gui.Help2Html import getHtmlFromHelpFile
4141
from processing.modeler.ModelerUtils import ModelerUtils
42-
from processing.core.parameters import ParameterRaster
43-
from processing.core.parameters import ParameterDataObject
44-
from processing.core.parameters import ParameterExtent
45-
from processing.core.parameters import ParameterMultipleInput
46-
from processing.core.parameters import ParameterVector
42+
from processing.core.parameters import *
4743
from processing.tools import dataobjects
4844

4945

50-
class Input():
46+
class ModelerParameter():
5147

5248
def __init__(self, param=None, pos=None):
5349
self.param = param
@@ -58,10 +54,10 @@ def todict(self):
5854

5955
@staticmethod
6056
def fromdict(d):
61-
return Input(d["param"], d["pos"])
57+
return ModelerParameter(d["param"], d["pos"])
6258

6359

64-
class Output():
60+
class ModelerOutput():
6561

6662
def __init__(self, description=""):
6763
self.description = description

‎python/plugins/processing/modeler/ModelerDialog.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
from processing.gui.ParametersDialog import ParametersDialog
3737
from processing.gui.AlgorithmClassification import AlgorithmDecorator
3838
from processing.modeler.ModelerParameterDefinitionDialog import ModelerParameterDefinitionDialog
39-
from processing.modeler.ModelerAlgorithm import ModelerAlgorithm, Input
39+
from processing.modeler.ModelerAlgorithm import ModelerAlgorithm, ModelerParameter
4040
from processing.modeler.ModelerParametersDialog import ModelerParametersDialog
4141
from processing.modeler.ModelerUtils import ModelerUtils
4242
from processing.modeler.ModelerScene import ModelerScene
@@ -365,7 +365,7 @@ def addInputOfType(self, paramType, pos=None):
365365
pos = self.getPositionForParameterItem()
366366
if isinstance(pos, QPoint):
367367
pos = QPointF(pos)
368-
self.alg.addParameter(Input(dlg.param, pos))
368+
self.alg.addParameter(ModelerParameter(dlg.param, pos))
369369
self.repaintModel()
370370
#self.view.ensureVisible(self.scene.getLastParameterItem())
371371
self.hasChanged = True

‎python/plugins/processing/modeler/ModelerGraphicItem.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
import os
3030
from PyQt4 import QtCore, QtGui
31-
from processing.modeler.ModelerAlgorithm import Input, Algorithm, Output
31+
from processing.modeler.ModelerAlgorithm import ModelerParameter, Algorithm, ModelerOutput
3232
from processing.modeler.ModelerParameterDefinitionDialog import \
3333
ModelerParameterDefinitionDialog
3434
from processing.modeler.ModelerParametersDialog import ModelerParametersDialog
@@ -43,12 +43,13 @@ def __init__(self, element, model):
4343
super(ModelerGraphicItem, self).__init__(None, None)
4444
self.model = model
4545
self.element = element
46-
if isinstance(element, Input):
46+
print element.__class__
47+
if isinstance(element, ModelerParameter):
4748
icon = QtGui.QIcon(os.path.dirname(__file__)
4849
+ '/../images/input.png')
4950
self.pixmap = icon.pixmap(20, 20, state=QtGui.QIcon.On)
5051
self.text = element.param.description
51-
elif isinstance(element, Output):
52+
elif isinstance(element, ModelerOutput):
5253
# Output name
5354
icon = QtGui.QIcon(os.path.dirname(__file__)
5455
+ '/../images/output.png')
@@ -63,7 +64,7 @@ def __init__(self, element, model):
6364
self.setFlag(QtGui.QGraphicsItem.ItemSendsGeometryChanges, True)
6465
self.setZValue(1000)
6566

66-
if not isinstance(element, Output):
67+
if not isinstance(element, ModelerOutput):
6768
icon = QtGui.QIcon(os.path.dirname(__file__)
6869
+ '/../images/edit.png')
6970
pt = QtCore.QPointF(ModelerGraphicItem.BOX_WIDTH / 2
@@ -132,7 +133,7 @@ def mouseDoubleClickEvent(self, event):
132133
self.editElement()
133134

134135
def contextMenuEvent(self, event):
135-
if isinstance(self.element, Output):
136+
if isinstance(self.element, ModelerOutput):
136137
return
137138
popupmenu = QtGui.QMenu()
138139
removeAction = popupmenu.addAction('Remove')
@@ -161,7 +162,7 @@ def activateAlgorithm(self):
161162
'Activate them them before trying to activate it.')
162163

163164
def editElement(self):
164-
if isinstance(self.element, Input):
165+
if isinstance(self.element, ModelerParameter):
165166
dlg = ModelerParameterDefinitionDialog(self.model,
166167
param=self.element.param)
167168
dlg.exec_()
@@ -181,7 +182,7 @@ def editElement(self):
181182
self.model.updateModelerView()
182183

183184
def removeElement(self):
184-
if isinstance(self.element, Input):
185+
if isinstance(self.element, ModelerParameter):
185186
if not self.model.removeParameter(self.element.param.name):
186187
QtGui.QMessageBox.warning(None, 'Could not remove element',
187188
'Other elements depend on the selected one.\n'
@@ -217,7 +218,7 @@ def paint(self, painter, option, widget=None):
217218
ModelerGraphicItem.BOX_HEIGHT + 2)
218219
painter.setPen(QtGui.QPen(QtCore.Qt.gray, 1))
219220
color = QtGui.QColor(125, 232, 232)
220-
if isinstance(self.element, Input):
221+
if isinstance(self.element, ModelerParameter):
221222
color = QtGui.QColor(179, 179, 255)
222223
elif isinstance(self.element, Algorithm):
223224
color = QtCore.Qt.white

‎python/plugins/processing/modeler/ModelerParametersDialog.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from PyQt4.QtGui import *
3030
from PyQt4 import QtCore, QtGui, QtWebKit
3131
from processing.modeler.ModelerAlgorithm import ValueFromInput,\
32-
ValueFromOutput, Algorithm, Output
32+
ValueFromOutput, Algorithm, ModelerOutput
3333
from processing.gui.CrsSelectionPanel import CrsSelectionPanel
3434
from processing.gui.MultipleInputPanel import MultipleInputPanel
3535
from processing.gui.FixedTablePanel import FixedTablePanel
@@ -165,7 +165,7 @@ def setupUi(self):
165165
self.webView = QtWebKit.QWebView()
166166

167167
html = None
168-
url = None
168+
url = None
169169
isText, help = self._alg.help()
170170
if help is not None:
171171
if isText:
@@ -467,7 +467,7 @@ def createAlgorithm(self):
467467
if not output.hidden:
468468
name = unicode(self.valueItems[output.name].text())
469469
if name.strip() != '' and name != ModelerParametersDialog.ENTER_NAME:
470-
alg.outputs[output.name] = Output(name)
470+
alg.outputs[output.name] = ModelerOutput(name)
471471

472472
selectedOptions = self.dependenciesPanel.selectedoptions
473473
availableDependencies = self.getAvailableDependencies()

0 commit comments

Comments
 (0)
Please sign in to comment.