8.0.9

semiautomaticgit · Oct 22, 2023 · 8ff6d0d · 8ff6d0d
1 parent f1713c4
commit 8ff6d0d
Show file tree

Hide file tree

Showing 22 changed files with 16,089 additions and 15,932 deletions.
diff --git a/__init__.py b/__init__.py
@@ -34,7 +34,7 @@ def description():
 
 
 def version():
-    return 'Version 8.0.8 - Infinity'
+    return 'Version 8.0.9 - Infinity'
 
 
 def icon():

diff --git a/core/utils.py b/core/utils.py
@@ -582,7 +582,7 @@ def create_kml_from_map():
 
 
 # set RGB color composite
-def set_rgb_color_composite(composite=None):
+def set_rgb_color_composite(composite=None, bandset_number=None):
     if ((len(cfg.rgb_combo.currentText()) > 0
          and cfg.rgb_combo.currentText() != '-') or composite is not None):
         try:
@@ -592,15 +592,24 @@ def set_rgb_color_composite(composite=None):
                 'set_rgb_color_composite rgb: %s' % str(composite)
             )
             if composite is not None:
-                check = create_rgb_color_composite(composite)
+                check = create_rgb_color_composite(composite, bandset_number)
                 if check is True:
                     if composite not in cfg.project_registry[cfg.reg_rgb_list]:
                         cfg.project_registry[cfg.reg_rgb_list].append(
                             composite
                         )
-                        cfg.project_registry[cfg.reg_rgb_list] = list(
-                            set(cfg.project_registry[cfg.reg_rgb_list])
-                        )
+                        try:
+                            rgb_list = list(
+                                set(cfg.project_registry[cfg.reg_rgb_list])
+                            )
+                            rgb_list.remove('-')
+                            rgb_list.insert(0, '-')
+                        except Exception as err:
+                            str(err)
+                            rgb_list = list(
+                                set(cfg.project_registry[cfg.reg_rgb_list])
+                            )
+                        cfg.project_registry[cfg.reg_rgb_list] = rgb_list
                     cfg.rgb_composite.rgb_table_from_list(
                         cfg.project_registry[cfg.reg_rgb_list]
                     )

diff --git a/docs/repository.xml b/docs/repository.xml
@@ -1,9 +1,9 @@
 <?xml version = '1.0' encoding = 'UTF-8'?>
 <plugins>
-    <pyqgis_plugin name="Semi-Automatic Classification Plugin - master" version="8.0.8" plugin_id="284">
+    <pyqgis_plugin name="Semi-Automatic Classification Plugin - master" version="8.0.9" plugin_id="284">
         <description><![CDATA[The Semi-Automatic Classification Plugin (SCP) allows for the supervised classification of remote sensing images, providing tools for the download, the preprocessing and postprocessing of images.]]></description>
         <about><![CDATA[Developed by Luca Congedo, the Semi-Automatic Classification Plugin (SCP) allows for the supervised classification of remote sensing images, providing tools for the download, the preprocessing and postprocessing of images. Search and download is available for Landsat, Sentinel-2 images. Several algorithms are available for the land cover classification. This plugin requires the installation of Remotior Sensus, GDAL, OGR, Numpy, SciPy, and Matplotlib. For more information please visit https://fromgistors.blogspot.com .]]></about>
-        <version>8.0.8</version>
+        <version>8.0.9</version>
         <qgis_minimum_version>3.0.0</qgis_minimum_version>
         <qgis_maximum_version>3.99.0</qgis_maximum_version>
         <homepage><![CDATA[https://fromgistors.blogspot.com/p/semi-automatic-classification-plugin.html]]></homepage>

diff --git a/i18n/models/semiautomaticclassificationplugin.ts b/i18n/models/semiautomaticclassificationplugin.ts
@@ -3742,6 +3742,16 @@ p, li { white-space: pre-wrap; }
         <source>sun_elevation</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1287"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Band set date&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1322"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Root directory&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SpectralSignaturePlot</name>

diff --git a/i18n/semiautomaticclassificationplugin.ts b/i18n/semiautomaticclassificationplugin.ts
@@ -3742,6 +3742,16 @@ p, li { white-space: pre-wrap; }
         <source>sun_elevation</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1287"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Band set date&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1322"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Root directory&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SpectralSignaturePlot</name>

diff --git a/i18n/semiautomaticclassificationplugin_ar.ts b/i18n/semiautomaticclassificationplugin_ar.ts
@@ -3742,6 +3742,16 @@ p, li { white-space: pre-wrap; }
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1287"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Band set date&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1322"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Root directory&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SpectralSignaturePlot</name>

diff --git a/i18n/semiautomaticclassificationplugin_de.ts b/i18n/semiautomaticclassificationplugin_de.ts
@@ -3742,6 +3742,16 @@ p, li { white-space: pre-wrap; }
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1287"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Band set date&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1322"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Root directory&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SpectralSignaturePlot</name>

diff --git a/i18n/semiautomaticclassificationplugin_el_GR.ts b/i18n/semiautomaticclassificationplugin_el_GR.ts
@@ -3742,6 +3742,16 @@ p, li { white-space: pre-wrap; }
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1287"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Band set date&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1322"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Root directory&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SpectralSignaturePlot</name>

diff --git a/i18n/semiautomaticclassificationplugin_es.ts b/i18n/semiautomaticclassificationplugin_es.ts
@@ -3742,6 +3742,16 @@ p, li { white-space: pre-wrap; }
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1287"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Band set date&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1322"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Root directory&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SpectralSignaturePlot</name>

diff --git a/i18n/semiautomaticclassificationplugin_fr.ts b/i18n/semiautomaticclassificationplugin_fr.ts
@@ -3742,6 +3742,16 @@ p, li { white-space: pre-wrap; }
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1287"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Band set date&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1322"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Root directory&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SpectralSignaturePlot</name>

diff --git a/i18n/semiautomaticclassificationplugin_it.ts b/i18n/semiautomaticclassificationplugin_it.ts
@@ -3742,6 +3742,16 @@ p, li { white-space: pre-wrap; }
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1287"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Band set date&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1322"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Root directory&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SpectralSignaturePlot</name>

diff --git a/i18n/semiautomaticclassificationplugin_ja.ts b/i18n/semiautomaticclassificationplugin_ja.ts
@@ -3742,6 +3742,16 @@ p, li { white-space: pre-wrap; }
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1287"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Band set date&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1322"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Root directory&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SpectralSignaturePlot</name>

diff --git a/i18n/semiautomaticclassificationplugin_pl.ts b/i18n/semiautomaticclassificationplugin_pl.ts
@@ -3742,6 +3742,16 @@ p, li { white-space: pre-wrap; }
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1287"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Band set date&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1322"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Root directory&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SpectralSignaturePlot</name>

diff --git a/i18n/semiautomaticclassificationplugin_pt.ts b/i18n/semiautomaticclassificationplugin_pt.ts
@@ -3742,6 +3742,16 @@ p, li { white-space: pre-wrap; }
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1287"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Band set date&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1322"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Root directory&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SpectralSignaturePlot</name>

diff --git a/i18n/semiautomaticclassificationplugin_pt_BR.ts b/i18n/semiautomaticclassificationplugin_pt_BR.ts
@@ -3742,6 +3742,16 @@ p, li { white-space: pre-wrap; }
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1287"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Band set date&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1322"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Root directory&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SpectralSignaturePlot</name>

diff --git a/i18n/semiautomaticclassificationplugin_uk_UA.ts b/i18n/semiautomaticclassificationplugin_uk_UA.ts
@@ -3742,6 +3742,16 @@ p, li { white-space: pre-wrap; }
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1287"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Band set date&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1322"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Root directory&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SpectralSignaturePlot</name>

diff --git a/i18n/semiautomaticclassificationplugin_zh_CN.ts b/i18n/semiautomaticclassificationplugin_zh_CN.ts
@@ -3742,6 +3742,16 @@ p, li { white-space: pre-wrap; }
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1287"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Band set date&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/ui_semiautomaticclassificationplugin.ui" line="1322"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Root directory&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SpectralSignaturePlot</name>

diff --git a/interface/bandset_tab.py b/interface/bandset_tab.py
@@ -399,11 +399,6 @@ def edited_bandset(row, column):
             )
             bands = bandset_x.bands
             bands['path'][bands['band_number'] == row + 1] = path
-            root = cfg.bandset_catalog.get_root_directory(bandset_number)
-            absolute = cfg.utils.relative_to_absolute_path(
-                path=path, root=root
-            )
-            bands['absolute_path'][bands['band_number'] == row + 1] = absolute
         else:
             band_value = cfg.bandset_catalog.get_bandset(
                 bandset_number, attribute='path'
@@ -819,6 +814,7 @@ def bandset_tools(output_directory, batch=True):
             )
     if batch is False:
         cfg.ui_utils.remove_progress_bar(smtp=str(__name__))
+        cfg.mx.msg_inf_6()
 
 
 # perform bands filter
@@ -1063,4 +1059,13 @@ def explain_q_table_widget():
 
 # add color composite
 def add_composite():
-    cfg.utils.set_rgb_color_composite(composite='3-2-1')
+    table = cfg.dialog.ui.bandset_tableWidget
+    selected = table.selectedItems()
+    selected_list = []
+    for i in range(0, len(selected)):
+        selected_list.append(selected[i].row())
+    selected_list = list(set(selected_list))
+    for index in reversed(selected_list):
+        cfg.utils.set_rgb_color_composite(
+            composite='3-2-1', bandset_number=index + 1
+        )
diff --git a/metadata.txt b/metadata.txt
@@ -2,7 +2,7 @@
 name=Semi-Automatic Classification Plugin
 qgisMinimumVersion=3.00
 description=The Semi-Automatic Classification Plugin (SCP) allows for the supervised classification of remote sensing images, providing tools for the download, the preprocessing and postprocessing of images.
-version=8.0.8
+version=8.0.9
 about=Developed by Luca Congedo, the Semi-Automatic Classification Plugin (SCP) allows for the supervised classification of remote sensing images, providing tools for the download, the preprocessing and postprocessing of images. Search and download is available for Landsat, Sentinel-2 images. Several algorithms are available for the land cover classification. This plugin requires the installation of Remotior Sensus, GDAL, OGR, Numpy, SciPy, and Matplotlib. For more information please visit https://fromgistors.blogspot.com .
 
 author=Luca Congedo
@@ -13,6 +13,9 @@ icon=semiautomaticclassificationplugin.png
 
 changelog=
 
+	8.0.9
+	-fixed RGB composite from Band set tab
+
 	8.0.8
 	-fixed classification preview issue