Merge pull request #869 from Giswater/dev-3.5

Dev 3.5

config/dev.config

@@ -1,33 +1,34 @@
 [system]
 dev_commit=False #allow user to execute all the files even if one fails
-folder_path="C:\Users\user\AppData\Roaming\QGIS\QGIS3\profiles\dev\python\plugins\giswater\resources\templates\qgisproject\en_US"
+folder_path=C:\Users\user\AppData\Roaming\QGIS\QGIS3\profiles\dev\python\plugins\giswater\resources\templates\qgisproject\en_US
 
 
 [qgis_project_text_replace]
-labels=ProjectCRSProj4String,ProjectCrs,ProjectionsEnabled,dbname,host,port,user,password,schemaws,schemaud,p1, p2, p3, p4, p5, p6, p7, p8, srid1, sslmode
-
-ProjectCRSProj4String="<ProjectCRSProj4String type="QString">+proj=utm +zone=31 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs</ProjectCRSProj4String>", "<ProjectCRSProj4String type="QString">__PROJ4__</ProjectCRSProj4String>"
-ProjectCrs="<ProjectCrs type="QString">EPSG:25831</ProjectCrs>", "<ProjectCrs type="QString">__AUTHID__</ProjectCrs>"
-ProjectionsEnabled="<ProjectionsEnabled type="int">1</ProjectionsEnabled>", "<ProjectionsEnabled type="int">1</ProjectionsEnabled>"
-
-dbname="dbname='giswater' host=localhost port=5435", "__DATASOURCE__"
-host="host=localhost", "host=__HOST__"
-port="port=5435", "port=__PORT__"
-user="user='postgres'", ""
-password="password='postgres'", ""
-schemaws="ws_sample","SCHEMA_NAME"
-schemaud="ud_sample","SCHEMA_NAME"
-p1="<proj4>+proj=utm +zone=31 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs</proj4>", "<proj4>__PROJ4__</proj4>"
-p2="<srsid>2104</srsid>","<srsid>__SRSID__</srsid>"
-p3="<srid>25831</srid>","<srid>__SRID__</srid>"
-p4="<authid>EPSG:25831</authid>","<authid>__AUTHID__</authid>"
-p5="<description>ETRS89 / UTM zone 31N</description>","<description>__DESCRIPTION__</description>"
-p6="<projectionacronym>utm</projectionacronym>","<projectionacronym>__PROJECTIONACRONYM__</projectionacronym>"
-p7="<ellipsoidacronym>GRS80</ellipsoidacronym>","<ellipsoidacronym>__ELLIPSOIDACRONYM__</ellipsoidacronym>"
-p8="<geographicflag>false</geographicflag>","<geographicflag>__GEOGRAPHICFLAG__</geographicflag>"
-srid1="srid=25831", "srid=__SRID__"
-sslmode="sslmode=disable", "sslmode=__SSLMODE__"
-
+labels=ProjectCRSProj4String,ProjectCrs,ProjectionsEnabled,dbname,host,port,user,password,schemaws,schemaud,p1, p2, p3, p4, p5, p6, p7, p8, srid1, sslmode, epsg, wkt
+
+ProjectCRSProj4String=<ProjectCRSProj4String type="QString">+proj=utm +zone=31 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs</ProjectCRSProj4String>, <ProjectCRSProj4String type="QString">__PROJ4__</ProjectCRSProj4String>
+ProjectCrs=<ProjectCrs type="QString">EPSG:25831</ProjectCrs>, <ProjectCrs type="QString">__AUTHID__</ProjectCrs>
+ProjectionsEnabled=<ProjectionsEnabled type="int">1</ProjectionsEnabled>, <ProjectionsEnabled type="int">1</ProjectionsEnabled>
+
+dbname=dbname='giswater' host=localhost port=5435, __DATASOURCE__
+host=host=localhost, host=__HOST__
+port=port=5435, port=__PORT__
+user=user='postgres',
+password=password='postgres',
+schemaws=ws_sample,SCHEMA_NAME
+schemaud=ud_sample,SCHEMA_NAME
+p1=<proj4>+proj=utm +zone=31 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs</proj4>,
+p2=<srsid>2104</srsid>,<srsid>__SRSID__</srsid>
+p3=<srid>25831</srid>,<srid>__SRID__</srid>
+p4=<authid>EPSG:25831</authid>,<authid>__AUTHID__</authid>
+p5=<description>ETRS89 / UTM zone 31N</description>,
+p6=<projectionacronym>utm</projectionacronym>,
+p7=<ellipsoidacronym>GRS80</ellipsoidacronym>,
+p8=<geographicflag>false</geographicflag>,
+srid1=srid=25831,srid=__SRID__
+sslmode=sslmode=disable,sslmode=__SSLMODE__
+epsg=crs="EPSG:25831",crs="__AUTHID__"
+wkt=<wkt>.+</wkt>,
 
 extent='projectlayers/maplayer/extent', ""
 
@@ -42,7 +43,7 @@ geographicflag="projectlayers/maplayer/srs/spatialrefsys/geographicflag", "__GEO
 
 [qgis_project_xml_set]
 labels=xmin,ymin,xmax,ymax
-xmin="<xmin>(.*?)</xmin>", "<xmin>__XMIN__</xmin>"
-ymin="<ymin>(.*?)</ymin>", "<ymin>__YMIN__</ymin>"
-xmax="<xmax>(.*?)</xmax>", "<xmax>__XMAX__</xmax>"
-ymax="<ymax>(.*?)</ymax>", "<ymax>__YMAX__</ymax>"
+xmin=<xmin>(.*?)</xmin>, <xmin>__XMIN__</xmin>
+ymin=<ymin>(.*?)</ymin>, <ymin>__YMIN__</ymin>
+xmax=<xmax>(.*?)</xmax>, <xmax>__XMAX__</xmax>
+ymax=<ymax>(.*?)</ymax>, <ymax>__YMAX__</ymax>

config/giswater.config

@@ -21,7 +21,7 @@ basic = 37, 142, 143
 om = 26, 27, 56, 57, 43, 64, 65, 84
 edit = 01, 02, 16, 17, 28, 44, 20, 68, 69, 39, 34, 66, 33, 67
 cad = 71, 72
-epa = 217, 218, 23, 25, 29, 215
+epa = 218, 23, 25, 29, 215
 plan = 45, 46, 50
 utilities = 206, 99, 83, 58, 214, 59
 toc = 306
@@ -67,7 +67,6 @@ ud = 26, 27
 25 = GwGo2EpaManagerButton
 29 = GwGo2EpaSelectorButton
 215 = GwDscenarioManagerButton
-217 = GwNonVisualButton
 218 = GwNonVisualManagerButton
 # plan
 45 = GwPsectorButton

config/user_params.config

@@ -78,7 +78,6 @@ shortcut_toggle_log_db = Alt+1 #Shortcut to show DB&Notify logs
 214 = None #GwWorkspaceManagerButton
 # toc
 306 = None #GwAddChildLayerButton
-217 = None
 218 = None
 
 [init.toolbars_position]
@@ -98,6 +97,7 @@ _keep_maptool_active = False
 _arc_divide_disable_showlog = False
 _arc_divide_disable_prev_warning = False
 _arc_fusion_disable_showlog = False
+keep_maptool_active = None
 
 [init.btn_go2epa]
 force_import_velocity_higher_50ms = False #If true, it will replace all '>50' velocities for '50'
@@ -697,6 +697,22 @@ _gw_fct_create_dscenario_empty_parent = None
 _gw_fct_create_dscenario_empty_type = None
 _gw_fct_create_dscenario_empty_active = None
 _gw_fct_create_dscenario_empty_expl = None
+_gw_fct_duplicate_dscenario_cmb_feature_type = None
+_gw_fct_duplicate_dscenario_cmb_layers = None
+_gw_fct_duplicate_dscenario_rbt_previous = None
+_gw_fct_duplicate_dscenario_name = None
+_gw_fct_duplicate_dscenario_descript = None
+_gw_fct_duplicate_dscenario_parent = None
+_gw_fct_duplicate_dscenario_type = None
+_gw_fct_duplicate_dscenario_active = None
+_gw_fct_duplicate_dscenario_expl = None
+_gw_fct_duplicate_dscenario_copyfrom = None
+_gw_fct_create_dscenario_from_mincut_cmb_feature_type = None
+_gw_fct_create_dscenario_from_mincut_cmb_layers = None
+_gw_fct_create_dscenario_from_mincut_rbt_previous = None
+_gw_fct_create_dscenario_from_mincut_name = None
+_gw_fct_create_dscenario_from_mincut_descript = None
+_gw_fct_create_dscenario_from_mincut_mincutid = None
 
 [session.docker]
 _position = None
@@ -716,6 +732,7 @@ time_to_compare = None
 
 [session.btn_feature_replace]
 _last_feature_type = None
+last_feature_type = None
 
 [session.btn_featuretype_change]
 _last_feature_type = None
@@ -725,13 +742,17 @@ _featurecat_id = None
 [session.btn_auxpoint]
 _rb_left = None
 _rb_right = None
+rb_left = None
+rb_right = None
 
 [session.btn_arc_divide]
 _last_action = None
 
 [session.btn_arc_fusion]
 _cmb_nodeaction = None
 _cmb_statetype = None
+cmb_nodeaction = None
+cmb_statetype = None
 
 [session.btn_add_visit]
 _cmb_exploitation = None
@@ -761,3 +782,45 @@ _cmb_expl_id = None
 _cmb_timeser_type = None
 _cmb_times_type = None
 
+[session.nonvisual_lids]
+_surface_2 = None
+_surface_3 = None
+_surface_4 = None
+_surface_5 = None
+_surface_6 = None
+_soil_2 = None
+_soil_3 = None
+_soil_4 = None
+_soil_5 = None
+_soil_6 = None
+_soil_7 = None
+_soil_8 = None
+_storage_2 = None
+_storage_3 = None
+_storage_4 = None
+_storage_5 = None
+_drain_2 = None
+_drain_3 = None
+_drain_4 = None
+_drain_5 = None
+_drain_6 = None
+_drain_7 = None
+_drain_8 = None
+_cmb_lidtype = None
+_txt_name = None
+_drainmat_2 = None
+_drainmat_3 = None
+_drainmat_4 = None
+_pavement_2 = None
+_pavement_3 = None
+_pavement_4 = None
+_pavement_5 = None
+_pavement_6 = None
+_pavement_7 = None
+_pavement_8 = None
+
+[session.dlg_mincut]
+_chk_use_planified = None
+_type = None
+_cause = None
+