Merge branch 'main' of https://github.com/danpejobo/geovita_processing_plugin

Author: Daniel

geovita_processing_plugin/__init__.py

@@ -26,7 +26,7 @@
 __date__ = '2024-01-17'
 __copyright__ = '(C) 2024 by DPE'
 
-__version__ = "3.1.0"
+__version__ = "3.1.1"
 
 import sys
 from pathlib import Path

geovita_processing_plugin/algorithms/BegrensSkadeExcavation.py

@@ -108,13 +108,17 @@ def __init__(self):
             "BegrensSkadeII_QGIS_EXCAVATION.log",
             "EXCAVATION_LOGGER",
         ).get_logger()
-        self.logger.info("__INIT__ - Finished initialize BegrensSkadeExcavation ")
+        
+        # Retrieve version number from BaseAlgorithm class "GvBaseProcessingAlgorithms"
+        self.version = self.getVersion()
+        self.logger.info(f"__INIT__ - VERSION: {self.version} ")
 
         # instanciate variables used in postprocessing to add layers to GUI
         self.feature_name = None  # Default value
         self.layers_info = {}
         self.styles_dir_path = Path()
         self.add_layers_task = AddLayersTask()
+        self.logger.info("__INIT__ - Finished initialize BegrensSkadeExcavation ")
 
     def tr(self, string):
         return QCoreApplication.translate("Processing", string)
@@ -482,6 +486,9 @@ def processAlgorithm(self, parameters, context, feedback):
         Here is where the processing itself takes place.
         """
         self.logger.info("PROCESS - Starting the processing")
+        feedback.pushInfo(
+                f"PROCESS - Version: {self.version}"
+            )
         # Retrieve the feature source and sink. The 'dest_id' variable is used
         # to uniquely identify the feature sink, and must be included in the
         # dictionary returned by the processAlgorithm function.
@@ -849,7 +856,7 @@ def processAlgorithm(self, parameters, context, feedback):
                         "shape_path": output_shapefiles[0],
                         "style_name": "BUILDING-TOTAL-RISK-SELLMENT_risk_tots.qml",
                     },
-                    "BUILDING-TOTAL-ANGLE": {
+                    "BUILDING-RISK-ANGLE": {
                         "shape_path": output_shapefiles[0],
                         "style_name": "BUILDING-TOTAL-RISK-ANGLE_risk_angle.qml",
                     },

geovita_processing_plugin/algorithms/BegrensSkadeImpactMap.py

@@ -107,13 +107,17 @@ def __init__(self):
         self.logger = CustomLogger(
             log_dir_path, "BegrensSkadeII_QGIS_IMPACTMAP.log", "IMPACTMAP_LOGGER"
         ).get_logger()
-        self.logger.info("__INIT__ - Finished initialize BegrensSkadeImpactMap ")
+        
+        # Retrieve version number from BaseAlgorithm class "GvBaseProcessingAlgorithms"
+        self.version = self.getVersion()
+        self.logger.info(f"__INIT__ - VERSION: {self.version} ")
 
         # instanciate variables used in postprocessing to add layers to GUI
         self.feature_name = None  # Default value
         self.layers_info = {}
         self.styles_dir_path = Path()
         self.add_layers_task = AddLayersTask()
+        self.logger.info("__INIT__ - Finished initialize BegrensSkadeImpactMap ")
 
     def name(self):
         """
@@ -397,6 +401,9 @@ def processAlgorithm(self, parameters, context, feedback):
         """
         Here is where the processing itself takes place.
         """
+        feedback.pushInfo(
+                f"PROCESS - Version: {self.version}"
+            )
         bShortterm = self.parameterAsBoolean(
             parameters, self.SHORT_TERM_SETTLEMENT[0], context
         )

geovita_processing_plugin/algorithms/BegrensSkadeTunnel.py

@@ -108,13 +108,17 @@ def __init__(self):
         self.logger = CustomLogger(
             log_dir_path, "BegrensSkadeII_QGIS_TUNNEL.log", "TUNNEL_LOGGER"
         ).get_logger()
-        self.logger.info("__INIT__ - Finished initialize BegrensSkadeTunnel ")
+        
+        # Retrieve version number from BaseAlgorithm class "GvBaseProcessingAlgorithms"
+        self.version = self.getVersion()
+        self.logger.info(f"__INIT__ - VERSION: {self.version} ")
 
         # instanciate variables used in postprocessing to add layers to GUI
         self.feature_name = None  # Default value
         self.layers_info = {}
         self.styles_dir_path = Path()
         self.add_layers_task = AddLayersTask()
+        self.logger.info("__INIT__ - Finished initialize BegrensSkadeTunnel ")
 
     def name(self):
         """
@@ -501,6 +505,9 @@ def processAlgorithm(self, parameters, context, feedback):
         """
         Here is where the processing itself takes place.
         """
+        feedback.pushInfo(
+                f"PROCESS - Version: {self.version}"
+            )
         bShortterm = self.parameterAsBoolean(
             parameters, self.SHORT_TERM_SETTLEMENT[0], context
         )

geovita_processing_plugin/algorithms/base_algorithm.py

@@ -32,8 +32,12 @@
 
 from qgis.core import (QgsProcessingAlgorithm)
 
+from geovita_processing_plugin import __version__  # Import version from package's __init__.py
+
 
 class GvBaseProcessingAlgorithms(QgsProcessingAlgorithm):
     """
     Base class for Geovita algorithms.
-    """
+    """
+    def getVersion(self):
+        return __version__

geovita_processing_plugin/metadata.txt

@@ -7,7 +7,7 @@ name=Geovita GIS Processing provider
 qgisMinimumVersion=3.28
 qgisMaximumVersion=3.99
 description=This plugin adds different Geovita custom processing algorithms to QGIS
-version=3.1.0
+version=3.1.1
 author=DPE
 [email protected]
 
@@ -28,7 +28,12 @@ repository=https://github.com/danpejobo/geovita_processing_plugin
 
 hasProcessingProvider=yes
 # Uncomment the following line and add your changelog:
-changelog=v.3.1.0 (14.02.2024)
+changelog=v.3.1.1 (04.03.2024)
+	- Add version logging and feedback.
+	- Fix for two layers having the same name in the excavation algorithm (thus only one showing in TOC)
+	- Fix "label" attributes for the styles to the excavation and tunnel algorithms
+
+	v.3.1.0 (14.02.2024)
 	- Minor fix in vulnerability analysis for excavation and tunnel. Fields can be omitted (i.e corresponding analysis are dropped). Any combination of the three vulnerability fields can be assessed.
 
 	v.3.0.0 (09.02.2024)