[processing] Remove ParameterGeometryPredicate

arnaud-morvan · arnaud-morvan · commit 322a565b8b0b · 2016-12-12T15:21:16.000+01:00
diff --git a/python/plugins/processing/core/parameters.py b/python/plugins/processing/core/parameters.py
@@ -1525,46 +1525,6 @@ def fromScriptCode(self, line):
                                    [dataobjects.TYPE_VECTOR_POLYGON], isOptional)
 
 
-class ParameterGeometryPredicate(Parameter):
-
-    predicates = ('intersects',
-                  'contains',
-                  'disjoint',
-                  'equals',
-                  'touches',
-                  'overlaps',
-                  'within',
-                  'crosses')
-
-    def __init__(self, name='', description='', left=None, right=None,
-                 optional=False, enabledPredicates=None):
-        Parameter.__init__(self, name, description, None, optional)
-        self.left = left
-        self.right = right
-        self.value = None
-        self.enabledPredicates = enabledPredicates
-        if self.enabledPredicates is None:
-            self.enabledPredicates = self.predicates
-
-    def getValueAsCommandLineParameter(self):
-        return str(self.value)
-
-    def setValue(self, value):
-        if value is None:
-            if not self.optional:
-                return False
-            self.value = None
-            return True
-        elif len(value) == 0 and not self.optional:
-            return False
-
-        if isinstance(value, str):
-            self.value = value.split(';')  # relates to ModelerAlgorithm.resolveValue
-        else:
-            self.value = value
-        return True
-
-
 paramClasses = [c for c in list(sys.modules[__name__].__dict__.values()) if isclass(c) and issubclass(c, Parameter)]
 
 
diff --git a/python/plugins/processing/gui/BatchPanel.py b/python/plugins/processing/gui/BatchPanel.py
@@ -38,7 +38,6 @@
 from qgis.gui import QgsMessageBar
 
 from processing.gui.BatchOutputSelectionPanel import BatchOutputSelectionPanel
-from processing.gui.GeometryPredicateSelectionPanel import GeometryPredicateSelectionPanel
 
 from processing.core.parameters import ParameterFile
 from processing.core.parameters import ParameterRaster
@@ -50,7 +49,6 @@
 from processing.core.parameters import ParameterSelection
 from processing.core.parameters import ParameterFixedTable
 from processing.core.parameters import ParameterMultipleInput
-from processing.core.parameters import ParameterGeometryPredicate
 
 pluginPath = os.path.split(os.path.dirname(__file__))[0]
 WIDGET, BASE = uic.loadUiType(
diff --git a/python/plugins/processing/gui/GeometryPredicateSelectionPanel.py b/python/plugins/processing/gui/GeometryPredicateSelectionPanel.py
diff --git a/python/plugins/processing/gui/wrappers.py b/python/plugins/processing/gui/wrappers.py
@@ -73,7 +73,6 @@
 from processing.gui.FixedTablePanel import FixedTablePanel
 from processing.gui.ExtentSelectionPanel import ExtentSelectionPanel
 from processing.gui.StringInputPanel import StringInputPanel
-from processing.gui.GeometryPredicateSelectionPanel import GeometryPredicateSelectionPanel
 
 
 DIALOG_STANDARD = 'standard'
