From 54a960f9ecd22f2b706a78c2753e79af5d54965b Mon Sep 17 00:00:00 2001 From: Victor Olaya Date: Sat, 21 Sep 2013 12:47:47 +0200 Subject: [PATCH] [processing] some code cleaning --- python/plugins/processing/algs/ftools/ExtentFromLayer.py | 4 ---- python/plugins/processing/algs/ftools/ExtractNodes.py | 5 ----- python/plugins/processing/algs/ftools/FixedDistanceBuffer.py | 5 ----- python/plugins/processing/algs/ftools/Intersection.py | 5 ----- python/plugins/processing/algs/ftools/LinesIntersection.py | 5 ----- python/plugins/processing/algs/ftools/LinesToPolygons.py | 5 ----- python/plugins/processing/algs/ftools/MeanCoords.py | 5 ----- .../plugins/processing/algs/ftools/MultipartToSingleparts.py | 4 ---- python/plugins/processing/gui/Postprocessing.py | 1 - python/plugins/processing/ui/DlgHistory.ui | 4 ++-- python/plugins/processing/ui/ui_DlgHistory.py | 2 +- 11 files changed, 3 insertions(+), 42 deletions(-) diff --git a/python/plugins/processing/algs/ftools/ExtentFromLayer.py b/python/plugins/processing/algs/ftools/ExtentFromLayer.py index e0c6e294a6e..6a1e3368acf 100644 --- a/python/plugins/processing/algs/ftools/ExtentFromLayer.py +++ b/python/plugins/processing/algs/ftools/ExtentFromLayer.py @@ -24,15 +24,11 @@ __copyright__ = '(C) 2012, Victor Olaya' __revision__ = '$Format:%H$' from PyQt4.QtCore import * - from qgis.core import * - from processing.core.GeoAlgorithm import GeoAlgorithm from processing.tools import dataobjects, vector - from processing.parameters.ParameterVector import ParameterVector from processing.parameters.ParameterBoolean import ParameterBoolean - from processing.outputs.OutputVector import OutputVector class ExtentFromLayer(GeoAlgorithm): diff --git a/python/plugins/processing/algs/ftools/ExtractNodes.py b/python/plugins/processing/algs/ftools/ExtractNodes.py index 189061f1017..4c467df5a00 100644 --- a/python/plugins/processing/algs/ftools/ExtractNodes.py +++ b/python/plugins/processing/algs/ftools/ExtractNodes.py @@ -36,11 +36,6 @@ class ExtractNodes(GeoAlgorithm): INPUT = "INPUT" OUTPUT = "OUTPUT" - #=========================================================================== - # def getIcon(self): - # return QtGui.QIcon(os.path.dirname(__file__) + "/icons/extract_nodes.png") - #=========================================================================== - def defineCharacteristics(self): self.name = "Extract nodes" self.group = "Vector geometry tools" diff --git a/python/plugins/processing/algs/ftools/FixedDistanceBuffer.py b/python/plugins/processing/algs/ftools/FixedDistanceBuffer.py index f1b942fa510..47bd1fda1de 100644 --- a/python/plugins/processing/algs/ftools/FixedDistanceBuffer.py +++ b/python/plugins/processing/algs/ftools/FixedDistanceBuffer.py @@ -24,18 +24,13 @@ __copyright__ = '(C) 2012, Victor Olaya' __revision__ = '$Format:%H$' from PyQt4.QtCore import * - from qgis.core import * - from processing.core.GeoAlgorithm import GeoAlgorithm from processing.tools import dataobjects - from processing.parameters.ParameterVector import ParameterVector from processing.parameters.ParameterBoolean import ParameterBoolean from processing.parameters.ParameterNumber import ParameterNumber - from processing.outputs.OutputVector import OutputVector - from processing.algs.ftools import Buffer as buff class FixedDistanceBuffer(GeoAlgorithm): diff --git a/python/plugins/processing/algs/ftools/Intersection.py b/python/plugins/processing/algs/ftools/Intersection.py index 4e20b199cea..1b26a7ff854 100644 --- a/python/plugins/processing/algs/ftools/Intersection.py +++ b/python/plugins/processing/algs/ftools/Intersection.py @@ -38,11 +38,6 @@ class Intersection(GeoAlgorithm): INPUT2 = "INPUT2" OUTPUT = "OUTPUT" - #=========================================================================== - # def getIcon(self): - # return QtGui.QIcon(os.path.dirname(__file__) + "/icons/intersect.png") - #=========================================================================== - def processAlgorithm(self, progress): vlayerA = dataobjects.getObjectFromUri(self.getParameterValue(Intersection.INPUT)) vlayerB = dataobjects.getObjectFromUri(self.getParameterValue(Intersection.INPUT2)) diff --git a/python/plugins/processing/algs/ftools/LinesIntersection.py b/python/plugins/processing/algs/ftools/LinesIntersection.py index 5618756b6a6..7ca8025b35e 100644 --- a/python/plugins/processing/algs/ftools/LinesIntersection.py +++ b/python/plugins/processing/algs/ftools/LinesIntersection.py @@ -41,11 +41,6 @@ class LinesIntersection(GeoAlgorithm): OUTPUT = "OUTPUT" - #=========================================================================== - # def getIcon(self): - # return QtGui.QIcon(os.path.dirname(__file__) + "/icons/intersections.png") - #=========================================================================== - def defineCharacteristics(self): self.name = "Line intersections" self.group = "Vector overlay tools" diff --git a/python/plugins/processing/algs/ftools/LinesToPolygons.py b/python/plugins/processing/algs/ftools/LinesToPolygons.py index 980d1f94ba7..61699a9106c 100644 --- a/python/plugins/processing/algs/ftools/LinesToPolygons.py +++ b/python/plugins/processing/algs/ftools/LinesToPolygons.py @@ -36,11 +36,6 @@ class LinesToPolygons(GeoAlgorithm): INPUT = "INPUT" OUTPUT = "OUTPUT" - #=========================================================================== - # def getIcon(self): - # return QtGui.QIcon(os.path.dirname(__file__) + "/icons/to_lines.png") - #=========================================================================== - def defineCharacteristics(self): self.name = "Lines to polygons" self.group = "Vector geometry tools" diff --git a/python/plugins/processing/algs/ftools/MeanCoords.py b/python/plugins/processing/algs/ftools/MeanCoords.py index 8812d919167..d9bf0215a4d 100644 --- a/python/plugins/processing/algs/ftools/MeanCoords.py +++ b/python/plugins/processing/algs/ftools/MeanCoords.py @@ -40,11 +40,6 @@ class MeanCoords(GeoAlgorithm): UID = "UID" WEIGHT = "WEIGHT" - #=========================================================================== - # def getIcon(self): - # return QtGui.QIcon(os.path.dirname(__file__) + "/icons/mean.png") - #=========================================================================== - def defineCharacteristics(self): self.name = "Mean coordinate(s)" self.group = "Vector analysis tools" diff --git a/python/plugins/processing/algs/ftools/MultipartToSingleparts.py b/python/plugins/processing/algs/ftools/MultipartToSingleparts.py index 075fa416a16..632ced8c7e5 100644 --- a/python/plugins/processing/algs/ftools/MultipartToSingleparts.py +++ b/python/plugins/processing/algs/ftools/MultipartToSingleparts.py @@ -24,15 +24,11 @@ __copyright__ = '(C) 2012, Victor Olaya' __revision__ = '$Format:%H$' from PyQt4.QtCore import * - from qgis.core import * - from processing.core.GeoAlgorithm import GeoAlgorithm from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException from processing.tools import dataobjects, vector - from processing.parameters.ParameterVector import ParameterVector - from processing.outputs.OutputVector import OutputVector class MultipartToSingleparts(GeoAlgorithm): diff --git a/python/plugins/processing/gui/Postprocessing.py b/python/plugins/processing/gui/Postprocessing.py index 2b029cf1ab1..2e22c04b709 100644 --- a/python/plugins/processing/gui/Postprocessing.py +++ b/python/plugins/processing/gui/Postprocessing.py @@ -62,7 +62,6 @@ class Postprocessing: dataobjects.load(out.value, name, alg.crs, RenderingStyles.getStyle(alg.commandLineName(),out.name)) except Exception, e: wrongLayers.append(out) - #QMessageBox.critical(None, "Error", str(e)) elif isinstance(out, OutputHTML): ProcessingResults.addResult(out.description, out.value) htmlResults = True diff --git a/python/plugins/processing/ui/DlgHistory.ui b/python/plugins/processing/ui/DlgHistory.ui index 76ff5ab43e6..b4882cf40e2 100644 --- a/python/plugins/processing/ui/DlgHistory.ui +++ b/python/plugins/processing/ui/DlgHistory.ui @@ -6,8 +6,8 @@ 0 0 - 532 - 377 + 800 + 500 diff --git a/python/plugins/processing/ui/ui_DlgHistory.py b/python/plugins/processing/ui/ui_DlgHistory.py index a4ea1dd5091..36ae02b9558 100644 --- a/python/plugins/processing/ui/ui_DlgHistory.py +++ b/python/plugins/processing/ui/ui_DlgHistory.py @@ -17,7 +17,7 @@ except AttributeError: class Ui_DlgHistory(object): def setupUi(self, DlgHistory): DlgHistory.setObjectName(_fromUtf8("DlgHistory")) - DlgHistory.resize(532, 377) + DlgHistory.resize(800, 500) self.verticalLayout = QtGui.QVBoxLayout(DlgHistory) self.verticalLayout.setSpacing(2) self.verticalLayout.setMargin(0)