indentation update

Author: jef-n

python/plugins/sextante/algs/ftools/ConvexHull.py

@@ -71,7 +71,7 @@ def processAlgorithm(self, progress):
         GEOS_EXCEPT = True
         FEATURE_EXCEPT = True
 
-        
+
         f = QgsField("value")
         f.setType(QVariant.String)
         f.setLength(255)

python/plugins/sextante/algs/ftools/ReprojectLayer.py

@@ -79,5 +79,5 @@ def processAlgorithm(self, progress):
             progress.setPercentage(int(current * total))
 
         del writer
-        
+
         self.crs = targetCrs

python/plugins/sextante/gdal/OgrAlgorithm.py

@@ -47,7 +47,7 @@ def ogrConnectionString(self, uri):
         layer = QGisLayers.getObjectFromUri(uri, False)
         if layer == None:
             return uri;
-        provider = layer.dataProvider().name()        
+        provider = layer.dataProvider().name()
         if provider == 'spatialite':
             #dbname='/geodata/osm_ch.sqlite' table="places" (Geometry) sql=
             regex = re.compile("dbname='(.+)'")

python/plugins/sextante/gdal/ogr2ogr.py

@@ -62,47 +62,47 @@ def defineCharacteristics(self):
 
         #we add the input vector layer. It can have any kind of geometry
         #It is a mandatory (not optional) one, hence the False argument
-        self.addParameter(ParameterVector(self.INPUT_LAYER, "Input layer", ParameterVector.VECTOR_TYPE_ANY, False))        
-        self.addParameter(ParameterSelection(self.DEST_FORMAT, "Destination Format", FORMATS)) 
-        self.addParameter(ParameterString(self.DEST_DSCO, "Creation Options", "")) 
+        self.addParameter(ParameterVector(self.INPUT_LAYER, "Input layer", ParameterVector.VECTOR_TYPE_ANY, False))
+        self.addParameter(ParameterSelection(self.DEST_FORMAT, "Destination Format", FORMATS))
+        self.addParameter(ParameterString(self.DEST_DSCO, "Creation Options", ""))
 
         self.addOutput(OutputVector(self.OUTPUT_LAYER, "Output layer"))
 
     def processAlgorithm(self, progress):
         '''Here is where the processing itself takes place'''
 
         if not gdalAvailable:
-            raise GeoAlgorithmExecutionException("GDAL bindings not installed.")            
+            raise GeoAlgorithmExecutionException("GDAL bindings not installed.")
 
         input = self.getParameterValue(self.INPUT_LAYER)
         ogrLayer = self.ogrConnectionString(input)
-        
+
         output = self.getOutputFromName(self.OUTPUT_LAYER)
         outfile = output.value
-        
+
         formatIdx = self.getParameterValue(self.DEST_FORMAT)
-        
+
         ext = EXTS[formatIdx]
         if not outfile.endswith(ext):
             outfile = outfile + ext;
             output.value = outfile
-        
+
         dst_ds = self.ogrConnectionString(outfile)
         dst_format = FORMATS[formatIdx]
-        ogr_dsco = [self.getParameterValue(self.DEST_DSCO)] 
-        
+        ogr_dsco = [self.getParameterValue(self.DEST_DSCO)]
+
         poDS = ogr.Open( ogrLayer, False )
         if poDS is None:
-            raise GeoAlgorithmExecutionException(self.failure(ogrLayer))        
-   
+            raise GeoAlgorithmExecutionException(self.failure(ogrLayer))
+
         if dst_format == "SQLite" and os.path.isfile(dst_ds):
-            os.remove(dst_ds)        
+            os.remove(dst_ds)
         driver = ogr.GetDriverByName(str(dst_format))
         poDstDS = driver.CreateDataSource(dst_ds, options = ogr_dsco)
         if poDstDS is None:
             raise GeoAlgorithmExecutionException("Error creating %s" % dst_ds)
             return
-        self.ogrtransform(poDS, poDstDS, bOverwrite = True)        
+        self.ogrtransform(poDS, poDstDS, bOverwrite = True)
 
 
     def ogrtransform(self,
@@ -141,7 +141,7 @@ def ogrtransform(self,
                 poLayer = poSrcDS.GetLayer(iLayer)
 
                 if poLayer is None:
-                    raise GeoAlgorithmExecutionException( "FAILURE: Couldn't fetch advertised layer %d!" % iLayer)                    
+                    raise GeoAlgorithmExecutionException( "FAILURE: Couldn't fetch advertised layer %d!" % iLayer)
 
                 papoLayers[iLayer] = poLayer
                 iLayer = iLayer + 1
@@ -156,12 +156,12 @@ def ogrtransform(self,
                 poLayer = poSrcDS.GetLayerByName(layername)
 
                 if poLayer is None:
-                    raise GeoAlgorithmExecutionException("FAILURE: Couldn't fetch advertised layer %s!" % layername)                    
+                    raise GeoAlgorithmExecutionException("FAILURE: Couldn't fetch advertised layer %s!" % layername)
 
                 papoLayers[iLayer] = poLayer
                 iLayer = iLayer + 1
 
-        for poSrcLayer in papoLayers:                
+        for poSrcLayer in papoLayers:
           ok = TranslateLayer( poSrcDS, poSrcLayer, poDstDS, papszLCO, pszNewLayerName, \
                         bTransform, poOutputSRS, poSourceSRS, papszSelFields, \
                         bAppend, eGType, bOverwrite, eGeomOp, dfGeomOpParam, \

python/plugins/sextante/grass/GrassAlgorithm.py

@@ -78,7 +78,7 @@ def getIcon(self):
         return  QIcon(os.path.dirname(__file__) + "/../images/grass.png")
 
     def helpFile(self):
-        return 'http://grass.osgeo.org/grass64/manuals/' + self.grassName + ".html"         
+        return 'http://grass.osgeo.org/grass64/manuals/' + self.grassName + ".html"
 
     def getParameterDescriptions(self):
         descs = {}
@@ -293,8 +293,8 @@ def processAlgorithm(self, progress):
                     command+= (" > " + out.value)
                 else:
                     command+=(" " + out.name + "=\"" + out.value + "\"");
-            elif not isinstance(out, OutputHTML):                         
-                #html files are not generated by GRASS, only by SEXTANTE to decorate grass output, so we skip them                
+            elif not isinstance(out, OutputHTML):
+                #html files are not generated by GRASS, only by SEXTANTE to decorate grass output, so we skip them
                 #An output name to make sure it is unique if the session uses this algorithm several times
                 uniqueOutputName = out.name + uniqueSufix
                 command += (" " + out.name + "=" + uniqueOutputName)
@@ -358,7 +358,7 @@ def postProcessResults(self):
 
     def exportVectorLayer(self, orgFilename):
         #TODO: improve this. We are now exporting if it is not a shapefile,
-        #but the functionality of v.in.ogr could be used for this.        
+        #but the functionality of v.in.ogr could be used for this.
         #We also export if there is a selection
         if not os.path.exists(orgFilename) or not orgFilename.endswith("shp"):
             layer = QGisLayers.getObjectFromUri(orgFilename, False)
@@ -427,12 +427,12 @@ def getTempFilename(self):
 
     def commandLineName(self):
         return "grass:" + self.name[:self.name.find(" ")]
-    
+
     def checkBeforeOpeningParametersDialog(self):
         msg = GrassUtils.checkGrassIsInstalled()
-        if msg is not None:                        
-            html = ("<p>This algorithm requires GRASS to be run." 
-            "Unfortunately, it seems that GRASS is not installed in your system, or it is not correctly configured to be used from QGIS</p>")            
+        if msg is not None:
+            html = ("<p>This algorithm requires GRASS to be run."
+            "Unfortunately, it seems that GRASS is not installed in your system, or it is not correctly configured to be used from QGIS</p>")
             html += '<p><a href= "http://docs.qgis.org/html/en/docs/user_manual/sextante/3rdParty.html">Click here</a> to know more about how to install and configure GRASS to be used with SEXTANTE</p>'
             return html
 

python/plugins/sextante/grass/GrassAlgorithmProvider.py

@@ -46,13 +46,13 @@ def initializeSettings(self):
             SextanteConfig.addSetting(Setting(self.getDescription(), GrassUtils.GRASS_FOLDER, "GRASS folder", GrassUtils.grassPath()))
             SextanteConfig.addSetting(Setting(self.getDescription(), GrassUtils.GRASS_WIN_SHELL, "Msys folder", GrassUtils.grassWinShell()))
         SextanteConfig.addSetting(Setting(self.getDescription(), GrassUtils.GRASS_LOG_COMMANDS, "Log execution commands", False))
-        SextanteConfig.addSetting(Setting(self.getDescription(), GrassUtils.GRASS_LOG_CONSOLE, "Log console output", False))        
+        SextanteConfig.addSetting(Setting(self.getDescription(), GrassUtils.GRASS_LOG_CONSOLE, "Log console output", False))
 
     def unload(self):
         AlgorithmProvider.unload(self)
         if SextanteUtils.isWindows() or SextanteUtils.isMac():
             SextanteConfig.removeSetting(GrassUtils.GRASS_FOLDER)
-            SextanteConfig.removeSetting(GrassUtils.GRASS_WIN_SHELL)        
+            SextanteConfig.removeSetting(GrassUtils.GRASS_WIN_SHELL)
         SextanteConfig.removeSetting(GrassUtils.GRASS_LOG_COMMANDS)
         SextanteConfig.removeSetting(GrassUtils.GRASS_LOG_CONSOLE)
 

python/plugins/sextante/grass/GrassUtils.py

@@ -43,7 +43,7 @@ class GrassUtils:
     GRASS_REGION_XMAX = "GRASS_REGION_XMAX"
     GRASS_REGION_YMAX = "GRASS_REGION_YMAX"
     GRASS_REGION_CELLSIZE = "GRASS_REGION_CELLSIZE"
-    GRASS_FOLDER = "GRASS_FOLDER"    
+    GRASS_FOLDER = "GRASS_FOLDER"
     GRASS_WIN_SHELL = "GRASS_WIN_SHELL"
     GRASS_LOG_COMMANDS = "GRASS_LOG_COMMANDS"
     GRASS_LOG_CONSOLE = "GRASS_LOG_CONSOLE"
@@ -327,7 +327,7 @@ def checkGrassIsInstalled(ignoreRegistrySettings=False):
 
         settings = QSettings()
         GRASS_INSTALLED = "/SextanteQGIS/GrassInstalled"
-        if not ignoreRegistrySettings:            
+        if not ignoreRegistrySettings:
             if settings.contains(GRASS_INSTALLED):
                 return
 

python/plugins/sextante/gui/MissingDependencyDialog.py

@@ -40,7 +40,7 @@ def setupUi(self):
         layout = QVBoxLayout()
         webView = QtWebKit.QWebView()
         webView.page().setLinkDelegationPolicy(QtWebKit.QWebPage.DelegateAllLinks)
-        webView.connect(webView, SIGNAL("linkClicked(const QUrl&)"), self.linkClicked)        
+        webView.connect(webView, SIGNAL("linkClicked(const QUrl&)"), self.linkClicked)
         webView.setHtml(self.msg)
         closeButton = QtGui.QPushButton()
         closeButton.setText("Close")

python/plugins/sextante/modeler/ModelerParametersDialog.py

@@ -651,7 +651,7 @@ def setParamTableFieldValue(self, param, widget):
         idx = widget.findText(widget.currentText())
         if idx < 0:
             name =  self.getSafeNameForHarcodedParameter(param)
-            value = AlgorithmAndParameter(AlgorithmAndParameter.PARENT_MODEL_ALGORITHM, name)            
+            value = AlgorithmAndParameter(AlgorithmAndParameter.PARENT_MODEL_ALGORITHM, name)
             s = str(widget.currentText()).strip()
             if s == "":
                 if param.optional:
@@ -669,21 +669,21 @@ def setParamTableFieldValue(self, param, widget):
         return True
 
     def setParamStringValue(self, param, widget):
-        if param.multiline:            
+        if param.multiline:
             name =  self.getSafeNameForHarcodedParameter(param)
             paramValue = AlgorithmAndParameter(AlgorithmAndParameter.PARENT_MODEL_ALGORITHM, name)
             value = widget.getValue()
             option = widget.getOption()
-            if option == MultilineTextPanel.USE_TEXT:                
+            if option == MultilineTextPanel.USE_TEXT:
                 if value == "":
                     if param.optional:
                         self.params[param.name] = None
-                        return True                    
+                        return True
                     else:
                         return False
-                else:                
+                else:
                     self.values[name] = value
-                    
+
                     self.params[param.name] = paramValue
             else:
                 self.params[param.name] = value

python/plugins/sextante/modeler/SaveAsPythonScriptAction.py

@@ -46,7 +46,7 @@ def execute(self):
         if filename:
             if not filename.endswith(".py"):
                 filename += ".py"
-            text = self.translateToPythonCode(self.alg)            
+            text = self.translateToPythonCode(self.alg)
             try:
                 fout = open(filename, "w")
                 fout.write(text)
@@ -57,8 +57,8 @@ def execute(self):
                 QMessageBox.warning(self,
                                     self.tr("I/O error"),
                                     self.tr("Unable to save edits. Reason:\n %1").arg(unicode(sys.exc_info()[1]))
-                                   )         
-                
+                                   )
+
     def translateToPythonCode(self, model):
         s = ["##" + model.name + "=name"]
         for param in model.parameters:
@@ -113,4 +113,4 @@ def translateToPythonCode(self, model):
             i += 1
             s += multiple
             s.append(str(runline + ")"))
-        return "\n".join(s)                 
+        return "\n".join(s)