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

Rename some processing widget wrappers to better match corresponding c++ classes

Browse Source
This commit is contained in:
Nyall Dawson 2017-08-23 00:16:42 +10:00
parent c119c286eb
commit 367aba7059
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
python/plugins/processing/gui/wrappers.py
View File

@ -521,7 +521,7 @@ class FixedTableWidgetWrapper(WidgetWrapper):
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:
@ -766,7 +766,7 @@ class RasterWidgetWrapper(MapLayerWidgetWrapper):
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():
@ -792,7 +792,7 @@ class SelectionWidgetWrapper(WidgetWrapper):
return self.widget.currentData() return self.widget.currentData()
class VectorWidgetWrapper(WidgetWrapper): class FeatureSourceWidgetWrapper(WidgetWrapper):
NOT_SELECTED = '[Not selected]' NOT_SELECTED = '[Not selected]'
@ -1082,7 +1082,7 @@ class ExpressionWidgetWrapper(WidgetWrapper):
return self.comboValue(validator) return self.comboValue(validator)
class TableWidgetWrapper(WidgetWrapper): class VectorLayerWidgetWrapper(WidgetWrapper):
NOT_SELECTED = '[Not selected]' NOT_SELECTED = '[Not selected]'
@ -1407,23 +1407,23 @@ class WidgetWrapperFactory:
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':

8
python/plugins/processing/tests/GuiTest.py
View File

@ -90,13 +90,13 @@ class WrappersTest(unittest.TestCase):
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)
@ -105,13 +105,13 @@ class WrappersTest(unittest.TestCase):
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)