[processing] fix .ui file loading (follow up b52828f)

qgis · May 30, 2016 · 25983ee · 25983ee
1 parent ddd37ad
commit 25983ee
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/python/plugins/processing/script/ScriptSelector.py b/python/plugins/processing/script/ScriptSelector.py
@@ -27,8 +27,9 @@
 from collections import defaultdict
 from processing.core.alglist import algList
 
+pluginPath = os.path.split(os.path.dirname(__file__))[0]
 WIDGET, BASE = uic.loadUiType(
-    os.path.join(os.path.dirname(__file__), 'scriptselector.ui'))
+    os.path.join(pluginPath, 'ui', 'DlgConfig.ui'))
 
 class ScriptSelector(BASE, WIDGET):
 

diff --git a/python/plugins/processing/tests/testdata/custom/grass7/raster_4class.tif.aux.xml b/python/plugins/processing/tests/testdata/custom/grass7/raster_4class.tif.aux.xml
@@ -11,12 +11,12 @@
       </HistItem>
     </Histograms>
     <Metadata>
-      <MDI key="COLOR_TABLE_RULES_COUNT">5</MDI>
       <MDI key="COLOR_TABLE_RULE_RGB_0">1.000000e+00 1.600000e+00 255 255 0 0 255 0</MDI>
       <MDI key="COLOR_TABLE_RULE_RGB_1">1.600000e+00 2.200000e+00 0 255 0 0 255 255</MDI>
       <MDI key="COLOR_TABLE_RULE_RGB_2">2.200000e+00 2.800000e+00 0 255 255 0 0 255</MDI>
       <MDI key="COLOR_TABLE_RULE_RGB_3">2.800000e+00 3.400000e+00 0 0 255 255 0 255</MDI>
       <MDI key="COLOR_TABLE_RULE_RGB_4">3.400000e+00 4.000000e+00 255 0 255 255 0 0</MDI>
+      <MDI key="COLOR_TABLE_RULES_COUNT">5</MDI>
       <MDI key="Generated_with">GRASS GIS 7.0.3</MDI>
       <MDI key="STATISTICS_MAXIMUM">4</MDI>
       <MDI key="STATISTICS_MEAN">3.3133333333333</MDI>

diff --git a/python/plugins/processing/tests/testdata/custom/grass7/raster_5class.tif.aux.xml b/python/plugins/processing/tests/testdata/custom/grass7/raster_5class.tif.aux.xml
@@ -11,12 +11,12 @@
       </HistItem>
     </Histograms>
     <Metadata>
-      <MDI key="COLOR_TABLE_RULES_COUNT">5</MDI>
       <MDI key="COLOR_TABLE_RULE_RGB_0">1.000000e+00 1.800000e+00 255 255 0 0 255 0</MDI>
       <MDI key="COLOR_TABLE_RULE_RGB_1">1.800000e+00 2.600000e+00 0 255 0 0 255 255</MDI>
       <MDI key="COLOR_TABLE_RULE_RGB_2">2.600000e+00 3.400000e+00 0 255 255 0 0 255</MDI>
       <MDI key="COLOR_TABLE_RULE_RGB_3">3.400000e+00 4.200000e+00 0 0 255 255 0 255</MDI>
       <MDI key="COLOR_TABLE_RULE_RGB_4">4.200000e+00 5.000000e+00 255 0 255 255 0 0</MDI>
+      <MDI key="COLOR_TABLE_RULES_COUNT">5</MDI>
       <MDI key="Generated_with">GRASS GIS 7.0.3</MDI>
       <MDI key="STATISTICS_MAXIMUM">5</MDI>
       <MDI key="STATISTICS_MEAN">3.4714760638298</MDI>

diff --git a/python/plugins/processing/tests/testdata/custom/grass7/raster_6class.tif.aux.xml b/python/plugins/processing/tests/testdata/custom/grass7/raster_6class.tif.aux.xml
@@ -11,12 +11,12 @@
       </HistItem>
     </Histograms>
     <Metadata>
-      <MDI key="COLOR_TABLE_RULES_COUNT">5</MDI>
       <MDI key="COLOR_TABLE_RULE_RGB_0">1.000000e+00 2.000000e+00 255 255 0 0 255 0</MDI>
       <MDI key="COLOR_TABLE_RULE_RGB_1">2.000000e+00 3.000000e+00 0 255 0 0 255 255</MDI>
       <MDI key="COLOR_TABLE_RULE_RGB_2">3.000000e+00 4.000000e+00 0 255 255 0 0 255</MDI>
       <MDI key="COLOR_TABLE_RULE_RGB_3">4.000000e+00 5.000000e+00 0 0 255 255 0 255</MDI>
       <MDI key="COLOR_TABLE_RULE_RGB_4">5.000000e+00 6.000000e+00 255 0 255 255 0 0</MDI>
+      <MDI key="COLOR_TABLE_RULES_COUNT">5</MDI>
       <MDI key="Generated_with">GRASS GIS 7.0.3</MDI>
       <MDI key="STATISTICS_MAXIMUM">6</MDI>
       <MDI key="STATISTICS_MEAN">4.1343333333333</MDI>

diff --git a/...ugins/processing/script/scriptselector.ui → ...n/plugins/processing/ui/scriptselector.ui b/...ugins/processing/script/scriptselector.ui → ...n/plugins/processing/ui/scriptselector.ui