Merge pull request #896 from Giswater/dev-3.5

Dev 3.5

config/user_params.config

@@ -104,8 +104,8 @@ _psector_replace_feature_keep_active = False
 force_import_velocity_higher_50ms = False #If true, it will replace all '>50' velocities for '50'
 
 [init.btn_go2epa_selector]
-_load_result_layers = True #If true, it will automatically load the epa results layers
-_load_compare_layers = True #If true, it will automatically load the epa compare layers
+_load_result_layers = False #If true, it will automatically load the epa results layers
+_load_compare_layers = False #If true, it will automatically load the epa compare layers
 
 [session.btn_admin]
 project_type = None

core/admin/admin_btn.py

@@ -1774,6 +1774,8 @@ def _open_create_project(self):
         self._change_project_type(self.cmb_create_project_type)
         self.connection_name = str(tools_qt.get_text(self.dlg_readsql, self.cmb_connection))
 
+        self._update_time_elapsed("", self.dlg_readsql_create_project)
+
         # Open dialog
         self.dlg_readsql_create_project.setWindowTitle(f"Create Project - {self.connection_name}")
         tools_gw.open_dialog(self.dlg_readsql_create_project, dlg_name='admin_dbproject')

core/toolbars/epa/go2epa_selector_button.py

@@ -35,7 +35,7 @@ def _load_result_layers(self):
         """ Adds any missing Compare layers to TOC """
 
         # Manage user variable
-        if not tools_os.set_boolean(tools_gw.get_config_parser('btn_go2epa_selector', 'load_result_layers', "user", "init")):
+        if not tools_os.set_boolean(tools_gw.get_config_parser('btn_go2epa_selector', 'load_result_layers', "user", "init"), default=False):
             return
 
         filtre = "(id LIKE 'v_rpt_arc%' OR id LIKE 'v_rpt_node%')"
@@ -57,7 +57,7 @@ def _load_compare_layers(self):
         """ Adds any missing Compare layers to TOC """
 
         # Manage user variable
-        if not tools_os.set_boolean(tools_gw.get_config_parser('btn_go2epa_selector', 'load_compare_layers', "user", "init")):
+        if not tools_os.set_boolean(tools_gw.get_config_parser('btn_go2epa_selector', 'load_compare_layers', "user", "init"), default=False):
             return
 
         filtre = 'v_rpt_comp_%'

lib/tools_os.py

@@ -159,7 +159,7 @@ def manage_pg_service(section):
         tools_log.log_warning(f"File defined in environment variable 'PGSERVICEFILE' not found: {service_file}")
         return None
 
-    config_parser = configparser.ConfigParser(strict=False)
+    config_parser = configparser.ConfigParser(comment_prefixes=";", allow_no_value=True, strict=False)
     credentials = {'host': None, 'port': None, 'dbname': None, 'user': None, 'password': None, 'sslmode': None}
     try:
         config_parser.read(service_file)

lib/tools_qgis.py

@@ -21,7 +21,7 @@
 from qgis.core import QgsExpressionContextUtils, QgsProject, QgsPointLocator, \
     QgsSnappingUtils, QgsTolerance, QgsPointXY, QgsFeatureRequest, QgsRectangle, QgsSymbol, \
     QgsLineSymbol, QgsRendererCategory, QgsCategorizedSymbolRenderer, QgsGeometry, QgsCoordinateReferenceSystem, \
-    QgsCoordinateTransform
+    QgsCoordinateTransform, QgsFillSymbol
 from qgis.core import QgsVectorLayer
 from qgis.utils import iface
 
@@ -202,7 +202,7 @@ def get_plugin_metadata(parameter, default_value, plugin_dir=None):
 
     value = None
     try:
-        metadata = configparser.ConfigParser(strict=False)
+        metadata = configparser.ConfigParser(comment_prefixes=";", allow_no_value=True, strict=False)
         metadata.read(metadata_file)
         value = metadata.get('general', parameter)
     except configparser.NoOptionError:
@@ -224,7 +224,7 @@ def get_plugin_version():
         message = f"Metadata file not found: {metadata_file}"
         return plugin_version, message
 
-    metadata = configparser.ConfigParser(strict=False)
+    metadata = configparser.ConfigParser(comment_prefixes=";", allow_no_value=True, strict=False)
     metadata.read(metadata_file)
     plugin_version = metadata.get('general', 'version')
     if plugin_version is None:
@@ -676,7 +676,7 @@ def restore_user_layer(layer_name, user_current_layer=None):
             iface.setActiveLayer(layer)
 
 
-def set_layer_categoryze(layer, cat_field, size, color_values, unique_values=None):
+def set_layer_categoryze(layer, cat_field, size, color_values, unique_values=None, opacity=255):
     """
     :param layer: QgsVectorLayer to be categorized (QgsVectorLayer)
     :param cat_field: Field to categorize (String)
@@ -695,6 +695,8 @@ def set_layer_categoryze(layer, cat_field, size, color_values, unique_values=Non
         symbol = QgsSymbol.defaultSymbol(layer.geometryType())
         if type(symbol) in (QgsLineSymbol, ):
             symbol.setWidth(size)
+        elif type(symbol) in (QgsFillSymbol, ):
+            pass
         else:
             symbol.setSize(size)
 
@@ -703,7 +705,7 @@ def set_layer_categoryze(layer, cat_field, size, color_values, unique_values=Non
             color = color_values.get(str(unique_value))
             symbol.setColor(color)
         except Exception:
-            color = QColor(randrange(0, 256), randrange(0, 256), randrange(0, 256))
+            color = QColor(randrange(0, 256), randrange(0, 256), randrange(0, 256), opacity)
             symbol.setColor(color)
 
         # create renderer object

lib/tools_qt.py

@@ -948,14 +948,15 @@ def reset_model(dialog, table_object, feature_type):
 
 def get_feature_by_id(layer, id, field_id=None):
 
-    features = layer.getFeatures()
-    for feature in features:
-        if field_id is None:
-            if feature.id() == id:
-                return feature
-        else:
+    if field_id is not None:
+        expr = f"{field_id} = '{id}'"
+        features = layer.getFeatures(expr)
+        for feature in features:
             if feature[field_id] == id:
                 return feature
+    else:
+        return layer.getFeature(id)
+
     return False
 
 

main.py

@@ -200,16 +200,21 @@ def _init_plugin(self):
         self._manage_user_config_folder(f"{global_vars.user_folder_dir}{os.sep}core")
 
         # Initialize parsers of configuration files: init, session, giswater, user_params
-        tools_gw.initialize_parsers()
+        success = tools_gw.initialize_parsers()
 
-        # Check if user has config files 'init' and 'session' and its parameters (only those without prefix)
-        try:
-            tools_gw.check_old_userconfig(global_vars.user_folder_dir)
-        except Exception as e:
-            # This may happen if the user doesn't have permission to move/delete files
-            msg = "Exception while moving/deleting old user config files"
-            tools_log.log_warning(msg, parameter=e)
-        tools_gw.user_params_to_userconfig()
+        if not success:
+            tools_gw.recreate_config_files()
+            msg = "The user config files have been recreated. A backup of the broken ones have been created at"
+            tools_qgis.show_message(msg, message_level=3, title="Parsing error fixed", parameter=f"{global_vars.user_folder_dir}{os.sep}core{os.sep}config{os.sep}")
+        else:
+            # Check if user has config files 'init' and 'session' and its parameters (only those without prefix)
+            try:
+                tools_gw.check_old_userconfig(global_vars.user_folder_dir)
+            except Exception as e:
+                # This may happen if the user doesn't have permission to move/delete files
+                msg = "Exception while moving/deleting old user config files"
+                tools_log.log_warning(msg, parameter=e)
+            tools_gw.user_params_to_userconfig()
 
         # Set logger parameters min_log_level and log_limit_characters
         min_log_level = tools_gw.get_config_parser('log', 'log_level', 'user', 'init', False)

metadata.txt

@@ -4,14 +4,15 @@ qgisMinimumVersion=3.10
 qgisMaximumVersion=3.99
 description=Plugin to manage water networks (water supply, sewerage and urban drainage) using QGIS and PostGIS-PostgreSQL(from 9.5 to 14.x)
 about=Disclaimer: This plugin is released using the open source GNU-GPL3 license. Although a reasonable effort has been made to assure that the results obtained are correct,  some of the capabilities provided by Giswater are experimental, therefore the development team and the Giswater Association are not responsible and assume no liability whatsoever for any results or any use made of the results obtained from the program, nor for any damages or litigation that result from the use of these programs for any purpose.
-version=3.5.038
+version=3.5.039
 author=David Erill, Luigi Pirelli, Natasa Cica, Nestor Ibañez, Adrian Valenciano, Barbara Rzepka, Sergi Muñoz, Josep Lluís Sala, Edgar Fusté, Albert Bofill, Sergi Maspons, Elies Bertran, Abel García Juanes, Xavier Torret
 
-Changelog=Version 3.5.038
-    - Add user variables to auto load or not go2epa selector layers
+Changelog=Version 3.5.039
+    - Massive performance improvement of get_feature_by_id. Now the tools that search for features should be faster
+    - Improve handling of config files.
+    - Don't load epa result/compare layers by default
     - Various bug fixes
 
-
 tags= giswater, water networks, sewerage, urban drainage, EPANET, SWMM
 homepage=https://www.giswater.org
 repository=https://github.com/giswater/giswater_qgis_plugin

test/test_giswater.py

@@ -85,7 +85,7 @@ def get_plugin_metadata(self, parameter, default_value):
 
         value = None
         try:
-            metadata = configparser.ConfigParser()
+            metadata = configparser.ConfigParser(comment_prefixes=";", allow_no_value=True, strict=False)
             metadata.read(metadata_file)
             value = metadata.get('general', parameter)
         except configparser.NoOptionError: