Skip to content

Commit 25983ee

Browse files
committed
[processing] fix .ui file loading (follow up b52828f)
1 parent ddd37ad commit 25983ee

File tree

5 files changed

+5
-4
lines changed

5 files changed

+5
-4
lines changed

python/plugins/processing/script/ScriptSelector.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@
2727
from collections import defaultdict
2828
from processing.core.alglist import algList
2929

30+
pluginPath = os.path.split(os.path.dirname(__file__))[0]
3031
WIDGET, BASE = uic.loadUiType(
31-
os.path.join(os.path.dirname(__file__), 'scriptselector.ui'))
32+
os.path.join(pluginPath, 'ui', 'DlgConfig.ui'))
3233

3334
class ScriptSelector(BASE, WIDGET):
3435

python/plugins/processing/tests/testdata/custom/grass7/raster_4class.tif.aux.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
</HistItem>
1212
</Histograms>
1313
<Metadata>
14-
<MDI key="COLOR_TABLE_RULES_COUNT">5</MDI>
1514
<MDI key="COLOR_TABLE_RULE_RGB_0">1.000000e+00 1.600000e+00 255 255 0 0 255 0</MDI>
1615
<MDI key="COLOR_TABLE_RULE_RGB_1">1.600000e+00 2.200000e+00 0 255 0 0 255 255</MDI>
1716
<MDI key="COLOR_TABLE_RULE_RGB_2">2.200000e+00 2.800000e+00 0 255 255 0 0 255</MDI>
1817
<MDI key="COLOR_TABLE_RULE_RGB_3">2.800000e+00 3.400000e+00 0 0 255 255 0 255</MDI>
1918
<MDI key="COLOR_TABLE_RULE_RGB_4">3.400000e+00 4.000000e+00 255 0 255 255 0 0</MDI>
19+
<MDI key="COLOR_TABLE_RULES_COUNT">5</MDI>
2020
<MDI key="Generated_with">GRASS GIS 7.0.3</MDI>
2121
<MDI key="STATISTICS_MAXIMUM">4</MDI>
2222
<MDI key="STATISTICS_MEAN">3.3133333333333</MDI>

python/plugins/processing/tests/testdata/custom/grass7/raster_5class.tif.aux.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
</HistItem>
1212
</Histograms>
1313
<Metadata>
14-
<MDI key="COLOR_TABLE_RULES_COUNT">5</MDI>
1514
<MDI key="COLOR_TABLE_RULE_RGB_0">1.000000e+00 1.800000e+00 255 255 0 0 255 0</MDI>
1615
<MDI key="COLOR_TABLE_RULE_RGB_1">1.800000e+00 2.600000e+00 0 255 0 0 255 255</MDI>
1716
<MDI key="COLOR_TABLE_RULE_RGB_2">2.600000e+00 3.400000e+00 0 255 255 0 0 255</MDI>
1817
<MDI key="COLOR_TABLE_RULE_RGB_3">3.400000e+00 4.200000e+00 0 0 255 255 0 255</MDI>
1918
<MDI key="COLOR_TABLE_RULE_RGB_4">4.200000e+00 5.000000e+00 255 0 255 255 0 0</MDI>
19+
<MDI key="COLOR_TABLE_RULES_COUNT">5</MDI>
2020
<MDI key="Generated_with">GRASS GIS 7.0.3</MDI>
2121
<MDI key="STATISTICS_MAXIMUM">5</MDI>
2222
<MDI key="STATISTICS_MEAN">3.4714760638298</MDI>

python/plugins/processing/tests/testdata/custom/grass7/raster_6class.tif.aux.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
</HistItem>
1212
</Histograms>
1313
<Metadata>
14-
<MDI key="COLOR_TABLE_RULES_COUNT">5</MDI>
1514
<MDI key="COLOR_TABLE_RULE_RGB_0">1.000000e+00 2.000000e+00 255 255 0 0 255 0</MDI>
1615
<MDI key="COLOR_TABLE_RULE_RGB_1">2.000000e+00 3.000000e+00 0 255 0 0 255 255</MDI>
1716
<MDI key="COLOR_TABLE_RULE_RGB_2">3.000000e+00 4.000000e+00 0 255 255 0 0 255</MDI>
1817
<MDI key="COLOR_TABLE_RULE_RGB_3">4.000000e+00 5.000000e+00 0 0 255 255 0 255</MDI>
1918
<MDI key="COLOR_TABLE_RULE_RGB_4">5.000000e+00 6.000000e+00 255 0 255 255 0 0</MDI>
19+
<MDI key="COLOR_TABLE_RULES_COUNT">5</MDI>
2020
<MDI key="Generated_with">GRASS GIS 7.0.3</MDI>
2121
<MDI key="STATISTICS_MAXIMUM">6</MDI>
2222
<MDI key="STATISTICS_MEAN">4.1343333333333</MDI>

0 commit comments

Comments
 (0)