indentation

qgis · Feb 27, 2016 · 6800c8d · 6800c8d
1 parent ab866d9
commit 6800c8d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/python/plugins/processing/algs/lidar/fusion/ImageCreate.py b/python/plugins/processing/algs/lidar/fusion/ImageCreate.py
@@ -55,8 +55,8 @@ def defineCharacteristics(self):
             ['Intensity', 'Elevation','Height']))
         self.addParameter(ParameterFile(
             self.GROUND, self.tr("Ground file (used with 'Height' method)"), 'dtm'))
-        self.addParameter(ParameterBoolean(self.RGB,
-            self.tr('Use RGB colour model to create the colour ramp'), False))
+        self.addParameter(ParameterBoolean(
+            self.RGB, self.tr('Use RGB colour model to create the colour ramp'), False))
         self.addParameter(ParameterNumber(
             self.PIXEL, self.tr('Pixel size'), 0, None, 1.0))
         self.addParameter(ParameterSelection(

diff --git a/python/plugins/processing/algs/lidar/fusion/IntensityImage.py b/python/plugins/processing/algs/lidar/fusion/IntensityImage.py
@@ -48,15 +48,15 @@ class IntensityImage(FusionAlgorithm):
     def defineCharacteristics(self):
         self.name, self.i18n_name = self.trAlgorithm('IntensityImage')
         self.group, self.i18n_group = self.trAlgorithm('Points')
-        self.addParameter(ParameterFile(
-			self.INPUT, self.tr('Input file')))
 
-        self.addParameter(ParameterBoolean(self.ALLRET,
-            self.tr('Use all returns instead of only first'), False))
-        self.addParameter(ParameterBoolean(self.LOWEST,
-            self.tr('Use the lowest return in pixel area to assign the intensity value'), False))
-        self.addParameter(ParameterBoolean(self.HIST,
-            self.tr('Produce a CSV intensity histogram data file'), False))
+        self.addParameter(ParameterFile(
+            self.INPUT, self.tr('Input file')))
+        self.addParameter(ParameterBoolean(
+            self.ALLRET, self.tr('Use all returns instead of only first'), False))
+        self.addParameter(ParameterBoolean(
+            self.LOWEST, self.tr('Use the lowest return in pixel area to assign the intensity value'), False))
+        self.addParameter(ParameterBoolean(
+            self.HIST, self.tr('Produce a CSV intensity histogram data file'), False))
         self.addParameter(ParameterNumber(
             self.PIXEL, self.tr('Pixel size'), 0, None, 1.0))
         self.addParameter(ParameterSelection(

diff --git a/python/plugins/processing/algs/r/RUtils.py b/python/plugins/processing/algs/r/RUtils.py
@@ -48,14 +48,15 @@ def RFolder():
         folder = ProcessingConfig.getSetting(RUtils.R_FOLDER)
         if folder is None:
             if isWindows():
-                if "ProgramW6432" in os.environ.keys() and os.path.isdir(os.path.join(os.environ["ProgramW6432"],'R')):
-                    testfolder = os.path.join(os.environ["ProgramW6432"],'R')
-                elif "PROGRAMFILES(x86)" in os.environ.keys() and os.path.isdir(os.path.join(os.environ["PROGRAMFILES(x86)"],'R')):
-                    testfolder = os.path.join(os.environ["PROGRAMFILES(x86)"],'R')
-                elif "PROGRAMFILES" in os.environ.keys() and os.path.isdir(os.path.join(os.environ["PROGRAMFILES"],'R')):
-                    testfolder = os.path.join(os.environ["PROGRAMFILES"],'R')
+                if 'ProgramW6432' in os.environ.keys() and os.path.isdir(os.path.join(os.environ['ProgramW6432'], 'R')):
+                    testfolder = os.path.join(os.environ['ProgramW6432'], 'R')
+                elif 'PROGRAMFILES(x86)' in os.environ.keys() and os.path.isdir(os.path.join(os.environ['PROGRAMFILES(x86)'], 'R')):
+                    testfolder = os.path.join(os.environ['PROGRAMFILES(x86)'], 'R')
+                elif 'PROGRAMFILES' in os.environ.keys() and os.path.isdir(os.path.join(os.environ['PROGRAMFILES'], 'R')):
+                    testfolder = os.path.join(os.environ['PROGRAMFILES'], 'R')
                 else:
                     testfolder = 'C:\\R'
+
                 if os.path.isdir(testfolder):
                     subfolders = os.listdir(testfolder)
                     subfolders.sort(reverse=True)