Skip to content

Commit

Permalink
Rename some processing widget wrappers to better match corresponding …
Browse files Browse the repository at this point in the history 
…c++ classes
  • Loading branch information
@nyalldawson
nyalldawson committed Aug 22, 2017
1 parent c119c28 commit 367aba7
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
16 changes: 8 additions & 8 deletions python/plugins/processing/gui/wrappers.py
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ def value(self):
return self.widget.table return self.widget.table




class MultipleInputWidgetWrapper(WidgetWrapper): class MultipleLayerWidgetWrapper(WidgetWrapper):


def _getOptions(self): def _getOptions(self):
if self.param.layerType() == QgsProcessing.TypeVectorAnyGeometry: if self.param.layerType() == QgsProcessing.TypeVectorAnyGeometry:
Expand Down Expand Up @@ -766,7 +766,7 @@ def selectFile(self):
self.combo.setEditText(filename) self.combo.setEditText(filename)




class SelectionWidgetWrapper(WidgetWrapper): class EnumWidgetWrapper(WidgetWrapper):


def createWidget(self): def createWidget(self):
if self.param.allowMultiple(): if self.param.allowMultiple():
Expand All @@ -792,7 +792,7 @@ def value(self):
return self.widget.currentData() return self.widget.currentData()




class VectorWidgetWrapper(WidgetWrapper): class FeatureSourceWidgetWrapper(WidgetWrapper):


NOT_SELECTED = '[Not selected]' NOT_SELECTED = '[Not selected]'


Expand Down Expand Up @@ -1082,7 +1082,7 @@ def validator(v):
return self.comboValue(validator) return self.comboValue(validator)




class TableWidgetWrapper(WidgetWrapper): class VectorLayerWidgetWrapper(WidgetWrapper):


NOT_SELECTED = '[Not selected]' NOT_SELECTED = '[Not selected]'


Expand Down Expand Up @@ -1407,23 +1407,23 @@ def create_wrapper_from_class(param, dialog, row=0, col=0):
elif param.type() == 'file': elif param.type() == 'file':
wrapper = FileWidgetWrapper wrapper = FileWidgetWrapper
elif param.type() == 'multilayer': elif param.type() == 'multilayer':
wrapper = MultipleInputWidgetWrapper wrapper = MultipleLayerWidgetWrapper
elif param.type() == 'number': elif param.type() == 'number':
wrapper = NumberWidgetWrapper wrapper = NumberWidgetWrapper
elif param.type() == 'raster': elif param.type() == 'raster':
wrapper = RasterWidgetWrapper wrapper = RasterWidgetWrapper
elif param.type() == 'enum': elif param.type() == 'enum':
wrapper = SelectionWidgetWrapper wrapper = EnumWidgetWrapper
elif param.type() == 'string': elif param.type() == 'string':
wrapper = StringWidgetWrapper wrapper = StringWidgetWrapper
elif param.type() == 'expression': elif param.type() == 'expression':
wrapper = ExpressionWidgetWrapper wrapper = ExpressionWidgetWrapper
elif param.type() == 'vector': elif param.type() == 'vector':
wrapper = TableWidgetWrapper wrapper = VectorLayerWidgetWrapper
elif param.type() == 'field': elif param.type() == 'field':
wrapper = TableFieldWidgetWrapper wrapper = TableFieldWidgetWrapper
elif param.type() == 'source': elif param.type() == 'source':
wrapper = VectorWidgetWrapper wrapper = FeatureSourceWidgetWrapper
elif param.type() == 'band': elif param.type() == 'band':
wrapper = BandWidgetWrapper wrapper = BandWidgetWrapper
elif param.type() == 'layer': elif param.type() == 'layer':
Expand Down
8 changes: 4 additions & 4 deletions python/plugins/processing/tests/GuiTest.py
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@ def testFile(self):
self.checkConstructWrapper(QgsProcessingParameterFile('test'), FileWidgetWrapper) self.checkConstructWrapper(QgsProcessingParameterFile('test'), FileWidgetWrapper)


def testMultiInput(self): def testMultiInput(self):
self.checkConstructWrapper(QgsProcessingParameterMultipleLayers('test'), MultipleInputWidgetWrapper) self.checkConstructWrapper(QgsProcessingParameterMultipleLayers('test'), MultipleLayerWidgetWrapper)


def testRasterInput(self): def testRasterInput(self):
self.checkConstructWrapper(QgsProcessingParameterRasterLayer('test'), RasterWidgetWrapper) self.checkConstructWrapper(QgsProcessingParameterRasterLayer('test'), RasterWidgetWrapper)


def testEnum(self): def testEnum(self):
self.checkConstructWrapper(QgsProcessingParameterEnum('test'), SelectionWidgetWrapper) self.checkConstructWrapper(QgsProcessingParameterEnum('test'), EnumWidgetWrapper)


def testString(self): def testString(self):
self.checkConstructWrapper(QgsProcessingParameterString('test'), StringWidgetWrapper) self.checkConstructWrapper(QgsProcessingParameterString('test'), StringWidgetWrapper)
Expand All @@ -105,13 +105,13 @@ def testExpression(self):
self.checkConstructWrapper(QgsProcessingParameterExpression('test'), ExpressionWidgetWrapper) self.checkConstructWrapper(QgsProcessingParameterExpression('test'), ExpressionWidgetWrapper)


def testVector(self): def testVector(self):
self.checkConstructWrapper(QgsProcessingParameterVectorLayer('test'), TableWidgetWrapper) self.checkConstructWrapper(QgsProcessingParameterVectorLayer('test'), VectorLayerWidgetWrapper)


def testField(self): def testField(self):
self.checkConstructWrapper(QgsProcessingParameterField('test'), TableFieldWidgetWrapper) self.checkConstructWrapper(QgsProcessingParameterField('test'), TableFieldWidgetWrapper)


def testSource(self): def testSource(self):
self.checkConstructWrapper(QgsProcessingParameterFeatureSource('test'), VectorWidgetWrapper) self.checkConstructWrapper(QgsProcessingParameterFeatureSource('test'), FeatureSourceWidgetWrapper)


def testSource(self): def testSource(self):
self.checkConstructWrapper(QgsProcessingParameterBand('test'), BandWidgetWrapper) self.checkConstructWrapper(QgsProcessingParameterBand('test'), BandWidgetWrapper)
Expand Down

0 comments on commit 367aba7

Please sign in to comment.