Merge branch 'dev-3.5' into master-3.5

Giswater · Aug 8, 2023 · 73690fa · 73690fa
2 parents 605f98d + 1005f3d
commit 73690fa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/dbmodel b/dbmodel
diff --git a/main.py b/main.py
@@ -283,8 +283,6 @@ def _set_signals(self):
                                     'main', 'newProjectCreated')
             tools_gw.connect_signal(self.iface.actionSaveProject().triggered, self._save_toolbars_position,
                                     'main', 'actionSaveProject_save_toolbars_position')
-            tools_gw.connect_signal(self.iface.actionSaveProject().triggered, self.save_project,
-                                    'main', 'actionSaveProject_save_project')
         except AttributeError:
             pass
 
@@ -301,7 +299,7 @@ def _unset_signals(self):
         except TypeError:
             pass
         try:
-            self.iface.actionSaveProject().triggered.disconnect()
+            tools_gw.disconnect_signal('main', 'actionSaveProject_save_toolbars_position')
         except TypeError:
             pass
 

diff --git a/metadata.txt b/metadata.txt
@@ -4,14 +4,12 @@ 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.039
+version=3.5.040
 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.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
+Changelog=Version 3.5.040
+    - Bug fix: saving project sometimes crashed qgis
+
 
 tags= giswater, water networks, sewerage, urban drainage, EPANET, SWMM
 homepage=https://www.giswater.org
+1 −1		example/user/ud/ud_99_sample_other.sql
+5 −1		updates/35/35039/changelog.txt
+3 −0		updates/35/35040/changelog.txt
+27 −0		updates/35/35040/utils/dml.sql
+31 −0		updates/35/35040/ws/dml.sql
+31 −10		utils/fct/gw_fct_graphanalytics_mapzones.sql
+13 −1		utils/fct/gw_fct_psector_duplicate.sql
+26 −2		utils/fct/gw_fct_setclosestaddress.sql
+135 −0		ws/fct/ws_gw_fct_import_dscenario_demands.sql
+132 −0		ws/fct/ws_gw_fct_import_valve_status.sql
+4 −1		ws/fct/ws_gw_fct_mincut_connec.sql