[sextante] some light code cleaning/polishing

qgis · May 28, 2013 · 1dad149 · 1dad149
1 parent 17bdba9
commit 1dad149
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 18 deletions.
diff --git a/python/plugins/sextante/algs/QGISAlgorithmProvider.py b/python/plugins/sextante/algs/QGISAlgorithmProvider.py
@@ -133,7 +133,8 @@ def __init__(self):
                         AutoincrementalField(), Explode(), FieldsPyculator(), EquivalentNumField(),
                         PointsLayerFromTable(), StatisticsByCategories(), Polygonize(),
                         # ------ raster ------
-                        CreateConstantRaster(), RasterLayerStatistics()
+                        #CreateConstantRaster(), 
+                        RasterLayerStatistics()
                         # ------ graphics ------
                         #VectorLayerHistogram(), VectorLayerScatterplot(), RasterLayerHistogram(),
                         #MeanAndStdDevPlot(), BarPlot(), PolarPlot()

diff --git a/python/plugins/sextante/core/QGisLayers.py b/python/plugins/sextante/core/QGisLayers.py
@@ -16,7 +16,6 @@
 *                                                                         *
 ***************************************************************************
 """
-from sextante.gdal.GdalUtils import GdalUtils
 
 __author__ = 'Victor Olaya'
 __date__ = 'August 2012'
@@ -29,6 +28,8 @@
 from PyQt4.QtGui import *
 from os import path
 from sextante.core.SextanteConfig import SextanteConfig
+from sextante.gdal.GdalUtils import GdalUtils
+
 
 class QGisLayers:
     '''This class contains method to communicate SEXTANTE with the QGIS interface,

diff --git a/python/plugins/sextante/core/SextanteLog.py b/python/plugins/sextante/core/SextanteLog.py
@@ -87,12 +87,6 @@ def getLogEntries():
         algorithms=[]
         warnings=[]
         info=[]
-        #lines = codecs.open(SextanteLog.logFilename(), encoding='utf-8')
-        #=======================================================================
-        # lines = open(SextanteLog.logFilename())
-        # line = lines.readline()
-        # while line != "":
-        #=======================================================================
         lines = tail(SextanteLog.logFilename())
         for line in lines:
             line = line.strip("\n").strip()
@@ -108,8 +102,7 @@ def getLogEntries():
                 warnings.append(LogEntry(tokens[1], text))
             elif line.startswith(SextanteLog.LOG_INFO):
                 info.append(LogEntry(tokens[1], text))
-            #line = lines.readline()
-        #lines.close()
+
         entries[SextanteLog.LOG_ERROR] = errors
         entries[SextanteLog.LOG_ALGORITHM] = algorithms
         entries[SextanteLog.LOG_INFO] = info
@@ -136,7 +129,6 @@ def __init__(self, date, text):
         self.text = text
 
 import re
-import time
 
 #===============================================================================
 

diff --git a/python/plugins/sextante/gui/BatchInputSelectionPanel.py b/python/plugins/sextante/gui/BatchInputSelectionPanel.py
@@ -22,6 +22,7 @@
 __copyright__ = '(C) 2012, Victor Olaya'
 # This will get replaced with a git SHA1 when you do a git archive
 __revision__ = '$Format:%H$'
+
 import os
 from PyQt4 import QtGui, QtCore
 from sextante.parameters.ParameterMultipleInput import ParameterMultipleInput

diff --git a/python/plugins/sextante/gui/ConfigDialog.py b/python/plugins/sextante/gui/ConfigDialog.py
@@ -16,20 +16,18 @@
 *                                                                         *
 ***************************************************************************
 """
-import os
-from PyQt4 import QtGui
 
 __author__ = 'Victor Olaya'
 __date__ = 'August 2012'
 __copyright__ = '(C) 2012, Victor Olaya'
 # This will get replaced with a git SHA1 when you do a git archive
 __revision__ = '$Format:%H$'
 
+import os
+from PyQt4 import QtGui
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
-
 from sextante.core.SextanteConfig import SextanteConfig
-
 from sextante.ui.ui_DlgConfig import Ui_DlgConfig
 
 class ConfigDialog(QDialog, Ui_DlgConfig):
@@ -53,7 +51,7 @@ def __init__(self, toolbox):
 
     def edit(self, item, column):
         if column > 0:
-           self.tree.editItem(item, column)
+            self.tree.editItem(item, column)
 
     def fillTree(self):
         self.items = {}

diff --git a/python/plugins/sextante/gui/CouldNotLoadResultsDialog.py b/python/plugins/sextante/gui/CouldNotLoadResultsDialog.py
@@ -16,7 +16,6 @@
 *                                                                         *
 ***************************************************************************
 """
-import webbrowser
 
 __author__ = 'Victor Olaya'
 __date__ = 'August 2012'
@@ -27,6 +26,7 @@
 from PyQt4 import QtCore, QtGui, QtWebKit
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
+import webbrowser
 
 class CouldNotLoadResultsDialog(QtGui.QDialog):
     def __init__(self, wrongLayers, alg):

diff --git a/python/plugins/sextante/gui/Help2Html.py b/python/plugins/sextante/gui/Help2Html.py
@@ -26,6 +26,7 @@
 import pickle
 from sextante.core.SextanteUtils import SextanteUtils
 import os
+
 class Help2Html():
 
     ALG_DESC = "ALG_DESC"

diff --git a/python/plugins/sextante/gui/HelpEditionDialog.py b/python/plugins/sextante/gui/HelpEditionDialog.py
@@ -25,7 +25,6 @@
 
 import os
 import pickle
-
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *