8.1.5

Author: semiautomaticgit

__init__.py

@@ -34,7 +34,7 @@ def description():
 
 
 def version():
-    return 'Version 8.1.4 - Infinity'
+    return 'Version 8.1.5 - Infinity'
 
 
 def icon():

core/ui_utils.py

@@ -251,7 +251,7 @@ def update_bar(
                         str(err)
 
     # remove progress bar and cancel button
-    def remove_progress_bar(self, smtp=None):
+    def remove_progress_bar(self, smtp=None, sound=None):
         UiUtils.remaining = ''
         try:
             cfg.iface.messageBar().popWidget(UiUtils.widget_bar)
@@ -268,7 +268,8 @@ def remove_progress_bar(self, smtp=None):
                 subject=self.translate('Semi-Automatic Classification Plugin'),
                 message=self.translate('%s: process finished' % smtp)
             )
-        self.finish_sound()
+        if sound is not False:
+            self.finish_sound()
 
     # translate
     @staticmethod

core/util_qgis.py

@@ -226,9 +226,10 @@ def move_layer_to_top(layer):
     try:
         root = get_qgis_project().layerTreeRoot()
         layer = root.findLayer(layer.id())
+        parent = layer.parent()
         layer_clone = layer.clone()
         root.insertChildNode(0, layer_clone)
-        root.removeChildNode(layer)
+        parent.removeChildNode(layer)
     except Exception as err:
         str(err)
 

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.1.4" plugin_id="284">
+    <pyqgis_plugin name="Semi-Automatic Classification Plugin - master" version="8.1.5" 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.1.4</version>
+        <version>8.1.5</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>

interface/classification_tab.py

@@ -375,8 +375,12 @@ def run_classifier(
     # classification
     if preview_point is None:
         bandset = bandset_number
+        finish_sound = True
+        smtp = str(__name__)
     # classification preview
     else:
+        finish_sound = False
+        smtp = None
         cfg.logger.log.debug(
             'preview_point x: %s; y: %s'
             % (str(preview_point.x()),
@@ -455,27 +459,34 @@ def run_classifier(
             # load classifier
             load_classifier = cfg.classifier_preview
     # run classification
-    output = cfg.rs.band_classification(
-        input_bands=bandset, output_path=output_path,
-        spectral_signatures=signature_catalog,
-        macroclass=macroclass, algorithm_name=classifier_name,
-        bandset_catalog=cfg.bandset_catalog, threshold=threshold,
-        signature_raster=signature_raster, cross_validation=cross_validation,
-        input_normalization=input_normalization,
-        load_classifier=load_classifier, class_weight=class_weight,
-        find_best_estimator=find_best_estimator,
-        rf_max_features=rf_max_features, rf_number_trees=rf_number_trees,
-        rf_min_samples_split=rf_min_samples_split,
-        svm_c=svm_c, svm_gamma=svm_gamma, svm_kernel=svm_kernel,
-        mlp_training_portion=mlp_training_portion,
-        mlp_alpha=mlp_alpha, mlp_learning_rate_init=mlp_learning_rate_init,
-        mlp_max_iter=mlp_max_iter, mlp_batch_size=mlp_batch_size,
-        mlp_activation=mlp_activation,
-        mlp_hidden_layer_sizes=mlp_hidden_layer_sizes,
-        classification_confidence=classification_confidence,
-        only_fit=only_fit, save_classifier=save_classifier
-    )
-    if output.check:
+    try:
+        output = cfg.rs.band_classification(
+            input_bands=bandset, output_path=output_path,
+            spectral_signatures=signature_catalog,
+            macroclass=macroclass, algorithm_name=classifier_name,
+            bandset_catalog=cfg.bandset_catalog, threshold=threshold,
+            signature_raster=signature_raster,
+            cross_validation=cross_validation,
+            input_normalization=input_normalization,
+            load_classifier=load_classifier, class_weight=class_weight,
+            find_best_estimator=find_best_estimator,
+            rf_max_features=rf_max_features, rf_number_trees=rf_number_trees,
+            rf_min_samples_split=rf_min_samples_split,
+            svm_c=svm_c, svm_gamma=svm_gamma, svm_kernel=svm_kernel,
+            mlp_training_portion=mlp_training_portion,
+            mlp_alpha=mlp_alpha, mlp_learning_rate_init=mlp_learning_rate_init,
+            mlp_max_iter=mlp_max_iter, mlp_batch_size=mlp_batch_size,
+            mlp_activation=mlp_activation,
+            mlp_hidden_layer_sizes=mlp_hidden_layer_sizes,
+            classification_confidence=classification_confidence,
+            only_fit=only_fit, save_classifier=save_classifier
+        )
+    except Exception as err:
+        cfg.logger.log.error(str(err))
+        cfg.mx.msg_err_1()
+    if output is None:
+        cfg.mx.msg_err_1()
+    elif output.check:
         if save_classifier is not True and preview_point is None:
             output_raster = output.path
             # add raster to layers
@@ -510,7 +521,7 @@ def run_classifier(
                     str(err)
     else:
         cfg.mx.msg_err_1()
-    cfg.ui_utils.remove_progress_bar(smtp=str(__name__))
+    cfg.ui_utils.remove_progress_bar(smtp=smtp, sound=finish_sound)
     return output
 
 

interface/scp_dock.py

@@ -1232,7 +1232,7 @@ def calculate_signatures():
         )
         cfg.ui_utils.add_progress_bar()
         cfg.scp_training.calculate_signature_of_selected_signatures()
-        cfg.ui_utils.remove_progress_bar()
+        cfg.ui_utils.remove_progress_bar(sound=False)
         cfg.dock_class_dlg.ui.undo_save_Button.setEnabled(True)
         cfg.dock_class_dlg.ui.redo_save_Button.setEnabled(False)
         # create table tree
@@ -1249,7 +1249,11 @@ def merge_signatures():
     if len(selected) > 0:
         answer = cfg.util_qt.question_box(
             cfg.translate('Merge signatures'),
-            cfg.translate('Merge highlighted signatures?')
+            '%s MC ID: %s and C ID:%s?' % (
+                cfg.translate('Merge highlighted signatures into'),
+                cfg.project_registry[cfg.reg_roi_class_id],
+                cfg.project_registry[cfg.reg_roi_macroclass_id],
+            )
         )
         if answer is True:
             # save previous catalog file
@@ -1260,7 +1264,7 @@ def merge_signatures():
             )
             cfg.ui_utils.add_progress_bar()
             cfg.scp_training.merge_selected_signatures()
-            cfg.ui_utils.remove_progress_bar()
+            cfg.ui_utils.remove_progress_bar(sound=False)
             cfg.dock_class_dlg.ui.undo_save_Button.setEnabled(True)
             cfg.dock_class_dlg.ui.redo_save_Button.setEnabled(False)
             # create table tree
@@ -2019,7 +2023,7 @@ def save_roi_to_training(bandset_number=None):
             # save training input
             if cfg.project_registry[cfg.reg_save_training_input_check] == 2:
                 cfg.scp_training.save_signature_catalog()
-        cfg.ui_utils.remove_progress_bar()
+        cfg.ui_utils.remove_progress_bar(sound=False)
 
 
 # undo training modifications
@@ -2203,7 +2207,7 @@ def calculate_pixel_signature(point, bandset_number=None):
     except Exception as err:
         cfg.logger.log.error(str(err))
         cfg.mx.msg_err_6()
-        cfg.ui_utils.remove_progress_bar()
+        cfg.ui_utils.remove_progress_bar(sound=False)
         return False
     bandset = cfg.bandset_catalog.get(bandset_number)
     if bandset is None:
@@ -2229,7 +2233,7 @@ def calculate_pixel_signature(point, bandset_number=None):
     )
     (value_list, standard_deviation_list, wavelength_list,
      pixel_count) = signature_catalog.calculate_signature(roi_path)
-    cfg.ui_utils.remove_progress_bar()
+    cfg.ui_utils.remove_progress_bar(sound=False)
     plot_catalog = cfg.spectral_signature_plotter.plot_catalog
     signature_id = generate_signature_id()
     color_string = cfg.rs.shared_tools.random_color()
@@ -2274,7 +2278,7 @@ def create_region_growing_roi(point, bandset_number=None):
         except Exception as err:
             cfg.logger.log.error(str(err))
             cfg.mx.msg_err_6()
-            cfg.ui_utils.remove_progress_bar()
+            cfg.ui_utils.remove_progress_bar(sound=False)
             return False
         # create memory temp ROI
         region_crs = cfg.util_gdal.get_crs_gdal(region_path)
@@ -2324,7 +2328,7 @@ def create_region_growing_roi(point, bandset_number=None):
             temporary_roi_spectral_signature(bandset_number=bandset_number)
         cfg.dock_class_dlg.ui.button_Save_ROI.setEnabled(True)
         cfg.redo_ROI_Button.setEnabled(True)
-        cfg.ui_utils.remove_progress_bar()
+        cfg.ui_utils.remove_progress_bar(sound=False)
 
 
 # calculate temporary ROI spectral signature
@@ -2348,7 +2352,7 @@ def temporary_roi_spectral_signature(bandset_number=None, roi_path=None):
     # add signature to plot
     (value_list, standard_deviation_list, wavelength_list,
      pixel_count) = signature_catalog.calculate_signature(roi_path)
-    cfg.ui_utils.remove_progress_bar()
+    cfg.ui_utils.remove_progress_bar(sound=False)
     plot_catalog = cfg.spectral_signature_plotter.plot_catalog
     signature_id = generate_signature_id()
     color_string = cfg.rs.shared_tools.random_color()
@@ -2620,7 +2624,7 @@ def add_signature_to_spectral_plot(tab_index=0):
                     signature_catalog.export_signature_values_for_plot(
                         signature_id=_id, plot_catalog=plot_catalog
                     )
-            cfg.ui_utils.remove_progress_bar()
+            cfg.ui_utils.remove_progress_bar(sound=False)
             cfg.spectral_signature_plotter.signature_list_plot_table()
             cfg.input_interface.spectral_plot_tab()
             cfg.input_interface.select_spectral_plot_settings_tab(tab_index)

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.1.4
+version=8.1.5
 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,12 @@ icon=semiautomaticclassificationplugin.png
 
 changelog=
 
+	8.1.5
+	-added information message when merging ROIs
+	-minor fixes classification tab
+	-fixed move layer to top
+	-fixed finish sound
+
 	8.1.4
 	-fixed finish sound
 

spectral_signature/signature_importer.py

@@ -116,7 +116,7 @@ def library_changed(self):
                 check, output = cfg.rs.download_tools.download_file(
                     link, temp_path, timeout=2
                 )
-                cfg.ui_utils.remove_progress_bar()
+                cfg.ui_utils.remove_progress_bar(sound=False)
                 if check is True:
                     description = open(temp_path, 'r', errors='ignore')
                     description_html = description.read()
@@ -146,7 +146,7 @@ def download_library(link):
         except Exception as err:
             str(err)
             check = False
-        cfg.ui_utils.remove_progress_bar()
+        cfg.ui_utils.remove_progress_bar(sound=False)
         if check is False:
             cfg.mx.msg_err_5()
             return None, None, None