From c5160bb16b7f52b70aba6a394754530244bf7bb6 Mon Sep 17 00:00:00 2001 From: Ferran Date: Wed, 15 May 2024 13:07:13 +0200 Subject: [PATCH 01/22] minor refactor geometry type of rubber_bands --- core/shared/dimensioning.py | 2 +- core/shared/info.py | 4 +-- core/shared/mincut_tools.py | 2 +- core/toolbars/cad/aux_circle_add_button.py | 11 ++++-- core/toolbars/cad/aux_point_add_button.py | 35 +++++++++++-------- core/toolbars/edit/connect_link_button.py | 4 +-- core/toolbars/maptool.py | 2 +- core/utils/select_manager.py | 4 +-- core/utils/tools_gw.py | 39 +++++++++++++++++++--- 9 files changed, 74 insertions(+), 29 deletions(-) diff --git a/core/shared/dimensioning.py b/core/shared/dimensioning.py index 430098b49..0205d867a 100644 --- a/core/shared/dimensioning.py +++ b/core/shared/dimensioning.py @@ -57,7 +57,7 @@ def open_dimensioning_form(self, qgis_feature=None, layer=None, db_return=None, # when function is called from new feature if db_return is None: - rubber_band = tools_gw.create_rubberband(self.canvas, QgsWkbTypes.PointGeometry) + rubber_band = tools_gw.create_rubberband(self.canvas, "point") extras = f'"coordinates":{{{self.points}}}' body = tools_gw.create_body(extras=extras) json_result = tools_gw.execute_procedure('gw_fct_getdimensioning', body) diff --git a/core/shared/info.py b/core/shared/info.py index 208dbedb9..6be5f2387 100644 --- a/core/shared/info.py +++ b/core/shared/info.py @@ -69,7 +69,7 @@ def __init__(self, tab_type): self.layer_new_feature = None self.tab_type = tab_type self.connected = False - self.rubber_band = tools_gw.create_rubberband(self.canvas, QgsWkbTypes.PointGeometry) + self.rubber_band = tools_gw.create_rubberband(self.canvas, "point") self.snapper_manager = GwSnapManager(self.iface) self.snapper_manager.set_snapping_layers() self.conf_supp = None @@ -1180,7 +1180,7 @@ def _snapping_node(self, dlg_interpolate, point, button): snapped_feat = self.snapper_manager.get_snapped_feature(result) element_id = snapped_feat.attribute('node_id') message = "Selected node" - rb = tools_gw.create_rubberband(global_vars.canvas, QgsWkbTypes.PointGeometry) + rb = tools_gw.create_rubberband(global_vars.canvas, "point") if self.node1 is None: self.node1 = str(element_id) tools_qgis.draw_point(QgsPointXY(result.point()), rb, color=QColor(0, 150, 55, 100), width=10) diff --git a/core/shared/mincut_tools.py b/core/shared/mincut_tools.py index fa58b8182..31b8c26c3 100644 --- a/core/shared/mincut_tools.py +++ b/core/shared/mincut_tools.py @@ -35,7 +35,7 @@ def __init__(self, mincut): self.schema_name = lib_vars.schema_name self.settings = global_vars.giswater_settings - self.rubber_band = tools_gw.create_rubberband(self.canvas, QgsWkbTypes.PointGeometry) + self.rubber_band = tools_gw.create_rubberband(self.canvas, "point") def set_dialog(self, dialog): self.dlg_mincut_man = dialog diff --git a/core/toolbars/cad/aux_circle_add_button.py b/core/toolbars/cad/aux_circle_add_button.py index 3c025b42f..2f3f2b702 100644 --- a/core/toolbars/cad/aux_circle_add_button.py +++ b/core/toolbars/cad/aux_circle_add_button.py @@ -30,7 +30,7 @@ def __init__(self, icon_path, action_name, text, toolbar, action_group): self.cancel_circle = False self.layer_circle = None self.snap_to_selected_layer = False - self.rb_circle = tools_gw.create_rubberband(self.canvas, QgsWkbTypes.LineGeometry) + self.rb_circle = tools_gw.create_rubberband(self.canvas, "line") self.rb_circle.setLineStyle(Qt.DashLine) self.rb_circle.setColor(QColor(255, 0, 0, 150)) @@ -133,7 +133,10 @@ def deactivate(self): # Call parent method super().deactivate() - self.iface.setActiveLayer(self.current_layer) + try: + self.iface.setActiveLayer(self.current_layer) + except RuntimeError: + pass # endregion @@ -167,6 +170,8 @@ def _init_create_circle_form(self, point): self.dlg_create_circle.radius.textChanged.connect(partial(self._preview_circle, point)) self.dlg_create_circle.btn_accept.clicked.connect(partial(self._get_radius, point)) self.dlg_create_circle.btn_cancel.clicked.connect(self.cancel) + self.dlg_create_circle.rejected.connect(self.cancel) + tools_gw.open_dialog(self.dlg_create_circle, dlg_name='auxcircle') self.dlg_create_circle.radius.setFocus() @@ -282,6 +287,6 @@ def _add_aux_circle(self, event): def _reset_rubberbands(self): - tools_gw.reset_rubberband(self.rb_circle, QgsWkbTypes.LineGeometry) + tools_gw.reset_rubberband(self.rb_circle, "line") # endregion \ No newline at end of file diff --git a/core/toolbars/cad/aux_point_add_button.py b/core/toolbars/cad/aux_point_add_button.py index 1113aa4d1..db7027b5a 100644 --- a/core/toolbars/cad/aux_point_add_button.py +++ b/core/toolbars/cad/aux_point_add_button.py @@ -32,17 +32,17 @@ def __init__(self, icon_path, action_name, text, toolbar, action_group): self.snap_to_selected_layer = False # RUBBERBANDS TO PREVIEW RESULT # Background points & line - self.rb_bg_point = tools_gw.create_rubberband(self.canvas, QgsWkbTypes.PointGeometry) + self.rb_bg_point = tools_gw.create_rubberband(self.canvas, "point") self.rb_bg_point.setColor(QColor(0, 0, 0, 150)) - self.rb_bg_line = tools_gw.create_rubberband(self.canvas, QgsWkbTypes.LineGeometry) + self.rb_bg_line = tools_gw.create_rubberband(self.canvas, "line") self.rb_bg_line.setLineStyle(Qt.DashLine) self.rb_bg_line.setColor(QColor(0, 0, 0, 150)) # Start point from where it will calculate final point - self.rb_start_point = tools_gw.create_rubberband(self.canvas, QgsWkbTypes.PointGeometry) + self.rb_start_point = tools_gw.create_rubberband(self.canvas, "point") self.rb_start_point.setColor(QColor(0, 0, 255, 100)) self.rb_start_point.setWidth(5) # Final point calculated - self.rb_final_point = tools_gw.create_rubberband(self.canvas, QgsWkbTypes.PointGeometry) + self.rb_final_point = tools_gw.create_rubberband(self.canvas, "point") self.rb_final_point.setColor(QColor(255, 0, 0, 150)) self.rb_final_point.setWidth(3) self.rb_final_point.setIcon(QgsRubberBand.ICON_X) @@ -157,6 +157,11 @@ def deactivate(self): # Call parent method super().deactivate() self.iface.setActiveLayer(self.current_layer) + try: + self.iface.setActiveLayer(self.current_layer) + except RuntimeError: + pass + # endregion @@ -194,6 +199,7 @@ def _init_create_point_form(self, point_1=None, point_2=None): self.dlg_create_point.rb_left.toggled.connect(partial(self._preview_point, self.dlg_create_point, point_1, point_2)) self.dlg_create_point.btn_accept.clicked.connect(partial(self._get_values, point_1, point_2)) self.dlg_create_point.btn_cancel.clicked.connect(self.cancel) + self.dlg_create_point.rejected.connect(self.cancel) if tools_gw.get_config_parser('btn_auxpoint', "rb_left", "user", "session") in ("True", True): self.dlg_create_point.rb_left.setChecked(True) @@ -206,7 +212,7 @@ def _init_create_point_form(self, point_1=None, point_2=None): def _preview_point(self, dialog, point1, point2): - self.rb_final_point.reset(QgsWkbTypes.PointGeometry) + tools_gw.reset_rubberband(self.rb_final_point, "point") value_x = tools_qt.get_text(dialog, 'dist_x') value_y = tools_qt.get_text(dialog, 'dist_y') @@ -228,7 +234,8 @@ def _preview_point(self, dialog, point1, point2): else: start_point = point2 - self.rb_start_point.reset(QgsWkbTypes.PointGeometry) + tools_gw.reset_rubberband(self.rb_start_point, "point") + self.rb_start_point.addPoint(start_point) # Calculate the vector from point1 to point2 @@ -302,6 +309,7 @@ def _get_values(self, point_1, point_2): self.iface.actionPan().trigger() self.cancel_point = False return + self._reset_rubberbands() def _add_aux_point(self, event): @@ -324,15 +332,16 @@ def _add_aux_point(self, event): if self.point_1 is None: self.point_1 = point - self.rb_bg_line.reset(QgsWkbTypes.LineGeometry) - self.rb_bg_point.reset(QgsWkbTypes.PointGeometry) + tools_gw.reset_rubberband(self.rb_bg_line, "line") + tools_gw.reset_rubberband(self.rb_bg_point, "point") self.rb_bg_point.addPoint(self.point_1) else: self.point_2 = point self.rb_bg_point.addPoint(self.point_2) if self.point_1 is not None and self.point_2 is not None: - self.rb_bg_line.reset(QgsWkbTypes.LineGeometry) + tools_gw.reset_rubberband(self.rb_bg_line, "line") + p1 = QgsPoint(self.point_1) p2 = QgsPoint(self.point_2) self.rb_bg_line.addGeometry(QgsGeometry.fromPolyline([p1, p2])) @@ -353,9 +362,9 @@ def _add_aux_point(self, event): def _reset_rubberbands(self): - tools_gw.reset_rubberband(self.rb_bg_point, QgsWkbTypes.PointGeometry) - tools_gw.reset_rubberband(self.rb_bg_line, QgsWkbTypes.LineGeometry) - tools_gw.reset_rubberband(self.rb_start_point, QgsWkbTypes.PointGeometry) - tools_gw.reset_rubberband(self.rb_final_point, QgsWkbTypes.PointGeometry) + tools_gw.reset_rubberband(self.rb_bg_point, "point") + tools_gw.reset_rubberband(self.rb_bg_line, "line") + tools_gw.reset_rubberband(self.rb_start_point, "point") + tools_gw.reset_rubberband(self.rb_final_point, "point") # endregion \ No newline at end of file diff --git a/core/toolbars/edit/connect_link_button.py b/core/toolbars/edit/connect_link_button.py index 3d14b354e..545b6db2f 100644 --- a/core/toolbars/edit/connect_link_button.py +++ b/core/toolbars/edit/connect_link_button.py @@ -72,7 +72,7 @@ def canvasMoveEvent(self, event): def canvasPressEvent(self, event): self.select_rect.setRect(0, 0, 0, 0) - tools_gw.reset_rubberband(self.rubber_band, QgsWkbTypes.PolygonGeometry) + tools_gw.reset_rubberband(self.rubber_band, "polygon") def canvasReleaseEvent(self, event): @@ -242,7 +242,7 @@ def _set_rubber_band(self): ur = transform.toMapCoordinates(self.select_rect.right(), self.select_rect.top()) # Rubber band - tools_gw.reset_rubberband(self.rubber_band, QgsWkbTypes.PolygonGeometry) + tools_gw.reset_rubberband(self.rubber_band, "polygon") self.rubber_band.addPoint(ll, False) self.rubber_band.addPoint(lr, False) self.rubber_band.addPoint(ur, False) diff --git a/core/toolbars/maptool.py b/core/toolbars/maptool.py index 9ef7b8930..cb5d06150 100644 --- a/core/toolbars/maptool.py +++ b/core/toolbars/maptool.py @@ -55,7 +55,7 @@ def __init__(self, icon_path, action_name, text, toolbar, action_group, icon_typ # Set default rubber band color = QColor(255, 100, 255) color_selection = QColor(254, 178, 76, 63) - self.rubber_band = tools_gw.create_rubberband(self.canvas, QgsWkbTypes.LineGeometry) + self.rubber_band = tools_gw.create_rubberband(self.canvas, "line") self.rubber_band.setColor(color) self.rubber_band.setFillColor(color_selection) self.rubber_band.setWidth(1) diff --git a/core/utils/select_manager.py b/core/utils/select_manager.py index 2727e7710..6ee0b9024 100644 --- a/core/utils/select_manager.py +++ b/core/utils/select_manager.py @@ -39,7 +39,7 @@ def __init__(self, class_object, table_object=None, dialog=None, query=None): self.snapper_manager = GwSnapManager(self.iface) - self.rubber_band = tools_gw.create_rubberband(self.canvas, QgsWkbTypes.LineGeometry) + self.rubber_band = tools_gw.create_rubberband(self.canvas, "line") self.rubber_band.setColor(QColor(255, 100, 255)) self.rubber_band.setFillColor(QColor(254, 178, 76, 63)) self.rubber_band.setWidth(2) @@ -156,7 +156,7 @@ def _get_rectangle(self): def _reset_rubber_band(self): try: - tools_gw.reset_rubberband(self.rubber_band, QgsWkbTypes.PolygonGeometry) + tools_gw.reset_rubberband(self.rubber_band, "polygon") except Exception: pass diff --git a/core/utils/tools_gw.py b/core/utils/tools_gw.py index 6d2c81e3c..2d67283fb 100644 --- a/core/utils/tools_gw.py +++ b/core/utils/tools_gw.py @@ -13,7 +13,7 @@ import re import sys import sqlite3 -from typing import Literal +from typing import Literal, Dict import webbrowser import xml.etree.ElementTree as ET @@ -54,6 +54,33 @@ # noinspection PyUnresolvedReferences from ..shared import info, mincut_tools +QgsGeometryType = Literal['line', 'point', 'polygon'] + +if Qgis.QGIS_VERSION_INT < 33000: + geom_types_dict: Dict = { + "line": QgsWkbTypes.LineGeometry, + "point": QgsWkbTypes.PointGeometry, + "polygon": QgsWkbTypes.PolygonGeometry + } + +else: + geom_types_dict: Dict = { + "line": Qgis.GeometryType.Line, + "point": Qgis.GeometryType.Point, + "polygon": Qgis.GeometryType.Polygon + } + +def _get_geom_type(geometry_type: QgsGeometryType = None): + + if Qgis.QGIS_VERSION_INT < 33000: + default_geom_type = QgsWkbTypes.LineGeometry + else: + default_geom_type = Qgis.GeometryType.Line + + geom_type = geom_types_dict.get(geometry_type, default_geom_type) + return geom_type + + def load_settings(dialog, plugin='core'): """ Load user UI settings related with dialog position and size """ @@ -3526,9 +3553,12 @@ def restore_parent_layers_visibility(layers): tools_qgis.set_layer_visible(layer, False, visibility) -def create_rubberband(canvas, geometry_type=QgsWkbTypes.LineGeometry): +def create_rubberband(canvas, geometry_type: QgsGeometryType = None): """ Creates a rubberband and adds it to the global list """ - rb = QgsRubberBand(canvas, geometry_type) + + geom_type = _get_geom_type(geometry_type) + + rb = QgsRubberBand(canvas, geom_type) global_vars.active_rubberbands.append(rb) return rb @@ -3537,7 +3567,8 @@ def reset_rubberband(rb, geometry_type=None): """ Resets a rubberband and tries to remove it from the global list """ if geometry_type: - rb.reset(geometry_type) + geom_type = _get_geom_type(geometry_type) + rb.reset(geom_type) else: rb.reset() From e8a8552aa31d8ae9d56aba64b2f26bdb5d907813 Mon Sep 17 00:00:00 2001 From: smaspons Date: Thu, 23 May 2024 14:32:16 +0200 Subject: [PATCH 02/22] Update metadata version --- dbmodel | 2 +- metadata.txt | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dbmodel b/dbmodel index 6d5c43dd5..89bc4052b 160000 --- a/dbmodel +++ b/dbmodel @@ -1 +1 @@ -Subproject commit 6d5c43dd5a76bcac299738e32a47bcc781db4b3f +Subproject commit 89bc4052b76f2c7db6e56a5baf80ded9b7d1164f diff --git a/metadata.txt b/metadata.txt index 45502c34d..f2e04fda2 100644 --- a/metadata.txt +++ b/metadata.txt @@ -4,19 +4,11 @@ qgisMinimumVersion=3.22 qgisMaximumVersion=3.36 description=Plugin to manage water networks (water supply, sewerage and urban drainage) using QGIS and PostGIS-PostgreSQL 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.6.010 +version=3.6.011 author=David Erill, Barbara Rzepka, Sergi Muñoz, Josep Lluís Sala, Edgar Fusté, Albert Bofill, Sergi Maspons, Elies Bertran, Abel García Juanes, Maria Guzmán, Jordi Blanch, Xavier Torret -Changelog=Version 3.6.010 - - Import rpt results: if there are velocities >50 they will get replaced in-memory, instead of changing the .rpt file - - Change qgis templates: add direction arrow on links and delete flowtrace layers for UD - - Dscenario: Enable tab 'Additional pump' in Dscenario and add/edit controls & rules with proper dialog - - PG_SERVICE: Improve management of credentials when using pgservice file - - CAD tools: Show a preview of what will be drawn & change circle geometry type to MultiCurve - - Non-Visual Objects: add more filters to the manager - - Changes according to the addfields refactor - - Improve performance of go2epa if 'Message log' panel was opened - - Add layers button: ask before removing a layer +Changelog=Version 3.6.011 + tags= giswater, water networks, sewerage, urban drainage, EPANET, SWMM homepage=https://www.giswater.org From 1944ce42a0303685c0dfc83b59bf4735ecb4f03a Mon Sep 17 00:00:00 2001 From: Ferran Date: Fri, 24 May 2024 10:33:46 +0200 Subject: [PATCH 03/22] Unified flow buttons into flow --- core/shared/flow.py | 95 +++++++++++++++++++++ core/toolbars/om/flow_exit_button.py | 116 +------------------------- core/toolbars/om/flow_trace_button.py | 114 +------------------------ 3 files changed, 103 insertions(+), 222 deletions(-) create mode 100644 core/shared/flow.py diff --git a/core/shared/flow.py b/core/shared/flow.py new file mode 100644 index 000000000..0aa6362d6 --- /dev/null +++ b/core/shared/flow.py @@ -0,0 +1,95 @@ +""" +This file is part of Giswater 3 +The program is free software: you can redistribute it and/or modify it under the terms of the GNU +General Public License as published by the Free Software Foundation, either version 3 of the License, +or (at your option) any later version. +""" +# -*- coding: utf-8 -*- +import sys +import os + +from qgis.PyQt.QtCore import Qt +from ..toolbars.maptool import GwMaptool +from ..utils import tools_gw +from ...libs import tools_qgis + +class GwFlow(GwMaptool): + """ Base class for flow buttons """ + + def __init__(self, icon_path, action_name, text, toolbar, action_group): + super().__init__(icon_path, action_name, text, toolbar, action_group) + self.layers_added = [] + + """ QgsMapTools inherited event functions """ + + def clicked_event(self): + # Deactivate maptool if already active + if self == self.iface.mapCanvas().mapTool(): + return self.cancel_map_tool() + super().clicked_event() + + def canvasMoveEvent(self, event): + # Hide marker and get coordinates + self.vertex_marker.hide() + event_point = self.snapper_manager.get_event_point(event) + + # Snapping + result = self.snapper_manager.snap_to_current_layer(event_point) + if result.isValid(): + self.snapper_manager.add_marker(result, self.vertex_marker) + # Data for function + self.snapped_feat = self.snapper_manager.get_snapped_feature(result) + else: + self.snapped_feat = None + + def activate(self): + # set active and current layer + self.layer_node = tools_qgis.get_layer_by_tablename("v_edit_node") + self.iface.setActiveLayer(self.layer_node) + self.current_layer = self.layer_node + + # Check action. It works if is selected from toolbar. Not working if is selected from menu or shortcut keys + if hasattr(self.action, "setChecked"): + self.action.setChecked(True) + + # Store user snapping configuration + self.previous_snapping = self.snapper_manager.get_snapping_options() + + # Set snapping layers + self.snapper_manager.set_snapping_layers() + + # Change cursor + self.canvas.setCursor(self.cursor) + + # Show help message when action is activated + if self.show_help: + tools_qgis.show_info(self.help_message) + + # Control current layer (due to QGIS bug in snapping system) + if self.canvas.currentLayer() is None: + layer = tools_qgis.get_layer_by_tablename('v_edit_node') + if layer: + self.iface.setActiveLayer(layer) + + def deactivate(self): + super().deactivate() + + def _set_flow(self, event, procedure_name): + if event.button() == Qt.RightButton: + return self.cancel_map_tool() + + if event.button() == Qt.LeftButton and self.current_layer: + if self.snapped_feat is None: + elem_id = 'null' + else: + elem_id = f"""{self.snapped_feat.attribute('node_id')}""" + feature_id = f'"id":[{elem_id}]' + point = tools_qgis.create_point(self.canvas, self.iface, event) + scale_zoom = self.iface.mapCanvas().scale() + extras = f' "coordinates":{{"xcoord":{point.x()},"ycoord":{point.y()}, "zoomRatio":{scale_zoom}}}' + body = tools_gw.create_body(feature=feature_id, extras=extras) + result = tools_gw.execute_procedure(procedure_name, body) + if not result or result['status'] == 'Failed': + return + + self.refresh_map_canvas() \ No newline at end of file diff --git a/core/toolbars/om/flow_exit_button.py b/core/toolbars/om/flow_exit_button.py index 42b93f368..61d05e27b 100644 --- a/core/toolbars/om/flow_exit_button.py +++ b/core/toolbars/om/flow_exit_button.py @@ -5,125 +5,17 @@ or (at your option) any later version. """ # -*- coding: utf-8 -*- -from qgis.PyQt.QtCore import Qt +from ...shared.flow import GwFlow -from ..maptool import GwMaptool -from ...utils import tools_gw -from ....libs import tools_qgis - -class GwFlowExitButton(GwMaptool): +class GwFlowExitButton(GwFlow): """ Button 57: Flow exit """ def __init__(self, icon_path, action_name, text, toolbar, action_group): - super().__init__(icon_path, action_name, text, toolbar, action_group) - self.layers_added = [] - - - # region QgsMapTools inherited - """ QgsMapTools inherited event functions """ - - def clicked_event(self): - - # Deactivate maptool if already active - if self == self.iface.mapCanvas().mapTool(): - return self.cancel_map_tool() - - super().clicked_event() - - - def canvasMoveEvent(self, event): - - # Hide marker and get coordinates - self.vertex_marker.hide() - event_point = self.snapper_manager.get_event_point(event) - - # Snapping - result = self.snapper_manager.snap_to_current_layer(event_point) - if result.isValid(): - self.snapper_manager.add_marker(result, self.vertex_marker) - # Data for function - self.snapped_feat = self.snapper_manager.get_snapped_feature(result) - else: - self.snapped_feat = None - + self.help_message = "Click on node to compute its downstream network" def canvasReleaseEvent(self, event): - """ With left click the digitizing is finished """ - - self._set_flow_exit(event) - - - def activate(self): - - # set active and current layer - self.layer_node = tools_qgis.get_layer_by_tablename("v_edit_node") - self.iface.setActiveLayer(self.layer_node) - self.current_layer = self.layer_node - - # Check action. It works if is selected from toolbar. Not working if is selected from menu or shortcut keys - if hasattr(self.action, "setChecked"): - self.action.setChecked(True) - - # Store user snapping configuration - self.previous_snapping = self.snapper_manager.get_snapping_options() - - # Set snapping layers - self.snapper_manager.set_snapping_layers() - - # Change cursor - self.canvas.setCursor(self.cursor) - - # Show help message when action is activated - if self.show_help: - message = "Click on node to compute its downstream network" - tools_qgis.show_info(message) - - # Control current layer (due to QGIS bug in snapping system) - if self.canvas.currentLayer() is None: - layer = tools_qgis.get_layer_by_tablename('v_edit_node') - if layer: - self.iface.setActiveLayer(layer) - - - def deactivate(self): - - # Remove temporal layers - # tools_qgis.remove_layer_from_toc("Flowtrace node", "GW Temporal Layers") - # tools_qgis.remove_layer_from_toc("Flowtrace arc", "GW Temporal Layers") - # tools_qgis.clean_layer_group_from_toc("GW Temporal Layers") - - super().deactivate() - - - # endregion - - - # region private functions - - def _set_flow_exit(self, event): - - if event.button() == Qt.RightButton: - return self.cancel_map_tool() - - if event.button() == Qt.LeftButton and self.current_layer: - - # Execute SQL function - if self.snapped_feat is None: - elem_id = 'null' - else: - elem_id = f"""{self.snapped_feat.attribute('node_id')}""" - feature_id = f'"id":[{elem_id}]' - point = tools_qgis.create_point(self.canvas, self.iface, event) - scale_zoom = self.iface.mapCanvas().scale() - extras = f' "coordinates":{{"xcoord":{point.x()},"ycoord":{point.y()}, "zoomRatio":{scale_zoom}}}' - body = tools_gw.create_body(feature=feature_id, extras=extras) - result = tools_gw.execute_procedure('gw_fct_graphanalytics_downstream', body) - if not result or result['status'] == 'Failed': - return + self._set_flow(event, 'gw_fct_graphanalytics_downstream') - # Refresh map canvas - self.refresh_map_canvas() - # endregion diff --git a/core/toolbars/om/flow_trace_button.py b/core/toolbars/om/flow_trace_button.py index 9221de120..01ad5ad65 100644 --- a/core/toolbars/om/flow_trace_button.py +++ b/core/toolbars/om/flow_trace_button.py @@ -5,121 +5,15 @@ or (at your option) any later version. """ # -*- coding: utf-8 -*- -from qgis.PyQt.QtCore import Qt +from ...shared.flow import GwFlow -from ..maptool import GwMaptool -from ...utils import tools_gw -from ....libs import tools_qgis - -class GwFlowTraceButton(GwMaptool): +class GwFlowTraceButton(GwFlow): """ Button 56: Flow trace """ def __init__(self, icon_path, action_name, text, toolbar, action_group): - super().__init__(icon_path, action_name, text, toolbar, action_group) - self.layers_added = [] - - - """ QgsMapTools inherited event functions """ - - def clicked_event(self): - - # Deactivate maptool if already active - if self == self.iface.mapCanvas().mapTool(): - return self.cancel_map_tool() - - super().clicked_event() - - - def canvasMoveEvent(self, event): - - # Hide marker and get coordinates - self.vertex_marker.hide() - event_point = self.snapper_manager.get_event_point(event) - - # Snapping - result = self.snapper_manager.snap_to_current_layer(event_point) - if result.isValid(): - self.snapper_manager.add_marker(result, self.vertex_marker) - # Data for function - self.snapped_feat = self.snapper_manager.get_snapped_feature(result) - else: - self.snapped_feat = None - + self.help_message = "Click on node to compute its upstream network" def canvasReleaseEvent(self, event): - """ With left click the digitizing is finished """ - - self._set_flow_trace(event) - - - def activate(self): - - # set active and current layer - self.layer_node = tools_qgis.get_layer_by_tablename("v_edit_node") - self.iface.setActiveLayer(self.layer_node) - self.current_layer = self.layer_node - - # Check action. It works if is selected from toolbar. Not working if is selected from menu or shortcut keys - if hasattr(self.action, "setChecked"): - self.action.setChecked(True) - - # Store user snapping configuration - self.previous_snapping = self.snapper_manager.get_snapping_options() - - # Set snapping layers - self.snapper_manager.set_snapping_layers() - - # Change cursor - self.canvas.setCursor(self.cursor) - - # Show help message when action is activated - if self.show_help: - message = "Click on node to compute its upstream network" - tools_qgis.show_info(message) - - # Control current layer (due to QGIS bug in snapping system) - if self.canvas.currentLayer() is None: - layer = tools_qgis.get_layer_by_tablename('v_edit_node') - if layer: - self.iface.setActiveLayer(layer) - - - def deactivate(self): - - # Remove temporal layers - # tools_qgis.remove_layer_from_toc("Flowtrace node", "GW Temporal Layers") - # tools_qgis.remove_layer_from_toc("Flowtrace arc", "GW Temporal Layers") - # tools_qgis.clean_layer_group_from_toc("GW Temporal Layers") - - super().deactivate() - - - # region private functions - - def _set_flow_trace(self, event): - - if event.button() == Qt.RightButton: - return self.cancel_map_tool() - - if event.button() == Qt.LeftButton and self.current_layer: - - # Execute SQL function - if self.snapped_feat is None: - elem_id = 'null' - else: - elem_id = f"""{self.snapped_feat.attribute('node_id')}""" - feature_id = f'"id":[{elem_id}]' - point = tools_qgis.create_point(self.canvas, self.iface, event) - scale_zoom = self.iface.mapCanvas().scale() - extras = f' "coordinates":{{"xcoord":{point.x()},"ycoord":{point.y()}, "zoomRatio":{scale_zoom}}}' - body = tools_gw.create_body(feature=feature_id, extras=extras) - result = tools_gw.execute_procedure('gw_fct_graphanalytics_upstream', body) - if not result or result['status'] == 'Failed': - return - - # Refresh map canvas - self.refresh_map_canvas() - - # endregion + self._set_flow(event, 'gw_fct_graphanalytics_upstream') From 0555d81ea4b33086e1986bd0a3960cc83b2794fe Mon Sep 17 00:00:00 2001 From: Ferran Date: Wed, 5 Jun 2024 09:45:29 +0200 Subject: [PATCH 04/22] Implementation to have any dialog to be able to access --- core/admin/admin_btn.py | 24 +++++++++---------- core/admin/i18n_generator.py | 2 +- core/load_project_menu.py | 2 +- core/shared/catalog.py | 2 +- core/shared/dimensioning.py | 2 +- core/shared/document.py | 4 ++-- core/shared/element.py | 4 ++-- core/shared/info.py | 19 ++++++++------- core/shared/mincut.py | 10 ++++---- core/shared/mincut_tools.py | 7 ++++-- core/shared/nonvisual.py | 20 ++++++++-------- core/shared/psector.py | 11 ++++----- core/shared/psector_duplicate.py | 2 +- core/shared/search.py | 4 ++-- core/shared/selector.py | 2 +- core/shared/visit.py | 14 +++++------ core/shared/visit_gallery.py | 4 ++-- core/toolbars/basic/search_button.py | 2 +- core/toolbars/cad/aux_circle_add_button.py | 2 +- core/toolbars/cad/aux_point_add_button.py | 2 +- core/toolbars/edit/arc_divide_button.py | 2 +- core/toolbars/edit/arc_fusion_button.py | 2 +- core/toolbars/edit/connect_link_button.py | 2 +- core/toolbars/edit/feature_delete_button.py | 2 +- core/toolbars/edit/feature_end_button.py | 6 ++--- core/toolbars/edit/feature_replace_button.py | 4 ++-- .../edit/featuretype_change_button.py | 2 +- core/toolbars/epa/dscenario_manager_btn.py | 12 +++++----- core/toolbars/epa/go2epa_button.py | 6 ++--- core/toolbars/epa/go2epa_manager_button.py | 2 +- core/toolbars/epa/go2epa_selector_button.py | 2 +- core/toolbars/om/date_selector_button.py | 2 +- core/toolbars/om/mincut_button.py | 2 +- core/toolbars/om/mincut_manager_button.py | 2 +- core/toolbars/om/profile_button.py | 4 ++-- core/toolbars/plan/netscenario_manager_btn.py | 6 ++--- core/toolbars/utilities/config_btn.py | 2 +- core/toolbars/utilities/csv_btn.py | 2 +- core/toolbars/utilities/mapzone_manager.py | 6 ++--- core/toolbars/utilities/print_btn.py | 2 +- core/toolbars/utilities/project_check_btn.py | 2 +- core/toolbars/utilities/toolbox_btn.py | 8 +++---- .../utilities/workspace_manager_btn.py | 6 ++--- core/ui/dialog.py | 3 ++- core/ui/docker.py | 4 +++- core/ui/main_window.py | 3 ++- core/ui/ui_manager.py | 4 ++-- 47 files changed, 123 insertions(+), 116 deletions(-) diff --git a/core/admin/admin_btn.py b/core/admin/admin_btn.py index f6c7f71c4..a961a84b6 100644 --- a/core/admin/admin_btn.py +++ b/core/admin/admin_btn.py @@ -279,7 +279,7 @@ def execute_import_inp_data(self, project_name, project_type): """ Executed when option 'Import INP data' has been selected """ # Create dialog - self.dlg_import_inp = GwAdminImportUi() + self.dlg_import_inp = GwAdminImportUi(self) tools_gw.load_settings(self.dlg_import_inp) # Hide widgets @@ -391,7 +391,7 @@ def load_updates(self, project_type=None, update_changelog=False, schema_name=No def init_dialog_create_project(self, project_type=None): """ Initialize dialog (only once) """ - self.dlg_readsql_create_project = GwAdminDbProjectUi() + self.dlg_readsql_create_project = GwAdminDbProjectUi(self) tools_gw.load_settings(self.dlg_readsql_create_project) self.dlg_readsql_create_project.btn_cancel_task.hide() @@ -681,7 +681,7 @@ def _init_show_database(self): self.dev_commit = global_vars.gw_dev_mode # Create dialog object - self.dlg_readsql = GwAdminUi() + self.dlg_readsql = GwAdminUi(self) tools_gw.load_settings(self.dlg_readsql) self.cmb_project_type = self.dlg_readsql.findChild(QComboBox, 'cmb_project_type') @@ -1035,7 +1035,7 @@ def _open_form_create_gis_project(self): return # Create GIS project dialog - self.dlg_create_gis_project = GwAdminGisProjectUi() + self.dlg_create_gis_project = GwAdminGisProjectUi(self) tools_gw.load_settings(self.dlg_create_gis_project) # Set default values @@ -1433,7 +1433,7 @@ def _open_update_info(self): """""" # Create dialog - self.dlg_readsql_show_info = GwAdminProjectInfoUi() + self.dlg_readsql_show_info = GwAdminProjectInfoUi(self) tools_gw.load_settings(self.dlg_readsql_show_info) info_updates = self.dlg_readsql_show_info.findChild(QTextEdit, 'info_updates') @@ -1742,7 +1742,7 @@ def _open_rename(self): return # Create dialog - self.dlg_readsql_rename = GwAdminRenameProjUi() + self.dlg_readsql_rename = GwAdminRenameProjUi(self) tools_gw.load_settings(self.dlg_readsql_rename) schema = tools_qt.get_text(self.dlg_readsql, self.dlg_readsql.project_schema_name) @@ -1897,7 +1897,7 @@ def _copy_schema(self): """""" # Create dialog - self.dlg_readsql_copy = GwAdminRenameProjUi() + self.dlg_readsql_copy = GwAdminRenameProjUi(self) tools_gw.load_settings(self.dlg_readsql_copy) schema = tools_qt.get_text(self.dlg_readsql, self.dlg_readsql.project_schema_name) @@ -2065,7 +2065,7 @@ def _execute_import_inp(self, accepted, project_name, project_type): def _build_replace_dlg(self, replace_json): # Build the dialog - self.dlg_replace = GwReplaceInFileUi() + self.dlg_replace = GwReplaceInFileUi(self) self.dlg_replace.setWindowFlags(Qt.WindowStaysOnTopHint) tools_gw.load_settings(self.dlg_replace) @@ -2312,7 +2312,7 @@ def _open_manage_field(self, action): """""" # Create the dialog and signals - self.dlg_manage_fields = GwAdminFieldsUi() + self.dlg_manage_fields = GwAdminFieldsUi(self) tools_gw.load_settings(self.dlg_manage_fields) self.model_update_table = None @@ -2369,7 +2369,7 @@ def _update_selected_addfild(self, widget, is_multi_addfield): # Create the dialog and signals self._close_dialog_admin(self.dlg_manage_fields) - self.dlg_manage_fields = GwAdminFieldsUi() + self.dlg_manage_fields = GwAdminFieldsUi(self) tools_gw.load_settings(self.dlg_manage_fields) self.model_update_table = None @@ -2894,7 +2894,7 @@ def _save_selection(self): def _create_credentials_form(self, set_connection): """""" - self.dlg_credentials = GwCredentialsUi() + self.dlg_credentials = GwCredentialsUi(self) tools_gw.load_settings(self.dlg_credentials) if str(self.list_connections) != '[]': tools_qt.fill_combo_values(self.dlg_credentials.cmb_connection, self.list_connections) @@ -2952,7 +2952,7 @@ def _manage_docker(self): try: tools_gw.close_docker('admin_position') lib_vars.session_vars['docker_type'] = 'qgis_form_docker' - lib_vars.session_vars['dialog_docker'] = GwDocker() + lib_vars.session_vars['dialog_docker'] = GwDocker(self) lib_vars.session_vars['dialog_docker'].dlg_closed.connect(partial(tools_gw.close_docker, 'admin_position')) tools_gw.manage_docker_options('admin_position') tools_gw.docker_dialog(self.dlg_readsql) diff --git a/core/admin/i18n_generator.py b/core/admin/i18n_generator.py index e62687d9a..3722b5c29 100644 --- a/core/admin/i18n_generator.py +++ b/core/admin/i18n_generator.py @@ -27,7 +27,7 @@ def __init__(self): def init_dialog(self): """ Constructor """ - self.dlg_qm = GwAdminTranslationUi() + self.dlg_qm = GwAdminTranslationUi(self) tools_gw.load_settings(self.dlg_qm) self._load_user_values() diff --git a/core/load_project_menu.py b/core/load_project_menu.py index e6f702d86..2003d3a20 100644 --- a/core/load_project_menu.py +++ b/core/load_project_menu.py @@ -163,7 +163,7 @@ def _open_manage_file(self): """ Manage files dialog:: """ tools_qgis.set_cursor_wait() - self.dlg_manage_menu = GwLoadMenuUi() + self.dlg_manage_menu = GwLoadMenuUi(self) tools_gw.load_settings(self.dlg_manage_menu) # Manage widgets diff --git a/core/shared/catalog.py b/core/shared/catalog.py index 329a9048b..b47a4a432 100644 --- a/core/shared/catalog.py +++ b/core/shared/catalog.py @@ -40,7 +40,7 @@ def open_catalog(self, previous_dialog, widget_name, feature_type, child_type): group_box_1 = QGroupBox("Filter") self.filter_form = QGridLayout() - self.dlg_catalog = GwInfoCatalogUi() + self.dlg_catalog = GwInfoCatalogUi(self) tools_gw.load_settings(self.dlg_catalog) self.dlg_catalog.btn_cancel.clicked.connect(partial(tools_gw.close_dialog, self.dlg_catalog)) self.dlg_catalog.btn_accept.clicked.connect(partial(self._fill_geomcat_id, previous_dialog, widget_name)) diff --git a/core/shared/dimensioning.py b/core/shared/dimensioning.py index 0205d867a..c0a09bfa5 100644 --- a/core/shared/dimensioning.py +++ b/core/shared/dimensioning.py @@ -36,7 +36,7 @@ def __init__(self): def open_dimensioning_form(self, qgis_feature=None, layer=None, db_return=None, fid=None, rubber_band=None): - self.dlg_dim = GwDimensioningUi() + self.dlg_dim = GwDimensioningUi(self) tools_gw.load_settings(self.dlg_dim) self.user_current_layer = self.iface.activeLayer() diff --git a/core/shared/document.py b/core/shared/document.py index a6270f7e4..ecea711fd 100644 --- a/core/shared/document.py +++ b/core/shared/document.py @@ -43,7 +43,7 @@ def get_document(self, tablename=None, qtable=None, item_id=None, feature=None, self.rubber_band = tools_gw.create_rubberband(self.canvas) # Create the dialog and signals - self.dlg_add_doc = GwDocUi() + self.dlg_add_doc = GwDocUi(self) tools_gw.load_settings(self.dlg_add_doc) self.doc_id = None self.files_path = [] @@ -174,7 +174,7 @@ def manage_documents(self): """ Button 66: Edit document """ # Create the dialog - self.dlg_man = GwDocManagerUi() + self.dlg_man = GwDocManagerUi(self) self.dlg_man.setProperty('class_obj', self) tools_gw.load_settings(self.dlg_man) self.dlg_man.tbl_document.setSelectionBehavior(QAbstractItemView.SelectRows) diff --git a/core/shared/element.py b/core/shared/element.py index 47464a314..d0e0cc9c0 100644 --- a/core/shared/element.py +++ b/core/shared/element.py @@ -38,7 +38,7 @@ def get_element(self, new_element_id=True, feature=None, feature_type=None, sele self.new_element_id = new_element_id # Create the dialog and signals - self.dlg_add_element = GwElementUi() + self.dlg_add_element = GwElementUi(self) tools_gw.load_settings(self.dlg_add_element) self.element_id = None @@ -273,7 +273,7 @@ def manage_elements(self): """ Button 67: Edit element """ # Create the dialog - self.dlg_man = GwElementManagerUi() + self.dlg_man = GwElementManagerUi(self) tools_gw.load_settings(self.dlg_man) self.dlg_man.tbl_element.setSelectionBehavior(QAbstractItemView.SelectRows) diff --git a/core/shared/info.py b/core/shared/info.py index 8db0f207e..a9d0e6914 100644 --- a/core/shared/info.py +++ b/core/shared/info.py @@ -405,7 +405,7 @@ def _open_generic_form(self, complet_result): tools_gw.draw_by_json(complet_result, self.rubber_band) # Dialog - self.dlg_generic = GwInfoGenericUi() + self.dlg_generic = GwInfoGenericUi(self) tools_gw.load_settings(self.dlg_generic) result = tools_gw.build_dialog_info(self.dlg_generic, complet_result, self.my_json) @@ -470,7 +470,7 @@ def _open_custom_form(self, feature_id, complet_result, tab_type=None, sub_tag=N """ # Dialog - self.dlg_cf = GwInfoFeatureUi(sub_tag) + self.dlg_cf = GwInfoFeatureUi(self, sub_tag) tools_gw.load_settings(self.dlg_cf) # Get widget controls @@ -1082,7 +1082,7 @@ def _activate_snapping(self, complet_result, ep, refresh_dialog=False): tools_gw.reset_rubberband(self.rubber_band) if refresh_dialog is False: - dlg_interpolate = GwInterpolate() + dlg_interpolate = GwInterpolate(self) tools_gw.load_settings(dlg_interpolate) else: dlg_interpolate = refresh_dialog @@ -1714,7 +1714,7 @@ def _roll_back(self): def _open_section_form(self): - dlg_sections = GwInfoCrossectUi() + dlg_sections = GwInfoCrossectUi(self) tools_gw.load_settings(dlg_sections) # Set dialog not resizable @@ -2963,7 +2963,7 @@ def _get_catalog(self, form_name, table_name, feature_type, feature_id, list_poi if json_result is None: return - dlg_generic = GwInfoGenericUi() + dlg_generic = GwInfoGenericUi(self) tools_gw.load_settings(dlg_generic) # Set signals @@ -3466,7 +3466,7 @@ def add_row_epa(tbl, view, tablename, pkey, dlg, dlg_title, force_action, **kwar result = json_result # Build dlg - info.add_dlg = GwInfoGenericUi() + info.add_dlg = GwInfoGenericUi(info) tools_gw.load_settings(info.add_dlg) info.my_json_add = {} tools_gw.build_dialog_info(info.add_dlg, result, my_json=info.my_json_add) @@ -4146,6 +4146,7 @@ def open_visit_document(**kwargs): """ Open document of selected record of the table """ # search visit_id in table (targetwidget, columnfind) + class_obj = kwargs['class'] func_params = kwargs['func_params'] qtable = kwargs['qtable'] if 'qtable' in kwargs else tools_qt.get_widget(kwargs['dialog'], f"{func_params.get('targetwidget')}") # Get selected rows @@ -4200,7 +4201,7 @@ def open_visit_document(**kwargs): else: # If more then one document is attached open dialog with list of documents - dlg_load_doc = GwVisitDocumentUi() + dlg_load_doc = GwVisitDocumentUi(class_obj) tools_gw.load_settings(dlg_load_doc) dlg_load_doc.rejected.connect(partial(tools_gw.close_dialog, dlg_load_doc)) @@ -4293,7 +4294,7 @@ def add_button(**kwargs) -> widget.clicked.connect(partial(getattr(module, funct def add_tableview(complet_result, field, dialog, module=sys.modules[__name__]) -> widget.doubleClicked.connect(partial(getattr(module, function_name), **kwargs)) """ - + class_obj = kwargs['class'] dialog = kwargs['dialog'] func_params = kwargs['func_params'] qtable = kwargs['qtable'] if 'qtable' in kwargs else tools_qt.get_widget(dialog, f"{func_params.get('targetwidget')}") @@ -4318,7 +4319,7 @@ def add_tableview(complet_result, field, dialog, module=sys.modules[__name__]) - event_id = ids['event_id'] # Open dialog event_standard - dlg_event_full = GwVisitEventFullUi() + dlg_event_full = GwVisitEventFullUi(class_obj) tools_gw.load_settings(dlg_event_full) dlg_event_full.rejected.connect(partial(tools_gw.close_dialog, dlg_event_full)) # Get all data for one visit diff --git a/core/shared/mincut.py b/core/shared/mincut.py index 68eecdf47..2f38e895a 100644 --- a/core/shared/mincut.py +++ b/core/shared/mincut.py @@ -748,7 +748,7 @@ def _real_start(self): def _real_end(self): # Create the dialog and signals - self.dlg_fin = GwMincutEndUi() + self.dlg_fin = GwMincutEndUi(self) tools_gw.load_settings(self.dlg_fin) search = GwSearch() @@ -993,7 +993,7 @@ def _accept_save_data(self): if result['body']['overlapStatus'] == 'Ok': self._mincut_ok(result) elif result['body']['overlapStatus'] == 'Conflict': - self.dlg_dtext = GwDialogTextUi() + self.dlg_dtext = GwDialogTextUi(self) tools_gw.load_settings(self.dlg_dtext) self.dlg_dtext.btn_close.setText('Cancel') self.dlg_dtext.btn_accept.setText('Continue') @@ -1142,7 +1142,7 @@ def _add_connec(self): self.action_add_hydrometer.setDisabled(True) # Set dialog add_connec - self.dlg_connec = GwMincutConnecUi() + self.dlg_connec = GwMincutConnecUi(self) self.dlg_connec.setWindowTitle("Connec management") tools_gw.load_settings(self.dlg_connec) self.dlg_connec.tbl_mincut_connec.setSelectionBehavior(QAbstractItemView.SelectRows) @@ -1309,7 +1309,7 @@ def _add_hydrometer(self): self.action_add_connec.setDisabled(True) # Set dialog MincutHydrometer - self.dlg_hydro = GwMincutHydrometerUi() + self.dlg_hydro = GwMincutHydrometerUi(self) tools_gw.load_settings(self.dlg_hydro) self.dlg_hydro.setWindowTitle("Hydrometer management") self.dlg_hydro.tbl_hydro.setSelectionBehavior(QAbstractItemView.SelectRows) @@ -2334,7 +2334,7 @@ def _mincut_composer(self): return # Set dialog add_connec - self.dlg_comp = GwMincutComposerUi() + self.dlg_comp = GwMincutComposerUi(self) tools_gw.load_settings(self.dlg_comp) # Fill ComboBox cbx_template with templates *.qpt diff --git a/core/shared/mincut_tools.py b/core/shared/mincut_tools.py index 31b8c26c3..25a1301d1 100644 --- a/core/shared/mincut_tools.py +++ b/core/shared/mincut_tools.py @@ -178,7 +178,9 @@ def close_mincut_manager(**kwargs): def mincut_selector(**kwargs): """ Manage mincut selector """ + print(kwargs) dialog = kwargs['dialog'] + class_obj = kwargs['class'] qtable = dialog.findChild(QTableView, "tab_none_tbl_mincut_edit") field_id = "id" model = qtable.model() @@ -198,7 +200,7 @@ def mincut_selector(**kwargs): aux_params = f'"ids":{json.dumps(selected_mincuts)}' min_selector = GwSelector() - dlg_selector = GwSelectorUi() + dlg_selector = GwSelectorUi(class_obj) tools_gw.load_settings(dlg_selector) current_tab = tools_gw.get_config_parser('dialogs_tab', "dlg_selector_mincut", "user", "session") dlg_selector.btn_close.clicked.connect(partial(tools_gw.close_dialog, dlg_selector)) @@ -369,10 +371,11 @@ def filter_by_days(dialog, widget): def open_mincut(**kwargs): """ Open mincut form with selected record of the table """ dialog = kwargs['dialog'] + class_obj = kwargs['class'] mincut = kwargs['class'].mincut table = kwargs['qtable'] - dlg_mincut = GwMincutUi() + dlg_mincut = GwMincutUi(class_obj) selected_list = table.selectionModel().selectedRows() if len(selected_list) == 0: message = "Any record selected" diff --git a/core/shared/nonvisual.py b/core/shared/nonvisual.py index e9e6151df..a009ebee2 100644 --- a/core/shared/nonvisual.py +++ b/core/shared/nonvisual.py @@ -71,7 +71,7 @@ def manage_nonvisual(self): """ Opens Non-Visual objects manager. Called from 'Non-Visual object manager' button. """ # Get dialog - self.manager_dlg = GwNonVisualManagerUi() + self.manager_dlg = GwNonVisualManagerUi(self) tools_gw.load_settings(self.manager_dlg) # Make and populate tabs @@ -439,7 +439,7 @@ def get_roughness(self, roughness_id=None, duplicate=False): """ Opens dialog for roughness """ # Get dialog - self.dialog = GwNonVisualRoughnessUi() + self.dialog = GwNonVisualRoughnessUi(self) tools_gw.load_settings(self.dialog) # Populate sector id combobox @@ -620,7 +620,7 @@ def get_curves(self, curve_id=None, duplicate=False): """ Opens dialog for curve """ # Get dialog - self.dialog = GwNonVisualCurveUi() + self.dialog = GwNonVisualCurveUi(self) tools_gw.load_settings(self.dialog) # Create plot widget @@ -710,7 +710,7 @@ def get_print_curves(self, curve_id, path, file_name, geom1=None, geom2=None): """ Opens dialog for curve """ # Get dialog - self.dialog = GwNonVisualCurveUi() + self.dialog = GwNonVisualCurveUi(self) tools_gw.load_settings(self.dialog) # Create plot widget @@ -1140,9 +1140,9 @@ def get_patterns(self, pattern_id=None, duplicate=False): # Get dialog if global_vars.project_type == 'ws': - self.dialog = GwNonVisualPatternWSUi() + self.dialog = GwNonVisualPatternWSUi(self) elif global_vars.project_type == 'ud': - self.dialog = GwNonVisualPatternUDUi() + self.dialog = GwNonVisualPatternUDUi(self) else: tools_log.log_warning(f"get_patterns: project type '{global_vars.project_type}' not supported") return @@ -1777,7 +1777,7 @@ def get_controls(self, control_id=None, duplicate=False, dscenario_id=None): """ Opens dialog for controls """ # Get dialog - self.dialog = GwNonVisualControlsUi() + self.dialog = GwNonVisualControlsUi(self) tools_gw.load_settings(self.dialog) # Populate sector id combobox @@ -1917,7 +1917,7 @@ def get_rules(self, rule_id=None, duplicate=False, dscenario_id=None): """ Opens dialog for rules """ # Get dialog - self.dialog = GwNonVisualRulesUi() + self.dialog = GwNonVisualRulesUi(self) tools_gw.load_settings(self.dialog) # Populate sector id combobox @@ -2058,7 +2058,7 @@ def get_timeseries(self, timser_id=None, duplicate=False): """ Opens dialog for timeseries """ # Get dialog - self.dialog = GwNonVisualTimeseriesUi() + self.dialog = GwNonVisualTimeseriesUi(self) tools_gw.load_settings(self.dialog) # Variables @@ -2423,7 +2423,7 @@ def get_lids(self, lidco_id=None, duplicate=None): """ Opens dialog for lids """ # Get dialog - self.dialog = GwNonVisualLidsUi() + self.dialog = GwNonVisualLidsUi(self) # Set dialog not resizable self.dialog.setFixedSize(self.dialog.size()) diff --git a/core/shared/psector.py b/core/shared/psector.py index ee2917254..d8005389d 100644 --- a/core/shared/psector.py +++ b/core/shared/psector.py @@ -67,8 +67,7 @@ def get_psector(self, psector_id=None, list_coord=None): self.sys_currency = json.loads(row[0], object_pairs_hook=OrderedDict) # Create the dialog and signals - self.dlg_plan_psector = GwPsectorUi() - self.dlg_plan_psector.setProperty('class_obj', self) + self.dlg_plan_psector = GwPsectorUi(self) tools_gw.load_settings(self.dlg_plan_psector) # Manage btn toggle @@ -569,7 +568,7 @@ def open_dlg_reports(self): default_file_name = tools_qt.get_text(self.dlg_plan_psector, self.dlg_plan_psector.name) - self.dlg_psector_rapport = GwPsectorRapportUi() + self.dlg_psector_rapport = GwPsectorRapportUi(self) tools_gw.load_settings(self.dlg_psector_rapport) tools_qt.set_widget_text(self.dlg_psector_rapport, 'txt_composer_path', default_file_name + " comp.pdf") @@ -1154,7 +1153,7 @@ def show_psector_topoerror_log(self, json_result, psector_id): self.iface.messageBar().popWidget() # Create log dialog - self.dlg_infolog = GwPsectorRepairUi() + self.dlg_infolog = GwPsectorRepairUi(self) self.dlg_infolog.btn_repair.clicked.connect(partial(self.repair_psector, psector_id)) self.dlg_infolog.btn_close.clicked.connect(partial(tools_gw.close_dialog, self.dlg_infolog, True)) @@ -1684,7 +1683,7 @@ def manage_psectors(self): """ Button 46: Psector management """ # Create the dialog and signals - self.dlg_psector_mng = GwPsectorManagerUi() + self.dlg_psector_mng = GwPsectorManagerUi(self) tools_gw.load_settings(self.dlg_psector_mng) table_name = "v_ui_plan_psector" @@ -1957,7 +1956,7 @@ def manage_prices(self): """ Button 50: Plan estimate result manager """ # Create the dialog and signals - self.dlg_merm = GwPriceManagerUi() + self.dlg_merm = GwPriceManagerUi(self) tools_gw.load_settings(self.dlg_merm) # Set current value diff --git a/core/shared/psector_duplicate.py b/core/shared/psector_duplicate.py index 7a65af361..8d4306ae2 100644 --- a/core/shared/psector_duplicate.py +++ b/core/shared/psector_duplicate.py @@ -27,7 +27,7 @@ def __init__(self): def manage_duplicate_psector(self, psector_id=None): # Create the dialog and signals - self.dlg_duplicate_psector = GwPsectorDuplicateUi() + self.dlg_duplicate_psector = GwPsectorDuplicateUi(self) tools_gw.load_settings(self.dlg_duplicate_psector) # Populate combo duplicate psector diff --git a/core/shared/search.py b/core/shared/search.py index 44d19a54c..cd78b84da 100644 --- a/core/shared/search.py +++ b/core/shared/search.py @@ -553,7 +553,7 @@ def _open_hydrometer_dialog(self, table_name=None, feature_id=None, connec_id=No return result = json_result - self.hydro_info_dlg = GwInfoGenericUi() + self.hydro_info_dlg = GwInfoGenericUi(self) tools_gw.load_settings(self.hydro_info_dlg) self.hydro_info_dlg.btn_close.clicked.connect(partial(tools_gw.close_dialog, self.hydro_info_dlg)) @@ -595,7 +595,7 @@ def _workcat_open_table_items(self, item): current_selectors = self._get_current_selectors() self._force_expl(workcat_id) - self.items_dialog = GwSearchWorkcatUi() + self.items_dialog = GwSearchWorkcatUi(self) tools_gw.add_icon(self.items_dialog.btn_doc_insert, "111", sub_folder="24x24") tools_gw.add_icon(self.items_dialog.btn_doc_delete, "112", sub_folder="24x24") diff --git a/core/shared/selector.py b/core/shared/selector.py index b5badac9e..b866b2460 100644 --- a/core/shared/selector.py +++ b/core/shared/selector.py @@ -43,7 +43,7 @@ def open_selector(self, selector_type="selector_basic", reload_dlg=None): reload_dlg.main_tab.currentWidget().verticalScrollBar().setValue(self.scrolled_amount) return - dlg_selector = GwSelectorUi() + dlg_selector = GwSelectorUi(self) tools_gw.load_settings(dlg_selector) dlg_selector.setProperty('GwSelector', self) diff --git a/core/shared/visit.py b/core/shared/visit.py index f7caba647..33dcccc80 100644 --- a/core/shared/visit.py +++ b/core/shared/visit.py @@ -82,7 +82,7 @@ def get_visit(self, visit_id=None, feature_type=None, feature_id=None, single_to # Create the dialog and signals and related ORM Visit class self.current_visit = GwOmVisit() - self.dlg_add_visit = GwVisitUi(tag) + self.dlg_add_visit = GwVisitUi(self,tag) tools_gw.load_settings(self.dlg_add_visit) # Get layer visibility to restore when dialog is closed layers_visibility = {} @@ -263,7 +263,7 @@ def manage_visits(self, feature_type=None, feature_id=None): """ Button 65: manage visits """ # Create the dialog - self.dlg_visit_manager = GwVisitManagerUi() + self.dlg_visit_manager = GwVisitManagerUi(self) tools_gw.load_settings(self.dlg_visit_manager) self.dlg_visit_manager.tbl_visit.setSelectionBehavior(QAbstractItemView.SelectRows) @@ -1307,12 +1307,12 @@ def _event_insert(self): row = tools_db.get_row(sql) form_type = str(row[0]) if form_type in ('event_ud_arc_standard', 'event_standard'): - self.dlg_event = GwVisitEventUi() + self.dlg_event = GwVisitEventUi(self) tools_gw.load_settings(self.dlg_event) self._populate_position_id() dlg_name = 'visit_event' elif form_type == 'event_ud_arc_rehabit': - self.dlg_event = GwVisitEventRehabUi() + self.dlg_event = GwVisitEventRehabUi(self) tools_gw.load_settings(self.dlg_event) self._populate_position_id() dlg_name = 'visit_event_rehab' @@ -1558,7 +1558,7 @@ def _event_update(self): _value = self.dlg_add_visit.tbl_event.model().record(row).value('value') position_value = self.dlg_add_visit.tbl_event.model().record(row).value('position_value') text = self.dlg_add_visit.tbl_event.model().record(row).value('text') - self.dlg_event = GwVisitEventUi() + self.dlg_event = GwVisitEventUi(self) tools_gw.load_settings(self.dlg_event) self._populate_position_id() dlg_name = 'visit_event' @@ -1583,7 +1583,7 @@ def _event_update(self): geom2 = self.dlg_add_visit.tbl_event.model().record(row).value('geom2') geom3 = self.dlg_add_visit.tbl_event.model().record(row).value('geom3') text = self.dlg_add_visit.tbl_event.model().record(row).value('text') - self.dlg_event = GwVisitEventRehabUi() + self.dlg_event = GwVisitEventRehabUi(self) tools_gw.load_settings(self.dlg_event) self._populate_position_id() dlg_name = 'visit_event_rehab' @@ -1611,7 +1611,7 @@ def _event_update(self): column_index = tools_qt.get_col_index_by_col_name(self.dlg_add_visit.tbl_event, 'text') text = index.sibling(row, column_index).data() - self.dlg_event = GwVisitEventUi() + self.dlg_event = GwVisitEventUi(self) tools_gw.load_settings(self.dlg_event) if event_code not in ('NULL', None): tools_qt.set_widget_text(self.dlg_event, self.dlg_event.event_code, event_code) diff --git a/core/shared/visit_gallery.py b/core/shared/visit_gallery.py index 37dfc5b8d..ade790f28 100644 --- a/core/shared/visit_gallery.py +++ b/core/shared/visit_gallery.py @@ -29,7 +29,7 @@ def __init__(self): def manage_gallery(self): # Create the dialog and signals - self.dlg_gallery = GwGalleryUi() + self.dlg_gallery = GwGalleryUi(self) tools_gw.load_settings(self.dlg_gallery) @@ -212,7 +212,7 @@ def _zoom_img(self, i, visit_id, event_id): handeler_index = i - self.dlg_gallery_zoom = GwGalleryZoomUi() + self.dlg_gallery_zoom = GwGalleryZoomUi(self) tools_gw.load_settings(self.dlg_gallery_zoom) self.lbl_img = self.dlg_gallery_zoom.findChild(QLabel, "lbl_img_zoom") diff --git a/core/toolbars/basic/search_button.py b/core/toolbars/basic/search_button.py index e1fa55099..91bad8408 100644 --- a/core/toolbars/basic/search_button.py +++ b/core/toolbars/basic/search_button.py @@ -29,5 +29,5 @@ def clicked_event(self): self.iface.removeDockWidget(docker_search) docker_search.deleteLater() - dlg_search = GwSearchUi() + dlg_search = GwSearchUi(self) self.search.open_search(dlg_search) diff --git a/core/toolbars/cad/aux_circle_add_button.py b/core/toolbars/cad/aux_circle_add_button.py index 2f3f2b702..02a754409 100644 --- a/core/toolbars/cad/aux_circle_add_button.py +++ b/core/toolbars/cad/aux_circle_add_button.py @@ -160,7 +160,7 @@ def _load_missing_layers(self): def _init_create_circle_form(self, point): # Create the dialog and signals - self.dlg_create_circle = GwAuxCircleUi() + self.dlg_create_circle = GwAuxCircleUi(self) tools_gw.load_settings(self.dlg_create_circle) self.cancel_circle = False validator = QDoubleValidator(0.00, 9999999.00, 3) diff --git a/core/toolbars/cad/aux_point_add_button.py b/core/toolbars/cad/aux_point_add_button.py index db7027b5a..aaa224044 100644 --- a/core/toolbars/cad/aux_point_add_button.py +++ b/core/toolbars/cad/aux_point_add_button.py @@ -185,7 +185,7 @@ def _load_missing_layers(self): def _init_create_point_form(self, point_1=None, point_2=None): # Create the dialog and signals - self.dlg_create_point = GwAuxPointUi() + self.dlg_create_point = GwAuxPointUi(self) tools_gw.load_settings(self.dlg_create_point) validator = QDoubleValidator(-99999.99, 9999999.00, 3) diff --git a/core/toolbars/edit/arc_divide_button.py b/core/toolbars/edit/arc_divide_button.py index 1ddbdae98..ade44669e 100644 --- a/core/toolbars/edit/arc_divide_button.py +++ b/core/toolbars/edit/arc_divide_button.py @@ -231,7 +231,7 @@ def _move_node(self, node_id, point): if result and result['status'] == 'Accepted': log = tools_gw.get_config_parser("user_edit_tricks", "arc_divide_disable_showlog", 'user', 'init') if not tools_os.set_boolean(log, False): - self.dlg_dtext = GwDialogTextUi('arc_divide') + self.dlg_dtext = GwDialogTextUi(self, 'arc_divide') tools_gw.load_settings(self.dlg_dtext) tools_gw.fill_tab_log(self.dlg_dtext, result['body']['data'], False, True, 1) self.dlg_dtext.finished.connect(partial(tools_gw.save_settings, self.dlg_dtext)) diff --git a/core/toolbars/edit/arc_fusion_button.py b/core/toolbars/edit/arc_fusion_button.py index e93d3eda0..f2876ec4b 100644 --- a/core/toolbars/edit/arc_fusion_button.py +++ b/core/toolbars/edit/arc_fusion_button.py @@ -135,7 +135,7 @@ def _get_arc_fusion(self, event): def open_arc_fusion_dlg(self): - self.dlg_fusion = GwArcFusionUi() + self.dlg_fusion = GwArcFusionUi(self) tools_gw.load_settings(self.dlg_fusion) # Fill ComboBox cmb_nodeaction diff --git a/core/toolbars/edit/connect_link_button.py b/core/toolbars/edit/connect_link_button.py index 545b6db2f..0dd733ceb 100644 --- a/core/toolbars/edit/connect_link_button.py +++ b/core/toolbars/edit/connect_link_button.py @@ -168,7 +168,7 @@ def canvasReleaseEvent(self, event): def manage_result(self, result, layer): if result and result['status'] != 'Failed': - self.dlg_dtext = GwDialogTextUi('connect_to_network') + self.dlg_dtext = GwDialogTextUi(self, 'connect_to_network') tools_gw.load_settings(self.dlg_dtext) self.dlg_dtext.btn_accept.hide() self.dlg_dtext.setWindowTitle('Connect to network') diff --git a/core/toolbars/edit/feature_delete_button.py b/core/toolbars/edit/feature_delete_button.py index 448bf873d..d94afb65d 100644 --- a/core/toolbars/edit/feature_delete_button.py +++ b/core/toolbars/edit/feature_delete_button.py @@ -39,7 +39,7 @@ def __init__(self, icon_path, action_name, text, toolbar, action_group, list_fea def clicked_event(self): # Create the dialog and signals - self.dlg_feature_delete = GwFeatureDeleteUi() + self.dlg_feature_delete = GwFeatureDeleteUi(self) tools_gw.load_settings(self.dlg_feature_delete) # Populate combo feature type diff --git a/core/toolbars/edit/feature_end_button.py b/core/toolbars/edit/feature_end_button.py index b896a38d4..ac663e8fb 100644 --- a/core/toolbars/edit/feature_end_button.py +++ b/core/toolbars/edit/feature_end_button.py @@ -65,7 +65,7 @@ def clicked_event(self): self.selected_list = [] # Create the dialog and signals - self.dlg_work_end = GwFeatureEndUi() + self.dlg_work_end = GwFeatureEndUi(self) tools_gw.load_settings(self.dlg_work_end) self._set_edit_arc_downgrade_force('True') @@ -268,7 +268,7 @@ def _end_feature(self, force_downgrade=False): row = tools_db.get_row(sql) if row and force_downgrade is False: - self.dlg_work = GwFeatureEndConnecUi() + self.dlg_work = GwFeatureEndConnecUi(self) tools_gw.load_settings(self.dlg_work) self.dlg_work.btn_cancel.clicked.connect(partial(self._close_dialog_workcat_list, self.dlg_work)) @@ -538,7 +538,7 @@ def _manage_close(self, dialog, force_downgrade=False, show_warning=False): def _new_workcat(self): - self.dlg_new_workcat = GwInfoWorkcatUi() + self.dlg_new_workcat = GwInfoWorkcatUi(self) tools_gw.load_settings(self.dlg_new_workcat) tools_qt.set_calendar(self.dlg_new_workcat, self.dlg_new_workcat.builtdate, None, True) diff --git a/core/toolbars/edit/feature_replace_button.py b/core/toolbars/edit/feature_replace_button.py index a779ad869..3067dbf9e 100644 --- a/core/toolbars/edit/feature_replace_button.py +++ b/core/toolbars/edit/feature_replace_button.py @@ -198,7 +198,7 @@ def _manage_dates(self, date_value): def _init_replace_feature_form(self, feature): # Create the dialog and signals - self.dlg_replace = GwFeatureReplaceUi() + self.dlg_replace = GwFeatureReplaceUi(self) tools_gw.load_settings(self.dlg_replace) tools_gw.add_icon(self.dlg_replace.btn_new_workcat, "193") tools_gw.add_icon(self.dlg_replace.btn_catalog, "195") @@ -323,7 +323,7 @@ def _update_date(self): def _new_workcat(self): - self.dlg_new_workcat = GwInfoWorkcatUi() + self.dlg_new_workcat = GwInfoWorkcatUi(self) tools_gw.load_settings(self.dlg_new_workcat) tools_qt.set_calendar(self.dlg_new_workcat, self.dlg_new_workcat.builtdate, None, True) diff --git a/core/toolbars/edit/featuretype_change_button.py b/core/toolbars/edit/featuretype_change_button.py index aba177575..6d4ceefda 100644 --- a/core/toolbars/edit/featuretype_change_button.py +++ b/core/toolbars/edit/featuretype_change_button.py @@ -245,7 +245,7 @@ def _open_custom_form(self, layer, expr): def _change_elem_type(self, feature): # Create the dialog, fill feature_type and define its signals - self.dlg_change = GwFeatureTypeChangeUi() + self.dlg_change = GwFeatureTypeChangeUi(self) tools_gw.load_settings(self.dlg_change) tools_gw.add_icon(self.dlg_change.btn_catalog, "195") diff --git a/core/toolbars/epa/dscenario_manager_btn.py b/core/toolbars/epa/dscenario_manager_btn.py index df69c4746..544095432 100644 --- a/core/toolbars/epa/dscenario_manager_btn.py +++ b/core/toolbars/epa/dscenario_manager_btn.py @@ -121,7 +121,7 @@ def _save_last_selection(self, menu, button_function): def _open_hydrology_manager(self): """""" # Main dialog - self.dlg_hydrology_manager = GwDscenarioManagerUi() + self.dlg_hydrology_manager = GwDscenarioManagerUi(self) tools_gw.load_settings(self.dlg_hydrology_manager) # Manage btn create @@ -169,7 +169,7 @@ def _open_hydrology_manager(self): def _open_dwf_manager(self): """""" # Main dialog - self.dlg_dwf_manager = GwDscenarioManagerUi() + self.dlg_dwf_manager = GwDscenarioManagerUi(self) tools_gw.load_settings(self.dlg_dwf_manager) # Manage btn create @@ -220,7 +220,7 @@ def _open_dscenario_manager(self): """ Open dscenario manager """ # Main dialog - self.dlg_dscenario_manager = GwDscenarioManagerUi() + self.dlg_dscenario_manager = GwDscenarioManagerUi(self) tools_gw.load_settings(self.dlg_dscenario_manager) tools_gw.add_icon(self.dlg_dscenario_manager.btn_toc, "306", sub_folder="24x24") @@ -480,7 +480,7 @@ def _open_dscenario(self, index): self.selected_dscenario_type = index.sibling(row, column_index).data() # Create dialog - self.dlg_dscenario = GwDscenarioUi() + self.dlg_dscenario = GwDscenarioUi(self) tools_gw.load_settings(self.dlg_dscenario) # Add icons @@ -843,7 +843,7 @@ def _manage_properties(self, dialog, view, feature_id=None): result = json_result # Build dlg - self.props_dlg = GwInfoGenericUi() + self.props_dlg = GwInfoGenericUi(self) tools_gw.load_settings(self.props_dlg) self.my_json_add = {} tools_gw.build_dialog_info(self.props_dlg, result, my_json=self.my_json_add) @@ -1208,7 +1208,7 @@ def _selection_end(self): def _build_generic_info(self, dlg_title, result, tablename, field_id, force_action=None): # Build dlg - self.add_dlg = GwInfoGenericUi() + self.add_dlg = GwInfoGenericUi(self) tools_gw.load_settings(self.add_dlg) self.my_json_add = {} tools_gw.build_dialog_info(self.add_dlg, result, my_json=self.my_json_add) diff --git a/core/toolbars/epa/go2epa_button.py b/core/toolbars/epa/go2epa_button.py index 45821d72c..3d03a1f9e 100644 --- a/core/toolbars/epa/go2epa_button.py +++ b/core/toolbars/epa/go2epa_button.py @@ -63,7 +63,7 @@ def _go2epa(self): tools_gw.init_docker('qgis_form_docker') # Create dialog - self.dlg_go2epa = GwGo2EpaUI() + self.dlg_go2epa = GwGo2EpaUI(self) tools_gw.load_settings(self.dlg_go2epa) self._load_user_values() if self.project_type in 'ws': @@ -281,7 +281,7 @@ def _sector_selection(self): go2epa_selector = GwSelector() # Create the dialog - dlg_selector = GwSelectorUi() + dlg_selector = GwSelectorUi(self) tools_gw.load_settings(dlg_selector) # Create the common signals @@ -507,7 +507,7 @@ def _go2epa_options(self): self.epa_options_list = [] # Create dialog - self.dlg_go2epa_options = GwGo2EpaOptionsUi() + self.dlg_go2epa_options = GwGo2EpaOptionsUi(self) tools_gw.load_settings(self.dlg_go2epa_options) self.dlg_go2epa_options.setProperty('GwGo2EpaButton', self) diff --git a/core/toolbars/epa/go2epa_manager_button.py b/core/toolbars/epa/go2epa_manager_button.py index 682b72c67..381dfd818 100644 --- a/core/toolbars/epa/go2epa_manager_button.py +++ b/core/toolbars/epa/go2epa_manager_button.py @@ -37,7 +37,7 @@ def clicked_event(self): def _manage_go2epa(self): # Create the dialog - self.dlg_manager = GwEpaManagerUi() + self.dlg_manager = GwEpaManagerUi(self) tools_gw.load_settings(self.dlg_manager) # Manage widgets diff --git a/core/toolbars/epa/go2epa_selector_button.py b/core/toolbars/epa/go2epa_selector_button.py index 3e147d59f..c97763519 100644 --- a/core/toolbars/epa/go2epa_selector_button.py +++ b/core/toolbars/epa/go2epa_selector_button.py @@ -79,7 +79,7 @@ def _load_compare_layers(self): def _open_go2epa_selector(self): # Create the dialog and signals - self.dlg_go2epa_result = GwGo2EpaSelectorUi('go2epa') + self.dlg_go2epa_result = GwGo2EpaSelectorUi(self, 'go2epa') tools_gw.load_settings(self.dlg_go2epa_result) if self.project_type == 'ud': tools_qt.remove_tab(self.dlg_go2epa_result.tabWidget, "tab_time") diff --git a/core/toolbars/om/date_selector_button.py b/core/toolbars/om/date_selector_button.py index d1e028527..a3c58d54a 100644 --- a/core/toolbars/om/date_selector_button.py +++ b/core/toolbars/om/date_selector_button.py @@ -33,7 +33,7 @@ def clicked_event(self): def _open_date_selector(self): - self.dlg_selector_date = GwSelectorDateUi() + self.dlg_selector_date = GwSelectorDateUi(self) tools_gw.load_settings(self.dlg_selector_date) self.widget_date_from = self.dlg_selector_date.findChild(QDateEdit, "date_from") self.widget_date_to = self.dlg_selector_date.findChild(QDateEdit, "date_to") diff --git a/core/toolbars/om/mincut_button.py b/core/toolbars/om/mincut_button.py index 8161d5017..14cf928bd 100644 --- a/core/toolbars/om/mincut_button.py +++ b/core/toolbars/om/mincut_button.py @@ -24,6 +24,6 @@ def __init__(self, icon_path, action_name, text, toolbar, action_group): def clicked_event(self): - self.mincut.set_dialog(GwMincutUi()) + self.mincut.set_dialog(GwMincutUi(self)) self.mincut.get_mincut() diff --git a/core/toolbars/om/mincut_manager_button.py b/core/toolbars/om/mincut_manager_button.py index 1f8cd0abf..27418b585 100644 --- a/core/toolbars/om/mincut_manager_button.py +++ b/core/toolbars/om/mincut_manager_button.py @@ -22,4 +22,4 @@ def __init__(self, icon_path, action_name, text, toolbar, action_group): def clicked_event(self): - self.mincut.manage_mincuts(GwMincutManagerUi()) + self.mincut.manage_mincuts(GwMincutManagerUi(self)) diff --git a/core/toolbars/om/profile_button.py b/core/toolbars/om/profile_button.py index 7558330e4..c3d1aeb55 100644 --- a/core/toolbars/om/profile_button.py +++ b/core/toolbars/om/profile_button.py @@ -96,7 +96,7 @@ def clicked_event(self): self._remove_selection() # Set dialog - self.dlg_draw_profile = GwProfileUi() + self.dlg_draw_profile = GwProfileUi(self) tools_gw.load_settings(self.dlg_draw_profile) self.dlg_draw_profile.setWindowFlags(Qt.WindowStaysOnTopHint) @@ -266,7 +266,7 @@ def _save_profile(self): def _open_profile(self): """ Open dialog profile_list.ui """ - self.dlg_load = GwProfilesListUi() + self.dlg_load = GwProfilesListUi(self) tools_gw.load_settings(self.dlg_load) # Get profils on database diff --git a/core/toolbars/plan/netscenario_manager_btn.py b/core/toolbars/plan/netscenario_manager_btn.py index d514d3106..4a2b0cffd 100644 --- a/core/toolbars/plan/netscenario_manager_btn.py +++ b/core/toolbars/plan/netscenario_manager_btn.py @@ -53,7 +53,7 @@ def _open_netscenario_manager(self): """ Open netscenario manager """ # Main dialog - self.dlg_netscenario_manager = GwNetscenarioManagerUi() + self.dlg_netscenario_manager = GwNetscenarioManagerUi(self) tools_gw.load_settings(self.dlg_netscenario_manager) tools_gw.add_icon(self.dlg_netscenario_manager.btn_toc, "306", sub_folder="24x24") @@ -341,7 +341,7 @@ def _open_netscenario(self, index): self.selected_netscenario_type = index.sibling(row, column_index).data() # Create dialog - self.dlg_netscenario = GwNetscenarioUi() + self.dlg_netscenario = GwNetscenarioUi(self) tools_gw.load_settings(self.dlg_netscenario) # Add icons @@ -673,7 +673,7 @@ def _manage_properties(self): result = json_result # Build dlg - self.props_dlg = GwInfoGenericUi() + self.props_dlg = GwInfoGenericUi(self) tools_gw.load_settings(self.props_dlg) self.my_json_add = {} tools_gw.build_dialog_info(self.props_dlg, result, my_json=self.my_json_add) diff --git a/core/toolbars/utilities/config_btn.py b/core/toolbars/utilities/config_btn.py index 6084c537b..4abb16c06 100644 --- a/core/toolbars/utilities/config_btn.py +++ b/core/toolbars/utilities/config_btn.py @@ -53,7 +53,7 @@ def _open_config(self): result = self._get_layers_name() # Get dialog - self.dlg_config = GwConfigUi() + self.dlg_config = GwConfigUi(self) tools_gw.load_settings(self.dlg_config) # Call function gw_fct_getconfig and get json_result diff --git a/core/toolbars/utilities/csv_btn.py b/core/toolbars/utilities/csv_btn.py index 271f77970..5f7adf09b 100644 --- a/core/toolbars/utilities/csv_btn.py +++ b/core/toolbars/utilities/csv_btn.py @@ -53,7 +53,7 @@ def save_settings_values(self): def _open_csv(self): self.func_name = None - self.dlg_csv = GwCsvUi() + self.dlg_csv = GwCsvUi(self) tools_gw.load_settings(self.dlg_csv) temp_tablename = 'temp_csv' diff --git a/core/toolbars/utilities/mapzone_manager.py b/core/toolbars/utilities/mapzone_manager.py index 627c1f2ad..456a6bb8c 100644 --- a/core/toolbars/utilities/mapzone_manager.py +++ b/core/toolbars/utilities/mapzone_manager.py @@ -47,7 +47,7 @@ def __init__(self): def manage_mapzones(self): # Create dialog - self.mapzone_mng_dlg = GwMapzoneManagerUi() + self.mapzone_mng_dlg = GwMapzoneManagerUi(self) tools_gw.load_settings(self.mapzone_mng_dlg) # Add icons @@ -255,7 +255,7 @@ def manage_config(self, dialog, tableview=None): graphconfig = index.sibling(index.row(), col_idx).data() # Build dialog - self.config_dlg = GwMapzoneConfigUi() + self.config_dlg = GwMapzoneConfigUi(self) tools_gw.load_settings(self.config_dlg) # Button icons @@ -784,7 +784,7 @@ def _manage_delete(self): def _build_generic_info(self, dlg_title, result, tablename, field_id, force_action=None): # Build dlg - self.add_dlg = GwInfoGenericUi() + self.add_dlg = GwInfoGenericUi(self) tools_gw.load_settings(self.add_dlg) self.my_json_add = {} tools_gw.build_dialog_info(self.add_dlg, result, my_json=self.my_json_add) diff --git a/core/toolbars/utilities/print_btn.py b/core/toolbars/utilities/print_btn.py index fc7f54b06..2084d818f 100644 --- a/core/toolbars/utilities/print_btn.py +++ b/core/toolbars/utilities/print_btn.py @@ -52,7 +52,7 @@ def _open_print(self): self.initial_rotation = self.iface.mapCanvas().rotation() - self.dlg_composer = GwPrintUi() + self.dlg_composer = GwPrintUi(self) tools_gw.load_settings(self.dlg_composer) # Create and populate dialog diff --git a/core/toolbars/utilities/project_check_btn.py b/core/toolbars/utilities/project_check_btn.py index 0b58bcfdd..0b7f99d7f 100644 --- a/core/toolbars/utilities/project_check_btn.py +++ b/core/toolbars/utilities/project_check_btn.py @@ -59,7 +59,7 @@ def _open_check_project(self): def _open_dialog(self): # Create dialog - self.dlg_audit_project = GwProjectCheckUi() + self.dlg_audit_project = GwProjectCheckUi(self) tools_gw.load_settings(self.dlg_audit_project) self.dlg_audit_project.rejected.connect(partial(tools_gw.save_settings, self.dlg_audit_project)) diff --git a/core/toolbars/utilities/toolbox_btn.py b/core/toolbars/utilities/toolbox_btn.py index 9c867fe3e..d5795a8b8 100644 --- a/core/toolbars/utilities/toolbox_btn.py +++ b/core/toolbars/utilities/toolbox_btn.py @@ -51,7 +51,7 @@ def clicked_event(self): def open_function_by_id(self, func_id, connect_signal=None, aux_params="null"): - self.dlg_functions = GwToolboxManagerUi() + self.dlg_functions = GwToolboxManagerUi(self) tools_gw.load_settings(self.dlg_functions) self.dlg_functions.progressBar.setVisible(False) self.dlg_functions.btn_cancel.hide() @@ -169,7 +169,7 @@ def _open_toolbox(self): tools_qgis.show_warning("Function not found in database", parameter=function_name) return - self.dlg_toolbox = GwToolboxUi('toolbox') + self.dlg_toolbox = GwToolboxUi(self, 'toolbox') self.dlg_toolbox.trv.setEditTriggers(QAbstractItemView.NoEditTriggers) self.dlg_toolbox.trv.setHeaderHidden(True) @@ -224,7 +224,7 @@ def _open_function(self, index): vdefault = json.loads(vdefault.replace("'", '"')) self.queryAdd = vdefault.get('queryAdd') - self.dlg_reports = GwToolboxReportsUi() + self.dlg_reports = GwToolboxReportsUi(self) tools_gw.load_settings(self.dlg_reports) # Set description & query labels @@ -264,7 +264,7 @@ def _open_function(self, index): elif 'processes' in index.parent().parent().data().lower(): - self.dlg_functions = GwToolboxManagerUi() + self.dlg_functions = GwToolboxManagerUi(self) tools_gw.load_settings(self.dlg_functions) self.dlg_functions.progressBar.setVisible(False) self.dlg_functions.btn_cancel.hide() diff --git a/core/toolbars/utilities/workspace_manager_btn.py b/core/toolbars/utilities/workspace_manager_btn.py index bdbf2eb31..15afb22d0 100644 --- a/core/toolbars/utilities/workspace_manager_btn.py +++ b/core/toolbars/utilities/workspace_manager_btn.py @@ -39,7 +39,7 @@ def _open_workspace_manager(self): """ Open workspace manager """ # Main dialog - self.dlg_workspace_manager = GwWorkspaceManagerUi() + self.dlg_workspace_manager = GwWorkspaceManagerUi(self) tools_gw.load_settings(self.dlg_workspace_manager) self._check_workspace() @@ -75,7 +75,7 @@ def _open_workspace_manager(self): def _open_update_workspace_dlg(self): # Create workspace dialog - self.dlg_create_workspace = GwCreateWorkspaceUi() + self.dlg_create_workspace = GwCreateWorkspaceUi(self) self.new_workspace_name = self.dlg_create_workspace.findChild(QLineEdit, 'txt_workspace_name') self.new_workspace_descript = self.dlg_create_workspace.findChild(QPlainTextEdit, 'txt_workspace_descript') self.new_workspace_chk = self.dlg_create_workspace.findChild(QCheckBox, 'chk_workspace_private') @@ -112,7 +112,7 @@ def _open_update_workspace_dlg(self): def _open_create_workspace_dlg(self): # Create workspace dialog - self.dlg_create_workspace = GwCreateWorkspaceUi() + self.dlg_create_workspace = GwCreateWorkspaceUi(self) self.new_workspace_name = self.dlg_create_workspace.findChild(QLineEdit, 'txt_workspace_name') self.new_workspace_descript = self.dlg_create_workspace.findChild(QPlainTextEdit, 'txt_workspace_descript') self.new_workspace_chk = self.dlg_create_workspace.findChild(QCheckBox, 'chk_workspace_private') diff --git a/core/ui/dialog.py b/core/ui/dialog.py index f0c220a41..251fa954c 100644 --- a/core/ui/dialog.py +++ b/core/ui/dialog.py @@ -22,7 +22,7 @@ class GwDialog(QDialog): key_escape = QtCore.pyqtSignal() - def __init__(self, subtag=None): + def __init__(self, class_obj, subtag=None): super().__init__() self.setupUi(self) @@ -43,6 +43,7 @@ def __init__(self, subtag=None): except Exception: self._messageBar = global_vars.iface + self.setProperty('class_obj', class_obj) self.subtag = subtag # Connect the help shortcut action_help_shortcut = tools_gw.get_config_parser("actions_shortcuts", f"shortcut_help", "user", "init", prefix=False) diff --git a/core/ui/docker.py b/core/ui/docker.py index ffc8365f8..e0c6fb6cc 100644 --- a/core/ui/docker.py +++ b/core/ui/docker.py @@ -16,7 +16,7 @@ class GwDocker(QDockWidget): dlg_closed = QtCore.pyqtSignal() - def __init__(self, subtag=None): + def __init__(self, class_obj=None, subtag=None): super().__init__() # TODO: Check try/catch. Strange error: "GwDocker object has no attribute 'setupUi" @@ -24,6 +24,8 @@ def __init__(self, subtag=None): self.setupUi(self) except Exception: pass + + self.setProperty('class_obj', class_obj) self.subtag = subtag diff --git a/core/ui/main_window.py b/core/ui/main_window.py index 7de0c252a..b532b3663 100644 --- a/core/ui/main_window.py +++ b/core/ui/main_window.py @@ -24,7 +24,7 @@ class GwMainWindow(QMainWindow): key_escape = QtCore.pyqtSignal() key_enter = QtCore.pyqtSignal() - def __init__(self, subtag=None): + def __init__(self, class_obj, subtag=None): super().__init__() self.setupUi(self) @@ -45,6 +45,7 @@ def __init__(self, subtag=None): except Exception: self._messageBar = global_vars.iface + self.setProperty('class_obj', class_obj) self.subtag = subtag # Connect the help shortcut action_help_shortcut = tools_gw.get_config_parser("actions_shortcuts", f"shortcut_help", "user", "init", prefix=False) diff --git a/core/ui/ui_manager.py b/core/ui/ui_manager.py index 5d6651776..fe8d1b12d 100644 --- a/core/ui/ui_manager.py +++ b/core/ui/ui_manager.py @@ -91,10 +91,10 @@ class GwGalleryZoomUi(GwDialog, FORM_CLASS): FORM_CLASS = _get_ui_class('mincut.ui', 'om') class GwMincutUi(GwMainWindow, FORM_CLASS): - def __init__(self): + def __init__(self, class_obj): self.closeMainWin = False self.mincutCanceled = True - super().__init__() + super().__init__(class_obj) FORM_CLASS = _get_ui_class('mincut_connec.ui', 'om') class GwMincutConnecUi(GwDialog, FORM_CLASS): From 4f4d3e9f035398474a18cc7db3a4511c42b7743e Mon Sep 17 00:00:00 2001 From: Ferran Date: Wed, 5 Jun 2024 11:34:16 +0200 Subject: [PATCH 05/22] minor bug fix insert geom with aux_circle --- core/toolbars/cad/aux_circle_add_button.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/toolbars/cad/aux_circle_add_button.py b/core/toolbars/cad/aux_circle_add_button.py index 02a754409..82ba5c35f 100644 --- a/core/toolbars/cad/aux_circle_add_button.py +++ b/core/toolbars/cad/aux_circle_add_button.py @@ -197,7 +197,7 @@ def _get_radius(self, point): if self.layer_circle: self.layer_circle.startEditing() - tools_gw.close_dialog(self.dlg_create_circle) + if self.delete_prev: selection = self.layer_circle.getFeatures() self.layer_circle.selectByIds([f.id() for f in selection]) @@ -241,7 +241,7 @@ def _calculate_circle_points(center_point, radius) -> List[QgsPointXY]: # Next line generate: WARNING Attribute index 0 out of bounds [0;0] # but all work ok provider.addFeatures([feature]) - + tools_gw.close_dialog(self.dlg_create_circle) self.layer_circle.commitChanges() self.layer_circle.dataProvider().reloadData() self.layer_circle.triggerRepaint() From 166ad3f0ab87353007385597b8793d8cbfd9968b Mon Sep 17 00:00:00 2001 From: Daniel Marin Date: Fri, 21 Jun 2024 10:27:08 +0200 Subject: [PATCH 06/22] remove(psector_type): delete combobox from ui and python --- core/shared/psector.py | 26 ------------------------- core/ui/toolbars/plan/psector.ui | 33 -------------------------------- 2 files changed, 59 deletions(-) diff --git a/core/shared/psector.py b/core/shared/psector.py index d8005389d..252c6a1ec 100644 --- a/core/shared/psector.py +++ b/core/shared/psector.py @@ -137,7 +137,6 @@ def get_psector(self, psector_id=None, list_coord=None): # tab General elements self.psector_id = self.dlg_plan_psector.findChild(QLineEdit, "psector_id") self.ext_code = self.dlg_plan_psector.findChild(QLineEdit, "ext_code") - self.cmb_psector_type = self.dlg_plan_psector.findChild(QComboBox, "psector_type") self.cmb_expl_id = self.dlg_plan_psector.findChild(QComboBox, "expl_id") self.cmb_status = self.dlg_plan_psector.findChild(QComboBox, "status") self.workcat_id = self.dlg_plan_psector.findChild(QComboBox, "workcat_id") @@ -151,8 +150,6 @@ def get_psector(self, psector_id=None, list_coord=None): atlas_id.setValidator(QIntValidator()) num_value = self.dlg_plan_psector.findChild(QLineEdit, "num_value") num_value.setValidator(QIntValidator()) - where = " WHERE typevalue = 'psector_type' " - self.populate_combos(self.dlg_plan_psector.psector_type, 'idval', 'id', 'plan_typevalue', where) # Manage other_price tab variables self.price_loaded = False @@ -305,10 +302,6 @@ def get_psector(self, psector_id=None, list_coord=None): self.psector_id.setText(str(row['psector_id'])) if str(row['ext_code']) != 'None': self.ext_code.setText(str(row['ext_code'])) - sql = (f"SELECT id, idval FROM plan_typevalue WHERE typevalue = 'psector_type' AND " - f"id = '{row['psector_type']}'") - result = tools_db.get_row(sql) - tools_qt.set_combo_value(self.cmb_psector_type, str(result['idval']), 1) sql = (f"SELECT name FROM exploitation " f"WHERE expl_id = {row['expl_id']}") result = tools_db.get_row(sql) @@ -942,25 +935,6 @@ def set_restriction_by_role(self, dialog, widget_to_ignore, restriction): widget.setEnabled(False) - def populate_combos(self, combo, field_name, field_id, table_name, where=None): - - sql = f"SELECT DISTINCT({field_id}), {field_name} FROM {table_name} " - if where: - sql += where - sql += f" ORDER BY {field_name}" - rows = tools_db.get_rows(sql) - if not rows: - return - - combo.blockSignals(True) - combo.clear() - - records_sorted = sorted(rows, key=operator.itemgetter(1)) - for record in records_sorted: - combo.addItem(record[1], record) - combo.blockSignals(False) - - def reload_states_selector(self): try: diff --git a/core/ui/toolbars/plan/psector.ui b/core/ui/toolbars/plan/psector.ui index ce3016531..a3035d8aa 100644 --- a/core/ui/toolbars/plan/psector.ui +++ b/core/ui/toolbars/plan/psector.ui @@ -231,39 +231,6 @@ - - - - Type: - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 22 - 20 - - - - - - - - - 0 - 0 - - - - From c87d6eee54c55b99d35d354bcfb098aab6157365 Mon Sep 17 00:00:00 2001 From: Daniel Marin Date: Fri, 21 Jun 2024 10:28:38 +0200 Subject: [PATCH 07/22] Update dbmodel --- dbmodel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbmodel b/dbmodel index 89bc4052b..c02cad67b 160000 --- a/dbmodel +++ b/dbmodel @@ -1 +1 @@ -Subproject commit 89bc4052b76f2c7db6e56a5baf80ded9b7d1164f +Subproject commit c02cad67ba550041f2ef1420a518c91f008ab1b4 From 2079869f351a91fcb9f066224163eef689c4f89c Mon Sep 17 00:00:00 2001 From: smaspons Date: Fri, 28 Jun 2024 09:19:54 +0200 Subject: [PATCH 08/22] Bug fix: don't call graphconfig in ud --- core/toolbars/utilities/mapzone_manager.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/toolbars/utilities/mapzone_manager.py b/core/toolbars/utilities/mapzone_manager.py index 456a6bb8c..e2aa6e9d7 100644 --- a/core/toolbars/utilities/mapzone_manager.py +++ b/core/toolbars/utilities/mapzone_manager.py @@ -647,7 +647,8 @@ def _accept_config(self, dialog): level = int(json_result['message']['level']) tools_qgis.show_message(json_result['message']['text'], level) - self._get_graph_config() + if global_vars.project_type != 'ud': + self._get_graph_config() self._reset_config_vars(0) tools_gw.close_dialog(dialog) self._manage_current_changed() From f2cd28ba3258e938583e587799a140851e72e616 Mon Sep 17 00:00:00 2001 From: smaspons Date: Fri, 28 Jun 2024 11:36:54 +0200 Subject: [PATCH 09/22] Bug fix: strange bug on QTableWidget when refreshed if sorting by column --- core/toolbars/utilities/toolbox_btn.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/toolbars/utilities/toolbox_btn.py b/core/toolbars/utilities/toolbox_btn.py index d5795a8b8..d5392b872 100644 --- a/core/toolbars/utilities/toolbox_btn.py +++ b/core/toolbars/utilities/toolbox_btn.py @@ -438,6 +438,8 @@ def _update_tbl_reports(self): if not json_result or json_result['status'] == 'Failed': return False + self.dlg_reports.tbl_reports.sortByColumn(-1, 0) + for field in json_result['body']['data']['fields']: if field['widgettype'] == 'list' and field.get('value') is not None: From 103679ef868d3dd28f988d633d54f04afdd3abb8 Mon Sep 17 00:00:00 2001 From: smaspons Date: Fri, 28 Jun 2024 13:25:47 +0200 Subject: [PATCH 10/22] Minor enhancement: change psector rapport csv names --- core/shared/psector.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/shared/psector.py b/core/shared/psector.py index 252c6a1ec..9ca95838d 100644 --- a/core/shared/psector.py +++ b/core/shared/psector.py @@ -565,8 +565,8 @@ def open_dlg_reports(self): tools_gw.load_settings(self.dlg_psector_rapport) tools_qt.set_widget_text(self.dlg_psector_rapport, 'txt_composer_path', default_file_name + " comp.pdf") - tools_qt.set_widget_text(self.dlg_psector_rapport, 'txt_csv_detail_path', default_file_name + " detail.csv") - tools_qt.set_widget_text(self.dlg_psector_rapport, 'txt_csv_path', default_file_name + ".csv") + tools_qt.set_widget_text(self.dlg_psector_rapport, 'txt_csv_detail_path', default_file_name + ".csv") + tools_qt.set_widget_text(self.dlg_psector_rapport, 'txt_csv_path', default_file_name + " prices.csv") self.dlg_psector_rapport.btn_cancel.clicked.connect(partial(tools_gw.close_dialog, self.dlg_psector_rapport)) self.dlg_psector_rapport.btn_ok.clicked.connect(partial(self.generate_reports)) From c519bb8f7f60d6bb28da599aa4766c8792ad862b Mon Sep 17 00:00:00 2001 From: smaspons Date: Fri, 28 Jun 2024 14:33:34 +0200 Subject: [PATCH 11/22] Enhancement: fix info tab visit --- core/utils/tools_backend_calls.py | 38 ++++++++++++++++++++++++++----- core/utils/tools_gw.py | 7 +++--- 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/core/utils/tools_backend_calls.py b/core/utils/tools_backend_calls.py index ac18dd71a..6cdb37059 100644 --- a/core/utils/tools_backend_calls.py +++ b/core/utils/tools_backend_calls.py @@ -11,7 +11,7 @@ import webbrowser from functools import partial -from qgis.PyQt.QtCore import QDate, QRegExp, Qt +from qgis.PyQt.QtCore import QDate, QRegExp, Qt, QRegularExpression from qgis.PyQt.QtGui import QStandardItemModel from qgis.PyQt.QtWidgets import QComboBox, QDateEdit, QLineEdit, QMessageBox, QTableView, QWidget, QDoubleSpinBox, QSpinBox from qgis.core import QgsEditorWidgetSetup, QgsFieldConstraints, QgsMessageLog, QgsLayerTreeLayer, QgsVectorLayer, QgsDataSourceUri @@ -230,6 +230,8 @@ def manage_document(doc_id, **kwargs): def manage_visit_class(**kwargs): """ """ + + info = kwargs['class'] complet_result = kwargs['complet_result'] dialog = kwargs['dialog'] columnname = kwargs['columnname'] @@ -238,9 +240,9 @@ def manage_visit_class(**kwargs): field_id = str(complet_result['body']['feature']['idName']) current_visit_class = tools_gw.get_values(dialog, widget) - if current_visit_class[columnname] is None: + if current_visit_class[columnname] in (None, -1, '-1'): return - sql = f"SELECT ui_tablename FROM config_visit_class where id = {current_visit_class[columnname]}" + sql = (f"SELECT ui_tablename FROM config_visit_class where id = {current_visit_class[columnname]}") ui_tablename = tools_db.get_row(sql) table_view = dialog.tab_main.currentWidget().findChildren(QTableView) if table_view in (None, []): @@ -251,12 +253,18 @@ def manage_visit_class(**kwargs): body = tools_gw.create_body(feature=feature, filter_fields=filter_fields) json_result = tools_gw.execute_procedure('gw_fct_getlist', body) if json_result is None or json_result['status'] == 'Failed': + widget.removeItem(widget.currentIndex()) return False + complet_list = json_result if not complet_list: + widget.removeItem(widget.currentIndex()) return False + if complet_list is False: + widget.removeItem(widget.currentIndex()) return False, False + # headers headers = complet_list['body']['form'].get('headers') non_editable_columns = [] @@ -281,11 +289,24 @@ def manage_visit_class(**kwargs): table_view.setModel(model) model.removeRows(0, model.rowCount()) - if field['value']: - table_view = tools_gw.add_tableview_header(table_view, field) - table_view = tools_gw.fill_tableview_rows(table_view, field) + if not field['value']: + widget.removeItem(widget.currentIndex()) + return False + + table_view = tools_gw.add_tableview_header(table_view, field) + table_view = tools_gw.fill_tableview_rows(table_view, field) tools_qt.set_tableview_config(table_view) + # Get tab's widgets + widget_list = [] + tab_name = info.tab_main.currentWidget().objectName().replace('tab_', "") + widget_list.extend(info.tab_main.currentWidget().findChildren(QComboBox, QRegularExpression(f"{tab_name}_"))) + widget_list.extend(info.tab_main.currentWidget().findChildren(QTableView, QRegularExpression(f"{tab_name}_"))) + widget_list.extend(info.tab_main.currentWidget().findChildren(QLineEdit, QRegularExpression(f"{tab_name}_"))) + widget_list.extend(info.tab_main.currentWidget().findChildren(QgsDateTimeEdit, QRegularExpression(f"{tab_name}_"))) + # Set filter listeners + tools_gw.set_filter_listeners(complet_result, info.dlg_cf, widget_list, columnname, ui_tablename[0], info.feature_id) + def open_selected_path(**kwargs): """ Open selected path of the @widget @@ -346,6 +367,9 @@ def filter_table(**kwargs): feature_id = kwargs['feature_id'] func_params = kwargs.get('func_params') + if not linkedobject: + linkedobject = widgetname + field_id = func_params.get('field_id') if field_id is None: field_id = str(complet_result['body']['feature']['idName']) @@ -365,6 +389,8 @@ def filter_table(**kwargs): return False for field in complet_list['body']['data']['fields']: qtable = dialog.findChild(QTableView, field['widgetname']) + if qtable is None: + qtable = dialog.findChild(QTableView, func_params.get('targetwidget')) if qtable: if field['value'] is None: model.removeRows(0, model.rowCount()) diff --git a/core/utils/tools_gw.py b/core/utils/tools_gw.py index 2d67283fb..f7f9ee368 100644 --- a/core/utils/tools_gw.py +++ b/core/utils/tools_gw.py @@ -2074,7 +2074,7 @@ def add_frame(field, x=None): return widget -def add_combo(field, dialog=None, complet_result=None, ignore_function=False): +def add_combo(field, dialog=None, complet_result=None, ignore_function=False, class_info=None): widget = QComboBox() widget.setObjectName(field['widgetname']) if 'widgetcontrols' in field and field['widgetcontrols']: @@ -2107,7 +2107,7 @@ def add_combo(field, dialog=None, complet_result=None, ignore_function=False): parameters = f.get('parameters') kwargs = {"complet_result": complet_result, "dialog": dialog, "columnname": columnname, "widget": widget, - "func_params": parameters} + "func_params": parameters, "class": class_info} if 'module' in f: module = globals()[f['module']] else: @@ -4472,8 +4472,9 @@ def _manage_combo(**kwargs): dialog = kwargs['dialog'] field = kwargs['field'] complet_result = kwargs['complet_result'] + class_info = kwargs['class'] - widget = add_combo(field, dialog, complet_result) + widget = add_combo(field, dialog, complet_result, class_info=class_info) widget = set_widget_size(widget, field) return widget From c8c9f4d0182b3dc68ea52e126dda2cd41b22f2fe Mon Sep 17 00:00:00 2001 From: smaspons Date: Fri, 28 Jun 2024 15:16:26 +0200 Subject: [PATCH 12/22] Update changelog in metadata --- metadata.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/metadata.txt b/metadata.txt index f2e04fda2..b1dd5221a 100644 --- a/metadata.txt +++ b/metadata.txt @@ -8,6 +8,9 @@ version=3.6.011 author=David Erill, Barbara Rzepka, Sergi Muñoz, Josep Lluís Sala, Edgar Fusté, Albert Bofill, Sergi Maspons, Elies Bertran, Abel García Juanes, Maria Guzmán, Jordi Blanch, Xavier Torret Changelog=Version 3.6.011 + - Add support for tab visit in Giswater Info + - Remove psector_type combobox from psector dialog + - Various bug fixes tags= giswater, water networks, sewerage, urban drainage, EPANET, SWMM From 523dc89b1d3de382ef0a76c6b9b8bc61c5936651 Mon Sep 17 00:00:00 2001 From: smaspons Date: Fri, 28 Jun 2024 17:00:44 +0200 Subject: [PATCH 13/22] Update qgis maximum version to 3.38 --- metadata.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata.txt b/metadata.txt index b1dd5221a..53b6ae813 100644 --- a/metadata.txt +++ b/metadata.txt @@ -1,7 +1,7 @@ [general] name=giswater qgisMinimumVersion=3.22 -qgisMaximumVersion=3.36 +qgisMaximumVersion=3.38 description=Plugin to manage water networks (water supply, sewerage and urban drainage) using QGIS and PostGIS-PostgreSQL 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.6.011 @@ -23,6 +23,6 @@ experimental=False # Compatibility versions minorQgisVersion=3.22 -majorQgisVersion=3.36 +majorQgisVersion=3.38 minorPgVersion=9.5.00 majorPgVersion=16.01.99 From c8643fed82438f0ea2a44cbee62225b6c8c09ce8 Mon Sep 17 00:00:00 2001 From: edgarfuste <34737125+edgarfuste@users.noreply.github.com> Date: Mon, 1 Jul 2024 10:26:45 +0200 Subject: [PATCH 14/22] Enhancement: Manage btn_toc on hydrology/dwf scenario form --- core/toolbars/epa/dscenario_manager_btn.py | 29 +++++++++++++------ core/toolbars/plan/netscenario_manager_btn.py | 5 +++- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/core/toolbars/epa/dscenario_manager_btn.py b/core/toolbars/epa/dscenario_manager_btn.py index 544095432..22af9b80c 100644 --- a/core/toolbars/epa/dscenario_manager_btn.py +++ b/core/toolbars/epa/dscenario_manager_btn.py @@ -124,6 +124,8 @@ def _open_hydrology_manager(self): self.dlg_hydrology_manager = GwDscenarioManagerUi(self) tools_gw.load_settings(self.dlg_hydrology_manager) + tools_gw.add_icon(self.dlg_hydrology_manager.btn_toc, "306", sub_folder="24x24") + # Manage btn create self._manage_btn_create(self.dlg_hydrology_manager, 'v_edit_cat_hydrology') @@ -140,6 +142,7 @@ def _open_hydrology_manager(self): self._fill_manager_table('v_edit_cat_hydrology') # Connect main dialog signals + self.dlg_hydrology_manager.btn_toc.clicked.connect(partial(self._manage_add_layers, 'v_edit_cat_hydrology', 'Catalogs')) self.dlg_hydrology_manager.txt_name.textChanged.connect(partial(self._fill_manager_table, 'v_edit_cat_hydrology', None)) self.dlg_hydrology_manager.btn_duplicate.clicked.connect(partial(self._duplicate_selected_dscenario, @@ -172,6 +175,8 @@ def _open_dwf_manager(self): self.dlg_dwf_manager = GwDscenarioManagerUi(self) tools_gw.load_settings(self.dlg_dwf_manager) + tools_gw.add_icon(self.dlg_dwf_manager.btn_toc, "306", sub_folder="24x24") + # Manage btn create self._manage_btn_create(self.dlg_dwf_manager, 'v_edit_cat_dwf_scenario') @@ -188,6 +193,7 @@ def _open_dwf_manager(self): self._fill_manager_table('v_edit_cat_dwf_scenario') # Connect main dialog signals + self.dlg_dwf_manager.btn_toc.clicked.connect(partial(self._manage_add_layers, 'v_edit_cat_dwf_scenario', 'Catalogs')) self.dlg_dwf_manager.txt_name.textChanged.connect(partial(self._fill_manager_table, 'v_edit_cat_dwf_scenario', None)) self.dlg_dwf_manager.btn_duplicate.clicked.connect(partial(self._duplicate_selected_dscenario, @@ -246,7 +252,7 @@ def _open_dscenario_manager(self): # Connect main dialog signals self.dlg_dscenario_manager.txt_name.textChanged.connect(partial(self._fill_manager_table, 'v_edit_cat_dscenario', None)) - self.dlg_dscenario_manager.btn_toc.clicked.connect(partial(self._manage_add_layers)) + self.dlg_dscenario_manager.btn_toc.clicked.connect(partial(self._manage_add_layers, 'v_edit_inp_dscenario', 'Dscenario')) self.dlg_dscenario_manager.btn_duplicate.clicked.connect(partial(self._duplicate_selected_dscenario, self.dlg_dscenario_manager, 'v_edit_cat_dscenario', 3156)) self.dlg_dscenario_manager.btn_toolbox.clicked.connect(partial(self._open_toolbox_function, 3042, @@ -512,7 +518,7 @@ def _open_dscenario(self, index): # Connect signals self.dlg_dscenario.btn_properties.clicked.connect(partial(self._manage_properties, self.dlg_dscenario_manager, 'v_edit_cat_dscenario')) - self.dlg_dscenario.btn_toc.clicked.connect(partial(self._manage_add_layers)) + self.dlg_dscenario.btn_toc.clicked.connect(partial(self._manage_add_layers, 'v_edit_inp_dscenario', 'Dscenario')) self.dlg_dscenario.btn_insert.clicked.connect(partial(self._manage_insert)) self.dlg_dscenario.btn_delete.clicked.connect(partial(self._manage_delete)) self.dlg_dscenario.btn_snapping.toggled.connect(partial(self._manage_btn_snapping)) @@ -895,7 +901,7 @@ def _accept_props_dlg(self, dialog, tablename, pkey, feature_id, my_json): tools_qgis.show_warning('Error', parameter=json_result, dialog=dialog) - def _manage_add_layers(self): + def _manage_add_layers(self, table_name, sub_group): """ Opens menu to add/remove layers to ToC """ # Create main menu and get cursor click position @@ -911,15 +917,17 @@ def _manage_add_layers(self): geom_layers = [] sql = f"SELECT f_table_name FROM geometry_columns WHERE f_table_schema = '{lib_vars.schema_name}' " \ - f"AND f_table_name LIKE 'v_edit_inp_dscenario%';" + f"AND f_table_name LIKE '{table_name}%';" rows = tools_db.get_rows(sql) + if rows: geom_layers = [row[0] for row in rows] # Get layers to add - lyr_filter = "v_edit_inp_dscenario_%" + lyr_filter = f"{table_name}%" sql = f"SELECT id, alias, style_id, addparam FROM sys_table WHERE id LIKE '{lyr_filter}' AND alias IS NOT NULL ORDER BY alias ASC" rows = tools_db.get_rows(sql) + if rows: # LOAD ALL widget = QCheckBox() @@ -960,12 +968,12 @@ def _manage_add_layers(self): widget.setStyleSheet("margin: 5px 5px 5px 8px;") widgetAction.defaultWidget().stateChanged.connect( - partial(self._check_action_ischecked, tablename, the_geom, pk, style_id, alias.strip())) + partial(self._check_action_ischecked, tablename, the_geom, pk, style_id, alias.strip(), sub_group)) main_menu.exec_(click_point) - def _check_action_ischecked(self, tablename, the_geom, pk, style_id, alias, state): + def _check_action_ischecked(self, tablename, the_geom, pk, style_id, alias, sub_group, state): """ Control if user check or uncheck action menu, then add or remove layer from toc :param tablename: Postgres table name (String) :param pk: Field id of the table (String) @@ -976,11 +984,14 @@ def _check_action_ischecked(self, tablename, the_geom, pk, style_id, alias, stat if state == 2: layer = tools_qgis.get_layer_by_tablename(tablename) if layer is None: - tools_gw.add_layer_database(tablename, the_geom=the_geom, field_id=pk, group="EPA", sub_group="Dscenario", style_id=style_id, alias=alias) + tools_gw.add_layer_database(tablename, the_geom=the_geom, field_id=pk, group="EPA", sub_group=sub_group, style_id=style_id, alias=alias) elif state == 0: layer = tools_qgis.get_layer_by_tablename(tablename) if layer is not None: - tools_qgis.remove_layer_from_toc(alias, "EPA", "Dscenario") + msg = "Remove layer from project?" + answer = tools_qt.show_question(msg, title="Warning", parameter=f"'{layer.name()}'", force_action=True) + if answer: + tools_qgis.remove_layer_from_toc(layer.name(), "EPA", sub_group) def _manage_load_all(self, menu, state=None): diff --git a/core/toolbars/plan/netscenario_manager_btn.py b/core/toolbars/plan/netscenario_manager_btn.py index 4a2b0cffd..b255c9556 100644 --- a/core/toolbars/plan/netscenario_manager_btn.py +++ b/core/toolbars/plan/netscenario_manager_btn.py @@ -799,7 +799,10 @@ def _check_action_ischecked(self, tablename, the_geom, pk, style_id, alias, stat elif state == 0: layer = tools_qgis.get_layer_by_tablename(tablename) if layer is not None: - tools_qgis.remove_layer_from_toc(alias, "MASTERPLAN", "Netscenario") + msg = "Remove layer from project?" + answer = tools_qt.show_question(msg, title="Warning", parameter=f"'{layer.name()}'", force_action=True) + if answer: + tools_qgis.remove_layer_from_toc(alias, "MASTERPLAN", "Netscenario") def _manage_load_all(self, menu, state=None): From 13d424de2c15c598d9ece72109d10d33d9809c56 Mon Sep 17 00:00:00 2001 From: edgarfuste <34737125+edgarfuste@users.noreply.github.com> Date: Tue, 2 Jul 2024 09:32:58 +0200 Subject: [PATCH 15/22] Bug fix: manage class_obj and subtag on "GwCredentialsUi" --- core/ui/ui_manager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/ui/ui_manager.py b/core/ui/ui_manager.py index fe8d1b12d..dac1d9a8f 100644 --- a/core/ui/ui_manager.py +++ b/core/ui/ui_manager.py @@ -339,9 +339,9 @@ class GwAdminFieldsUi(GwDialog, FORM_CLASS): FORM_CLASS = _get_ui_class('admin_credentials.ui', 'admin') class GwCredentialsUi(GwDialog, FORM_CLASS): - def __init__(self): + def __init__(self, class_obj=None, subtag=None): - super().__init__() + super().__init__(class_obj, subtag) self.txt_pass.setClearButtonEnabled(True) icon_path = os.path.dirname(__file__) + os.sep + '..' + os.sep + '..' + os.sep + 'icons' + os.sep + 'dialog' + os.sep + '24x24' + os.sep + 'eye_open.png' self.action = QAction("show") From 069b81374798e809c0c515623c3ddbaad72ee592 Mon Sep 17 00:00:00 2001 From: smaspons Date: Tue, 2 Jul 2024 11:04:55 +0200 Subject: [PATCH 16/22] fix(info): manage class_obj in epa buttons --- core/shared/info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/shared/info.py b/core/shared/info.py index a9d0e6914..0b41c51fd 100644 --- a/core/shared/info.py +++ b/core/shared/info.py @@ -3340,7 +3340,7 @@ def open_epa_dlg(**kwargs): id_name = complet_result['body']['feature']['idName'] # Build dlg - info.dlg = globals()[ui]() + info.dlg = globals()[ui](info) tools_gw.load_settings(info.dlg) # Fill widgets From 1ecd2d7da63ea373787425a1259d005e54273e12 Mon Sep 17 00:00:00 2001 From: edgarfuste <34737125+edgarfuste@users.noreply.github.com> Date: Tue, 2 Jul 2024 11:59:36 +0200 Subject: [PATCH 17/22] Bug fix: Manage class_obj on GwAdminTraductionUi --- core/ui/ui_manager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/ui/ui_manager.py b/core/ui/ui_manager.py index dac1d9a8f..a5ac5817c 100644 --- a/core/ui/ui_manager.py +++ b/core/ui/ui_manager.py @@ -444,9 +444,9 @@ class GwInfoWorkcatUi(GwDialog, FORM_CLASS): FORM_CLASS = _get_ui_class('admin_translation.ui', 'admin') class GwAdminTranslationUi(GwDialog, FORM_CLASS): - def __init__(self): + def __init__(self, class_obj=None, subtag=None): - super().__init__() + super().__init__(class_obj, subtag) self.txt_pass.setClearButtonEnabled(True) icon_path = os.path.dirname(__file__) + os.sep + '..' + os.sep + '..' + os.sep + 'icons' + os.sep + 'dialogs' + os.sep + '24x24' + os.sep + 'eye_open.png' self.action = QAction("show") From f4d277272685026a91432fc4a00b5ed81131287e Mon Sep 17 00:00:00 2001 From: Albert Bofill Date: Fri, 5 Jul 2024 10:46:12 +0200 Subject: [PATCH 18/22] Update qgis templates. Change letter to symbolize valves, change inp_shortpipe symbology and rotate link arrow (WS) --- .../templates/qgisproject/en_US/ws_epa.qgs | 52883 ++++++++-------- .../qgisproject/en_US/ws_inventory.qgs | 31008 ++++----- .../templates/qgisproject/en_US/ws_master.qgs | 19659 +++--- .../templates/qgisproject/en_US/ws_om.qgs | 33836 +++++----- 4 files changed, 69060 insertions(+), 68326 deletions(-) diff --git a/resources/templates/qgisproject/en_US/ws_epa.qgs b/resources/templates/qgisproject/en_US/ws_epa.qgs index c5c8e3b33..297d590a9 100644 --- a/resources/templates/qgisproject/en_US/ws_epa.qgs +++ b/resources/templates/qgisproject/en_US/ws_epa.qgs @@ -1,5 +1,5 @@ - + @@ -21,318 +21,318 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -340,32 +340,32 @@ - + - + - + - + - + - + @@ -416,53 +416,53 @@ v_om_mincut_initpoint_c9f43f41_e77c_4d1d_b59d_cbf512a20788 - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + meters __XMIN__ @@ -489,303 +489,303 @@ - - - + + + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - - + + - + - + - + - + - - + + - + - + - + - - + + - + - - + + - + - - - + + + - + - + - + - - + + - + - + - + - - - - - + + + - + - + - - + + - + - - + + - + - - - + + + - + - + - + - + Annotations_a3df3e48_0a8f_4af8_b12e_b88b251e29e3 @@ -836,7 +836,7 @@ - + Node_minimum_values_d5bea8e4_feb1_40fe_8aad_3ee2a7f2532f __DATASOURCE__ key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_node" (the_geom) @@ -889,7 +889,7 @@ - + @@ -914,404 +914,404 @@ 1 0 - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -1322,186 +1322,186 @@ - + - - - - + + + + - + - + - + - + - - - + + + - + 0 0 1 - - - - + + + + - - - - - - - + - @@ -1531,141 +1531,141 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - + - @@ -1814,95 +1814,95 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + "node_id" - + cat_arc20151120192002466 __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_arc" @@ -1955,7 +1955,7 @@ def my_form_open(dialog, layer, feature): - + @@ -1980,138 +1980,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + @@ -2120,10 +2120,10 @@ def my_form_open(dialog, layer, feature): @@ -2133,255 +2133,255 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - @@ -2574,60 +2574,60 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2635,7 +2635,7 @@ def my_form_open(dialog, layer, feature): COALESCE("id", '<NULL>') - + cat_connec20160216122620764 __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_connec" @@ -2688,7 +2688,7 @@ def my_form_open(dialog, layer, feature): - + @@ -2713,138 +2713,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + @@ -2853,9 +2853,9 @@ def my_form_open(dialog, layer, feature): @@ -2865,233 +2865,233 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + - + - @@ -3123,42 +3123,42 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -3166,7 +3166,7 @@ def my_form_open(dialog, layer, feature): COALESCE("id", '<NULL>') - + cat_mat_arc20160224165702501 __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_mat_arc" @@ -3227,138 +3227,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + @@ -3375,82 +3375,82 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - + - @@ -3467,10 +3467,10 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - + + + + @@ -3479,7 +3479,7 @@ def my_form_open(dialog, layer, feature): COALESCE("id", '<NULL>') - + cat_mat_node20160224165702530 __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_mat_node" @@ -3540,138 +3540,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + @@ -3688,82 +3688,82 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - + - @@ -3780,10 +3780,10 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - + + + + @@ -3792,7 +3792,7 @@ def my_form_open(dialog, layer, feature): COALESCE("id", '<NULL>') - + cat_mat_roughness_c053cb42_acf7_41ae_a018_24e99b2c84d9 __DATASOURCE__ key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."cat_mat_roughness" @@ -3853,138 +3853,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + @@ -4003,134 +4003,134 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - + - + - @@ -4147,14 +4147,14 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - + + + + + + + + @@ -4163,7 +4163,7 @@ def my_form_open(dialog, layer, feature): - + cat_node20151105202206790 __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_node" @@ -4216,7 +4216,7 @@ def my_form_open(dialog, layer, feature): - + @@ -4241,138 +4241,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + @@ -4381,10 +4381,10 @@ def my_form_open(dialog, layer, feature): @@ -4394,357 +4394,357 @@ def my_form_open(dialog, layer, feature): - + - + - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + - + - @@ -4776,48 +4776,48 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -4825,7 +4825,7 @@ def my_form_open(dialog, layer, feature): COALESCE("id", '<NULL>') - + __XMIN__ __YMIN__ @@ -4890,7 +4890,7 @@ def my_form_open(dialog, layer, feature): - + @@ -4915,173 +4915,173 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + @@ -5092,62 +5092,62 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - - - - - - - + - - + - + - + - + - + + + + + + + - + - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - - - + + + + + + + - + - + - @@ -5303,16 +5314,16 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - + + + + - - - - + + + + @@ -5320,7 +5331,7 @@ def my_form_open(dialog, layer, feature): COALESCE( "name", '<NULL>' ) - + __XMIN__ __YMIN__ @@ -5385,7 +5396,7 @@ def my_form_open(dialog, layer, feature): - + @@ -5410,336 +5421,336 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + @@ -5748,189 +5759,189 @@ def my_form_open(dialog, layer, feature): - + - - - - + + + + - + - + - + - + - - - + + + - + - 0 0 1 - - - - + + + + - - - - - - - + @@ -5954,911 +5965,911 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -7397,271 +7408,271 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "arc_id" - + v_edit_cat_dscenario_f8980445_ef78_4616_8d5e_88de29347aec __DATASOURCE__ key='dscenario_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_cat_dscenario" @@ -7722,138 +7733,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + @@ -7872,56 +7883,56 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - + - + @@ -7996,7 +8007,7 @@ def my_form_open(dialog, layer, feature): - + v_edit_cat_feature_arc_e9a8f87d_5db9_4265_9496_b9ee76cffadd __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_cat_feature_arc" @@ -8057,138 +8068,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + @@ -8207,56 +8218,56 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - + - + @@ -8331,7 +8342,7 @@ def my_form_open(dialog, layer, feature): - + v_edit_cat_feature_connec_79421626_dc83_4ace_a970_9edeceeef98d __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_cat_feature_connec" @@ -8392,138 +8403,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + @@ -8542,56 +8553,56 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - + - + @@ -8666,7 +8677,7 @@ def my_form_open(dialog, layer, feature): - + v_edit_cat_feature_node_ea70bfb4_8fbc_4012_8ac4_3f3f7b2557ae __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_cat_feature_node" @@ -8727,138 +8738,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + @@ -8877,98 +8888,98 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - + @@ -9067,7 +9078,7 @@ def my_form_open(dialog, layer, feature): - + __XMIN__ __YMIN__ @@ -9132,7 +9143,7 @@ def my_form_open(dialog, layer, feature): - + @@ -9157,462 +9168,462 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - - - + + + + - - - - - - - - - - + - + - - - - - - - - + + + + + + - - - - - + - + - - - - + - + - - - - - - - - - + + + + + + - - @@ -9621,62 +9632,62 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - - - - - - - + @@ -9700,948 +9711,948 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -11193,267 +11204,267 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "connec_id" - + v_edit_dimensions20170628134034849 __DATASOURCE__ key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_dimensions" (the_geom) @@ -11506,7 +11517,7 @@ def my_form_open(dialog, layer, feature): - + @@ -11531,933 +11542,933 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - - + - + - + - + - + - + - + - + - + - + - + - - + - + - + - + - + - + - + - + - + - + - + - - + - + - + - + - + - + @@ -12468,898 +12479,898 @@ def my_form_open(dialog, layer, feature): - + - + - - - - + + + + - + - + - - - - - - + + + - - - - - + - + - - - - + + + + - + - + - - - - - - + + + - - - - - + - + - - - - + + + + - + - + - - - - - + + + - - - - + - + - - - - + + + + - + - + - - - - - - + + + - - - - - + - + - - - - + + + + - + - + - - - - - - + + + - - - - - + - + - - - - + + + + - + - + - - - - - + + + - - - - + - + - - - - + + + + - + - + - - - - - + + + - - - - + - + - - - - + + + + - + - + - - - - - + + + - - - @@ -13368,202 +13379,202 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - - - - - - - + - @@ -13593,251 +13604,251 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - @@ -13869,40 +13880,40 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -13910,7 +13921,7 @@ def my_form_open(dialog, layer, feature): COALESCE( "id", '<NULL>' ) - + __XMIN__ __YMIN__ @@ -13975,7 +13986,7 @@ def my_form_open(dialog, layer, feature): - + @@ -14000,173 +14011,173 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + @@ -14177,67 +14188,67 @@ def my_form_open(dialog, layer, feature): - 0 0 1 - - - - + + + + - - - - - - - + - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + - + - @@ -14537,35 +14559,35 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -14573,7 +14595,7 @@ def my_form_open(dialog, layer, feature): COALESCE( "descript", '<NULL>' ) - + __XMIN__ __YMIN__ @@ -14638,7 +14660,7 @@ def my_form_open(dialog, layer, feature): - + @@ -14663,173 +14685,173 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + @@ -14840,67 +14862,67 @@ def my_form_open(dialog, layer, feature): - 0 0 1 - - - - + + + + - - - - - - - + - - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + - + - + - @@ -15155,33 +15199,33 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + @@ -15189,7 +15233,7 @@ def my_form_open(dialog, layer, feature): COALESCE( "descript", '<NULL>' ) - + v_edit_element20170828122555146 __DATASOURCE__ key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_element" (the_geom) @@ -15242,7 +15286,7 @@ def my_form_open(dialog, layer, feature): - + @@ -15267,181 +15311,181 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + @@ -15452,62 +15496,62 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - - - - - - - + @@ -15531,349 +15575,349 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -16102,70 +16146,70 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16180,7 +16224,7 @@ def my_form_open(dialog, layer, feature): COALESCE( "element_id", '<NULL>' ) - + __XMIN__ __YMIN__ @@ -16245,7 +16289,7 @@ def my_form_open(dialog, layer, feature): - + @@ -16270,173 +16314,173 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + @@ -16447,63 +16491,63 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - - - - - - - + - - - + - + - + - + - + - + - + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + - + - @@ -16688,21 +16732,21 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - + + + + + + + - - - - - - + + + + + + @@ -16710,7 +16754,7 @@ def my_form_open(dialog, layer, feature): COALESCE("short_descript", '<NULL>') short_descript - + __XMIN__ __YMIN__ @@ -16775,7 +16819,7 @@ def my_form_open(dialog, layer, feature): - + @@ -16800,181 +16844,181 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + @@ -16985,62 +17029,62 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - - - - - - - + @@ -17064,235 +17108,235 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -17474,95 +17518,95 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + "connec_id" - + v_edit_inp_curve_858af3e6_c3c9_4a73_ba0c_0285e68d4f63 __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_curve" @@ -17623,138 +17667,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + @@ -17773,46 +17817,46 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + - + - @@ -17874,10 +17918,10 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - - + + + + @@ -17886,7 +17930,7 @@ def my_form_open(dialog, layer, feature): - + __XMIN__ __YMIN__ @@ -17951,7 +17995,7 @@ def my_form_open(dialog, layer, feature): - + @@ -17976,181 +18020,181 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + @@ -18161,62 +18205,62 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - - - - - - - + @@ -18240,239 +18284,239 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -18654,96 +18698,96 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + "node_id" - + __XMIN__ __YMIN__ @@ -18808,7 +18852,7 @@ def my_form_open(dialog, layer, feature): - + @@ -18833,181 +18877,181 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + @@ -19018,62 +19062,62 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - - - - - - - + @@ -19097,173 +19141,173 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - + - + - @@ -19405,72 +19449,72 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + "node_id" - + v_edit_inp_pattern_aa06a7c7_458c_4809_a192_2495d2bf77fd __DATASOURCE__ key='pattern_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_pattern" @@ -19531,138 +19575,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + @@ -19681,50 +19725,50 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + - @@ -19791,11 +19835,11 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - - - + + + + + @@ -19804,7 +19848,7 @@ def my_form_open(dialog, layer, feature): - + __XMIN__ __YMIN__ @@ -19869,7 +19913,7 @@ def my_form_open(dialog, layer, feature): - + @@ -19894,189 +19938,189 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + @@ -20087,186 +20131,186 @@ def my_form_open(dialog, layer, feature): - + - - - - + + + + - + - + - + - + - - - + + + - + 0 0 1 - - - - + + + + - - - - - - - + @@ -20290,176 +20334,176 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - + - @@ -20598,71 +20642,71 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + "arc_id" - + __XMIN__ __YMIN__ @@ -20727,7 +20771,7 @@ def my_form_open(dialog, layer, feature): - + @@ -20752,210 +20796,210 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + @@ -20966,62 +21010,62 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - - - - - - - + @@ -21045,210 +21089,210 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -21405,82 +21449,82 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + "node_id" - + __XMIN__ __YMIN__ @@ -21545,7 +21589,7 @@ def my_form_open(dialog, layer, feature): - + @@ -21570,181 +21614,181 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + @@ -21755,62 +21799,62 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - - - - - - - + @@ -21834,159 +21878,159 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - @@ -22118,66 +22162,66 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + "node_id" - + __XMIN__ __YMIN__ @@ -22242,7 +22286,7 @@ def my_form_open(dialog, layer, feature): - + @@ -22267,247 +22311,414 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + 0 0 1 - - - - + + + + - - - - - - - + @@ -22531,160 +22742,160 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - @@ -22816,66 +23027,66 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + "node_id" - + v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0 __DATASOURCE__ key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_tank" (the_geom) @@ -22928,7 +23139,7 @@ def my_form_open(dialog, layer, feature): - + @@ -22953,181 +23164,181 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + @@ -23138,62 +23349,62 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - - - - - - - + @@ -23217,225 +23428,225 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -23607,90 +23818,90 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + "node_id" - + __XMIN__ __YMIN__ @@ -23755,7 +23966,7 @@ def my_form_open(dialog, layer, feature): - + @@ -23780,211 +23991,211 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + @@ -23995,62 +24206,62 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - - - - - - - + @@ -24074,224 +24285,224 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -24453,84 +24664,84 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + "node_id" - + v_edit_inp_virtualpump_7093a152_e097_463d_b769_eb56f6dac57f __DATASOURCE__ key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_virtualpump" (the_geom) @@ -24583,7 +24794,7 @@ def my_form_open(dialog, layer, feature): - + @@ -24608,282 +24819,282 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -24896,65 +25107,65 @@ def my_form_open(dialog, layer, feature): - 0 0 1 - - - - + + + + - - - - - - - + @@ -24978,140 +25189,140 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - + - @@ -25263,77 +25474,77 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + "arc_id" - + v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8 __DATASOURCE__ key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_virtualvalve" (the_geom) @@ -25386,7 +25597,7 @@ def my_form_open(dialog, layer, feature): - + @@ -25411,283 +25622,283 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -25700,65 +25911,65 @@ def my_form_open(dialog, layer, feature): - 0 0 1 - - - - + + + + - - - - - - - + @@ -25782,220 +25993,220 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -26152,82 +26363,82 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + "arc_id" - + __XMIN__ __YMIN__ @@ -26292,7 +26503,7 @@ def my_form_open(dialog, layer, feature): - + @@ -26317,359 +26528,359 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + @@ -26678,62 +26889,62 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - - - - - - - + - @@ -26763,293 +26974,293 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -27273,133 +27484,133 @@ def my_form_open(dialog, layer, feature): 1 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "link_id" - + __XMIN__ __YMIN__ @@ -27464,7 +27675,7 @@ def my_form_open(dialog, layer, feature): - + @@ -27489,1982 +27700,1992 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + - - - + - + - - - - - - - - - + + + + + + - - - + - + - - - - - - - - - + + + + + + - - - + - + - - - - - - - - - + + + + + + - - - + - + - - - - - - - - - + + + + + + - - - + - + - - - - - - - - - + + + + + + - - - + - + - - - - - - - - - + + + + + + - - - + - + - - - - + - + - - - - - - - + + + + + + - - - - + - + - - - - - - - - - - + + + + + + + - - - - + - + - - - - - - - - - + + + + + + - + - - + - + - - - - - - - - - + + + + + + - - - + - + - - - - - - - - - + + + + + + - - - + - + - - - - - - - - - + + + + + + - - - + - + - - - - - - - - - + + + + + + - - - + - + - - - - - - - - - + + + + + + - - - + - + - - - - - - - - - - + + + + + + - - - - + - + - - - - - - - - - + + + + + + - - - + - + - - - - - - - - - + + + + + + - - @@ -29473,63 +29694,65 @@ def my_form_open(dialog, layer, feature): + 0 0 1 - - - - + + + + - - - - - - - + @@ -29553,936 +29776,936 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -31041,320 +31264,320 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "node_id" - + __XMIN__ __YMIN__ @@ -31419,7 +31642,7 @@ def my_form_open(dialog, layer, feature): - + @@ -31444,173 +31667,173 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + @@ -31621,62 +31844,62 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - - - - - - - + - - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + - + - + - @@ -31860,21 +32116,21 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - + + + + + + + - - - - - - + + + + + + @@ -31882,7 +32138,7 @@ def my_form_open(dialog, layer, feature): "name" - + __XMIN__ __YMIN__ @@ -31947,7 +32203,7 @@ def my_form_open(dialog, layer, feature): - + @@ -31972,173 +32228,173 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + @@ -32149,63 +32405,63 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - - - - - - - + - - + - + - + - + - + - + - + - + - + - + + + + + + + - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + - + - + - @@ -32417,23 +32684,23 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + @@ -32441,7 +32708,7 @@ def my_form_open(dialog, layer, feature): COALESCE( "descript", '<NULL>' ) - + __XMIN__ __YMIN__ @@ -32506,7 +32773,7 @@ def my_form_open(dialog, layer, feature): - + @@ -32531,181 +32798,181 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + @@ -32716,186 +32983,186 @@ def my_form_open(dialog, layer, feature): - + - - - - + + + + - + - + - + - + - - - + + + - + 0 0 0.61 - - - - + + + + - - - - - - - + @@ -32919,140 +33186,140 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - + - + - @@ -33084,24 +33351,24 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + @@ -33109,7 +33376,7 @@ def my_form_open(dialog, layer, feature): COALESCE( "id", '<NULL>' ) - + __XMIN__ __YMIN__ @@ -33174,7 +33441,7 @@ def my_form_open(dialog, layer, feature): - + @@ -33199,173 +33466,173 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + @@ -33376,62 +33643,62 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - - - - - - - + - - - + - + - + - + - + - + - + - + - + - + - + - + @@ -33582,79 +33849,79 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - + - @@ -33687,32 +33954,32 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + @@ -33720,7 +33987,7 @@ def my_form_open(dialog, layer, feature): id - + __XMIN__ __YMIN__ @@ -33785,7 +34052,7 @@ def my_form_open(dialog, layer, feature): - + @@ -33810,189 +34077,189 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + @@ -34003,203 +34270,203 @@ def my_form_open(dialog, layer, feature): - + - - - - + + + + - + - + - + - + - - - + + + - - - - + 0 0 1 - - - - + + + + - - - - - - - + @@ -34223,140 +34490,140 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - + - + - @@ -34388,41 +34655,41 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + COALESCE( "name", '<NULL>' ) - + v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96 __DATASOURCE__ key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_arc" (the_geom) @@ -34475,7 +34742,7 @@ def my_form_open(dialog, layer, feature): - + @@ -34500,227 +34767,227 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + @@ -34731,62 +34998,62 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - - - - - - - + @@ -34810,77 +35077,77 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + - + - @@ -34913,16 +35180,16 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - + + + + - - - - + + + + @@ -34930,7 +35197,7 @@ def my_form_open(dialog, layer, feature): COALESCE( "id", '<NULL>' ) - + v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b __DATASOURCE__ key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_connec" (the_geom) @@ -34983,7 +35250,7 @@ def my_form_open(dialog, layer, feature): - + @@ -35008,181 +35275,181 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + @@ -35193,62 +35460,62 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - - - - - - - + @@ -35272,91 +35539,91 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + - + - @@ -35389,18 +35656,18 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - + + + + + - - - - - + + + + + @@ -35408,7 +35675,7 @@ def my_form_open(dialog, layer, feature): id - + v_om_mincut_initpoint_c9f43f41_e77c_4d1d_b59d_cbf512a20788 __DATASOURCE__ key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_initpoint" (anl_the_geom) @@ -35469,181 +35736,181 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + @@ -35654,65 +35921,65 @@ def my_form_open(dialog, layer, feature): - 0 0 1 - - - - + + + + - - - - - - - + @@ -35736,303 +36003,303 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -36259,78 +36526,78 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -36338,7 +36605,7 @@ def my_form_open(dialog, layer, feature): expl_name - + v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5 __DATASOURCE__ key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_node" (the_geom) @@ -36391,7 +36658,7 @@ def my_form_open(dialog, layer, feature): - + @@ -36416,181 +36683,181 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + @@ -36601,62 +36868,62 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - - - - - - - + @@ -36680,43 +36947,43 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + - + - @@ -36794,16 +37061,16 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - + + + + - - - - + + + + @@ -36811,7 +37078,7 @@ def my_form_open(dialog, layer, feature): id - + v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a __DATASOURCE__ key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_valve" (the_geom) @@ -36864,7 +37131,7 @@ def my_form_open(dialog, layer, feature): - + @@ -36889,265 +37156,265 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + @@ -37158,62 +37425,62 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - - - - - - - + @@ -37237,137 +37504,137 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - + - + - @@ -37400,24 +37667,24 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + @@ -37425,7 +37692,7 @@ def my_form_open(dialog, layer, feature): id - + v_rpt_arc_all_1a5f8bfc_1ba7_4596_9364_647fe51d4de7 __DATASOURCE__ key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_arc_all" (the_geom) @@ -37478,7 +37745,7 @@ def my_form_open(dialog, layer, feature): - + @@ -37503,622 +37770,622 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - - + - + - + - + - + - - + - + - + - + - + - - + - + - + - + - + - @@ -38129,193 +38396,193 @@ def my_form_open(dialog, layer, feature): - + - - - - + + + + - + - + - + - + - - - + + + - + - 0 0 1 - - - - + + + + - - - - - - - + - @@ -38345,192 +38612,192 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - + + - + - @@ -38563,95 +38830,95 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + COALESCE( "arc_id", '<NULL>' ) - + v_rpt_arc_c1c32dd7_4e28_4a25_a25b_c6e425e67bcc __DATASOURCE__ key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_arc" (the_geom) @@ -38704,7 +38971,7 @@ def my_form_open(dialog, layer, feature): - + @@ -38729,622 +38996,622 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - - + - + - + - + - + - - + - + - + - + - + - - + - + - + - + - + - @@ -39355,192 +39622,192 @@ def my_form_open(dialog, layer, feature): - + - - - - + + + + - + - + - + - + - - - + + + - + - 0 0 1 - - - - + + + + - - - - - - - + - @@ -39570,141 +39837,141 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + + - + - @@ -39858,122 +40125,122 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + COALESCE( "arc_id", '<NULL>' ) - + v_rpt_arc_hourly_7d8fcfd3_31e9_4b2e_b773_37b089981522 __DATASOURCE__ key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_arc_hourly" (the_geom) @@ -40026,7 +40293,7 @@ def my_form_open(dialog, layer, feature): - + @@ -40051,622 +40318,622 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - - + - + - + - + - + - - + - + - + - + - + - - + - + - + - + - + - @@ -40677,193 +40944,193 @@ def my_form_open(dialog, layer, feature): - + - - - - + + + + - + - + - + - + - - - + + + - + - 0 0 1 - - - - + + + + - - - - - - - + - @@ -40893,164 +41160,164 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - + + - + - @@ -41083,95 +41350,95 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + COALESCE( "arc_id", '<NULL>' ) - + v_rpt_node_05f30732_cb83_4bca_9d49_6160ac61b3ae __DATASOURCE__ key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_node" (the_geom) @@ -41224,7 +41491,7 @@ def my_form_open(dialog, layer, feature): - + @@ -41249,404 +41516,404 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -41657,186 +41924,186 @@ def my_form_open(dialog, layer, feature): - + - - - - + + + + - + - + - + - + - - - + + + - + 0 0 1 - - - - + + + + - - - - - - - + - @@ -41866,136 +42133,136 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - + - @@ -42144,95 +42411,95 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + COALESCE( "node_id", '<NULL>' ) - + v_rpt_node_all_99d83ee9_a698_42d2_b04c_c78c50a9bbae __DATASOURCE__ key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_node_all" (the_geom) @@ -42285,7 +42552,7 @@ def my_form_open(dialog, layer, feature): - + @@ -42310,404 +42577,404 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -42718,186 +42985,186 @@ def my_form_open(dialog, layer, feature): - + - - - - + + + + - + - + - + - + - - - + + + - + 0 0 1 - - - - + + + + - - - - - - - + - @@ -42927,192 +43194,192 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - + + - + - @@ -43145,53 +43412,53 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + "node_id" - + v_rpt_node_hourly_aaae159a_78ad_4885_a43a_20faa971123c __DATASOURCE__ key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_node_hourly" (the_geom) @@ -43244,7 +43511,7 @@ def my_form_open(dialog, layer, feature): - + @@ -43269,404 +43536,404 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -43677,186 +43944,186 @@ def my_form_open(dialog, layer, feature): - + - - - - + + + + - + - + - + - + - - - + + + - + 0 0 1 - - - - + + + + - - - - - - - + - @@ -43886,164 +44153,164 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - + + - + - @@ -44076,47 +44343,47 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + "node_id" - + __XMIN__ __YMIN__ @@ -44181,7 +44448,7 @@ def my_form_open(dialog, layer, feature): - + @@ -44206,208 +44473,208 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + @@ -44416,63 +44683,63 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - - - - - - - + - - + - + - + - + - + - + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + - @@ -44622,14 +44889,14 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - + + + - - - + + + @@ -44637,7 +44904,7 @@ def my_form_open(dialog, layer, feature): "pol_id" - + __XMIN__ __YMIN__ @@ -44702,7 +44969,7 @@ def my_form_open(dialog, layer, feature): - + @@ -44727,240 +44994,240 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + @@ -44969,62 +45236,62 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - - - - - - - + - - + - + - + - + - + - + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + - @@ -45174,14 +45441,14 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - + + + - - - + + + @@ -45896,9 +46163,9 @@ def my_form_open(dialog, layer, feature): @@ -45925,83 +46192,83 @@ def my_form_open(dialog, layer, feature): - - - + + + - + - + - - - + + + - + - + @@ -46009,15 +46276,15 @@ def my_form_open(dialog, layer, feature): - - - + + + @@ -46025,942 +46292,942 @@ def my_form_open(dialog, layer, feature): - - - + + + - + - - - - + + + + - + - + - - - + + + - + - - - - + + + + - + - + - - - + + + - + - - - - + + + + - + - + - - - + + + - + - + - - - + + + - + - - - - + + + + - + - + - - - + + + - + - + - - - + + + - + - - - - + + + + - + - + - - - + + + - + - - - - + + + + - + - + - - - + + + - + - - - - + + + + - + - + - - - + + + - + - - - - + + + + - + - + - - - + + + - + - + - - - + + + - + - + - - - + + + - + - + - - - + + + - + - + - - - + + + - + - cat_mat_node20160224165702530 - cat_mat_arc20160224165702501 - cat_node20151105202206790 - cat_arc20151120192002466 - cat_connec20160216122620764 - v_edit_dimensions20170628134034849 - ext_municipality20171204170633784 - v_ext_address20180201103159332 - v_ext_plot20180201103159443 + cat_mat_node20160224165702530 + cat_mat_arc20160224165702501 + cat_node20151105202206790 + cat_arc20151120192002466 + cat_connec20160216122620764 + v_edit_dimensions20170628134034849 + ext_municipality20171204170633784 + v_ext_address20180201103159332 + v_ext_plot20180201103159443 - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + .. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + - + - .. @@ -46992,129 +47259,129 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + COALESCE("id", '<NULL>') 4 - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + .. - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - .. @@ -47146,57 +47413,57 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + COALESCE("id", '<NULL>') 4 - - + + - + - + - + .. - - - + + + - + - + - .. @@ -47212,44 +47479,44 @@ def my_form_open(dialog, layer, feature): - - - + + + COALESCE("id", '<NULL>') 4 - - + + - + - + - + .. - - - + + + - + - + - .. @@ -47265,114 +47532,114 @@ def my_form_open(dialog, layer, feature): - - - + + + COALESCE("id", '<NULL>') 4 - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + .. - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - + - .. @@ -47404,45 +47671,45 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + COALESCE("id", '<NULL>') 4 - - + + - + - + - + - + - - + + @@ -47462,145 +47729,145 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -47612,30 +47879,30 @@ def my_form_open(dialog, layer, feature): - - - - + + + + - - + + @@ -47657,22 +47924,22 @@ def my_form_open(dialog, layer, feature): - + .. - - - + + + - + - .. @@ -47704,69 +47971,69 @@ def my_form_open(dialog, layer, feature): - - - + + + COALESCE( "name", '<NULL>' ) 2 - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - + + @@ -47783,7 +48050,7 @@ def my_form_open(dialog, layer, feature): - + @@ -47795,8 +48062,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -47818,7 +48085,7 @@ def my_form_open(dialog, layer, feature): - + @@ -47830,8 +48097,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -47857,7 +48124,7 @@ def my_form_open(dialog, layer, feature): - + @@ -47869,8 +48136,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -47893,8 +48160,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -47911,7 +48178,7 @@ def my_form_open(dialog, layer, feature): - + @@ -47923,8 +48190,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -47946,7 +48213,7 @@ def my_form_open(dialog, layer, feature): - + @@ -47958,8 +48225,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -47985,7 +48252,7 @@ def my_form_open(dialog, layer, feature): - + @@ -47997,8 +48264,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -48021,8 +48288,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -48039,11 +48306,11 @@ def my_form_open(dialog, layer, feature): - + - - + + @@ -48062,7 +48329,7 @@ def my_form_open(dialog, layer, feature): - + @@ -48074,8 +48341,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -48101,11 +48368,11 @@ def my_form_open(dialog, layer, feature): - + - - + + @@ -48120,11 +48387,11 @@ def my_form_open(dialog, layer, feature): - + - - + + @@ -48148,290 +48415,290 @@ def my_form_open(dialog, layer, feature): - + - + - - - - - - + + + + + + - - - + + + - + - + - - - - - - + + + + + + - - - + + + - + - + - - - - - - + + + + + + - - + + - + - + - - - - - - + + + + + + - - - + + + - + - + - - - - - - + + + + + + - - - + + + - + - + - - - - - - + + + + + + - - + + - + - + - - - - - - + + + + + + - - + + - + - + - - - - - - + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -48443,30 +48710,30 @@ def my_form_open(dialog, layer, feature): - - - - + + + + - - + + @@ -48488,44 +48755,44 @@ def my_form_open(dialog, layer, feature): - + . - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - ../../../../../../Users/usuario/.qgis2/python/plugins/giswater/ui/dimensions.ui @@ -48557,54 +48824,54 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - + + + + + + + + + + + + + + COALESCE( "id", '<NULL>' ) 1 - - + + - + - + - + - + - + - + - + - + - - + + @@ -48631,144 +48898,144 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -48780,30 +49047,30 @@ def my_form_open(dialog, layer, feature): - - - - + + + + - - + + @@ -48825,30 +49092,30 @@ def my_form_open(dialog, layer, feature): - + .. - - - - - - - + + + + + + + - + - .. @@ -48880,62 +49147,62 @@ def my_form_open(dialog, layer, feature): - - - - - - - + + + + + + + COALESCE( "id", '<NULL>' ) 0 - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -48955,144 +49222,144 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -49104,30 +49371,30 @@ def my_form_open(dialog, layer, feature): - - - - + + + + - - + + @@ -49149,26 +49416,26 @@ def my_form_open(dialog, layer, feature): - + .. - - - - - - - - - - - - + + + + + + + + + + + + - + .. @@ -49200,167 +49467,167 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - + + + + + + + + + + + + 2 - + - - - - - - - + - + - + - - - - + + + + - + - + @@ -49368,34 +49635,34 @@ def my_form_open(dialog, layer, feature): - - + + - + @@ -49403,9 +49670,9 @@ def my_form_open(dialog, layer, feature): @@ -49413,379 +49680,379 @@ def my_form_open(dialog, layer, feature): - + - + - + - - - + + + - + - + - - - + + + - + - - - - + + + + - + - + - - - + + + - + - - - - + + + + - + - + - - - + + + - + - - - - + + + + - + - + - - - + + + - + - - - - + + + + - + - + - - - + + + - + - - - - + + + + - + - + - - - + + + @@ -49793,248 +50060,248 @@ def my_form_open(dialog, layer, feature): - - - + + + - + - - - - + + + + - + - + - - - + + + - + - - - - + + + + - + - + - - - + + + - + - - - - + + + + - + - + - - - + + + - + - + - - - + + + @@ -50042,15 +50309,15 @@ def my_form_open(dialog, layer, feature): - - - + + + @@ -50058,291 +50325,291 @@ def my_form_open(dialog, layer, feature): - - - + + + - + - + - - - + + + - + - - - - + + + + - + - + - - - + + + - - - - + - + - - - - - - - + - + - + - - - - + + + + - + - + @@ -50350,21 +50617,21 @@ def my_form_open(dialog, layer, feature): - + - + - + - + @@ -50372,167 +50639,167 @@ def my_form_open(dialog, layer, feature): - + - - - - + + + + - + - + - + - - - - + + + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -50548,14 +50815,14 @@ def my_form_open(dialog, layer, feature): - + @@ -50563,167 +50830,167 @@ def my_form_open(dialog, layer, feature): - + - - - - + + + + - + - + - + - - - - + + + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -50741,88 +51008,88 @@ def my_form_open(dialog, layer, feature): - + - - - + + + - + - + - - - + + + - + - + @@ -50830,351 +51097,413 @@ def my_form_open(dialog, layer, feature): - - - + + + - + - - - - + + + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086 - v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f - v_edit_connec_decaeb94_529d_4842_9e89_33c065483403 - v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca - ve_pol_connec_da965155_3efa_448d_83c5_82ce457fd689 - ve_pol_node_f56fce40_7d46_402c_b62d_87c0348f9226 - v_edit_dimensions20170628134034849 - ext_municipality20171204170633784 - v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7 - v_ext_plot20180201103159443 + v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086 + v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f + v_edit_connec_decaeb94_529d_4842_9e89_33c065483403 + v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca + ve_pol_connec_da965155_3efa_448d_83c5_82ce457fd689 + ve_pol_node_f56fce40_7d46_402c_b62d_87c0348f9226 + v_edit_dimensions20170628134034849 + ext_municipality20171204170633784 + v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7 + v_ext_plot20180201103159443 - - + + - + @@ -51182,9 +51511,9 @@ def my_form_open(dialog, layer, feature): @@ -51192,635 +51521,573 @@ def my_form_open(dialog, layer, feature): - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + + - + - + - - - + + + - + - - - - + + + + - + - + - - - + + + - + - - - - + + + + - + - + - - - + + + - + - + - - - + + + - + - + - - - + + + - + - + - - - + + + - + - + - - - + + + - + - - - - + + + + - + - + - - - + + + - + - - - - + + + + - + - + - - - + + + - + - - - - + + + + - + - + - - - + + + - @@ -51828,399 +52095,399 @@ def my_form_open(dialog, layer, feature): - - - + + + - + - + - - - + + + - + - + - - - + + + - + - - - - + + + + - + - + - - - + + + - + - - - - + + + + - + - + - - - + + + - + - v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a - v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5 - v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b - v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96 - v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086 - v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f - v_edit_connec_decaeb94_529d_4842_9e89_33c065483403 - v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca - ve_pol_connec_da965155_3efa_448d_83c5_82ce457fd689 - ve_pol_node_f56fce40_7d46_402c_b62d_87c0348f9226 - v_edit_dimensions20170628134034849 - ext_municipality20171204170633784 - v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7 - v_ext_plot20180201103159443 + v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a + v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5 + v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b + v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96 + v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086 + v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f + v_edit_connec_decaeb94_529d_4842_9e89_33c065483403 + v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca + ve_pol_connec_da965155_3efa_448d_83c5_82ce457fd689 + ve_pol_node_f56fce40_7d46_402c_b62d_87c0348f9226 + v_edit_dimensions20170628134034849 + ext_municipality20171204170633784 + v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7 + v_ext_plot20180201103159443 - + - - - - - - - + - + - + - - - - + + + + - + - + @@ -52228,28 +52495,28 @@ def my_form_open(dialog, layer, feature): - + - + - + - - - + + + - @@ -52259,17 +52526,17 @@ def my_form_open(dialog, layer, feature): - + - + +proj=utm +zone=31 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs @@ -52283,41 +52550,41 @@ def my_form_open(dialog, layer, feature): - + - + - + diff --git a/resources/templates/qgisproject/en_US/ws_inventory.qgs b/resources/templates/qgisproject/en_US/ws_inventory.qgs index e22e566c1..b9654735c 100644 --- a/resources/templates/qgisproject/en_US/ws_inventory.qgs +++ b/resources/templates/qgisproject/en_US/ws_inventory.qgs @@ -1,5 +1,5 @@ - + @@ -21,169 +21,169 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -211,30 +211,30 @@ v_edit_link_bf3255de_b7b9_47f1_b2d1_2275d23b83d7 - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + meters __XMIN__ @@ -261,150 +261,150 @@ - - - + + + - + - + - + - + - + - + - + - - + + - + - + - + - + - - + + - + - + - + - - + + - + - - + + - + - - - + + + - + - + - + - + Annotations_a3df3e48_0a8f_4af8_b12e_b88b251e29e3 @@ -455,7 +455,7 @@ - + cat_arc20151120192002466 __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_arc" @@ -508,7 +508,7 @@ - + @@ -533,138 +533,138 @@ 1 0 - + - + - + - - - + - - - + - - @@ -686,255 +686,255 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - @@ -1127,60 +1127,60 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1188,7 +1188,7 @@ def my_form_open(dialog, layer, feature): COALESCE("id", '<NULL>') - + cat_connec20160216122620764 __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_connec" @@ -1241,7 +1241,7 @@ def my_form_open(dialog, layer, feature): - + @@ -1266,138 +1266,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - @@ -1418,233 +1418,233 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + - + - @@ -1676,42 +1676,42 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -1719,7 +1719,7 @@ def my_form_open(dialog, layer, feature): COALESCE("id", '<NULL>') - + cat_mat_arc20160224165702501 __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_mat_arc" @@ -1780,138 +1780,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + cat_mat_node20160224165702530 __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_mat_node" @@ -2093,138 +2093,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + cat_node20151105202206790 __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_node" @@ -2398,7 +2398,7 @@ def my_form_open(dialog, layer, feature): - + @@ -2423,138 +2423,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - @@ -2576,357 +2576,357 @@ def my_form_open(dialog, layer, feature): - + - + - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + - + - @@ -2958,48 +2958,48 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -3007,7 +3007,7 @@ def my_form_open(dialog, layer, feature): COALESCE("id", '<NULL>') - + __XMIN__ __YMIN__ @@ -3072,7 +3072,7 @@ def my_form_open(dialog, layer, feature): - + @@ -3097,173 +3097,173 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - 0 0 1 - - - - + + + + - + - - - + - - + - + - + - + - + - + + + + + + + - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - - - + + + + + + + - + - + - @@ -3485,16 +3496,16 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - + + + + - - - - + + + + @@ -3502,7 +3513,7 @@ def my_form_open(dialog, layer, feature): COALESCE( "name", '<NULL>' ) - + __XMIN__ __YMIN__ @@ -3567,7 +3578,7 @@ def my_form_open(dialog, layer, feature): - + @@ -3592,336 +3603,336 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - - - + + + + - + - - - + - - - + - - - + - - - + - - - - + + + + - + - + - + - + - - - + + + - + - 0 0 1 - - - - + + + + - + - - - + @@ -4136,911 +4147,911 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -5579,271 +5590,271 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "arc_id" - + v_edit_cat_feature_arc_e9a8f87d_5db9_4265_9496_b9ee76cffadd __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_cat_feature_arc" @@ -5904,138 +5915,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + v_edit_cat_feature_connec_79421626_dc83_4ace_a970_9edeceeef98d __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_cat_feature_connec" @@ -6239,138 +6250,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + v_edit_cat_feature_node_ea70bfb4_8fbc_4012_8ac4_3f3f7b2557ae __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_cat_feature_node" @@ -6574,138 +6585,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + __XMIN__ __YMIN__ @@ -6979,7 +6990,7 @@ def my_form_open(dialog, layer, feature): - + @@ -7004,462 +7015,462 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - - - + + + + - + - - - - + - - - - - - - + - - - - + - - - - - - @@ -7468,62 +7479,62 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - + - - - + @@ -7547,948 +7558,948 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -9040,267 +9051,267 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "connec_id" - + v_edit_dimensions20170628134034849 __DATASOURCE__ key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_dimensions" (the_geom) @@ -9353,7 +9364,7 @@ def my_form_open(dialog, layer, feature): - + @@ -9378,933 +9389,933 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - - + + + - + - - - - - + - - - - - + - - - + - + - + - + - + - + @@ -10315,898 +10326,898 @@ def my_form_open(dialog, layer, feature): - + - + - - - - + + + + - + - + - - - - - - + + + - - - - - + - + - - - - + + + + - + - + - - - - - - + + + - - - - - + - + - - - - + + + + - + - + - - - - - + + + - - - - + - + - - - - + + + + - + - + - - - - - - + + + - - - - - + - + - - - - + + + + - + - + - - - - - - + + + - - - - - + - + - - - - + + + + - + - + - - - - - + + + - - - - + - + - - - - + + + + - + - + - - - - - + + + - - - - + - + - - - - + + + + - + - + - - - - - + + + - - - @@ -11215,202 +11226,202 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - + - - - + - @@ -11440,251 +11451,251 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - @@ -11716,40 +11727,40 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -11757,7 +11768,7 @@ def my_form_open(dialog, layer, feature): COALESCE( "id", '<NULL>' ) - + __XMIN__ __YMIN__ @@ -11822,7 +11833,7 @@ def my_form_open(dialog, layer, feature): - + @@ -11847,173 +11858,173 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - - 0 0 1 - - - - + + + + - + - - - + - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + - + - @@ -12384,35 +12406,35 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -12420,7 +12442,7 @@ def my_form_open(dialog, layer, feature): COALESCE( "descript", '<NULL>' ) - + __XMIN__ __YMIN__ @@ -12485,7 +12507,7 @@ def my_form_open(dialog, layer, feature): - + @@ -12510,173 +12532,173 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - - 0 0 1 - - - - + + + + - + - - - + - - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + - + - + - @@ -13002,33 +13046,33 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + @@ -13036,7 +13080,7 @@ def my_form_open(dialog, layer, feature): COALESCE( "descript", '<NULL>' ) - + v_edit_element20170828122555146 __DATASOURCE__ key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_element" (the_geom) @@ -13089,7 +13133,7 @@ def my_form_open(dialog, layer, feature): - + @@ -13114,181 +13158,181 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - 0 0 1 - - - - + + + + - + - - - + @@ -13378,349 +13422,349 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -13949,70 +13993,70 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -14027,7 +14071,7 @@ def my_form_open(dialog, layer, feature): COALESCE( "element_id", '<NULL>' ) - + __XMIN__ __YMIN__ @@ -14092,7 +14136,7 @@ def my_form_open(dialog, layer, feature): - + @@ -14117,173 +14161,173 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - 0 0 1 - - - - + + + + - + - - - + - - - + - + - + - + - + - + - + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + - + - @@ -14535,21 +14579,21 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - + + + + + + + - - - - - - + + + + + + @@ -14557,7 +14601,7 @@ def my_form_open(dialog, layer, feature): COALESCE("short_descript", '<NULL>') short_descript - + __XMIN__ __YMIN__ @@ -14622,7 +14666,7 @@ def my_form_open(dialog, layer, feature): - + @@ -14647,359 +14691,359 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - + + - + - - - + - - 0 0 1 - - - - + + + + - + - - - + - @@ -15093,293 +15137,293 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -15603,133 +15647,133 @@ def my_form_open(dialog, layer, feature): 1 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "link_id" - + __XMIN__ __YMIN__ @@ -15794,7 +15838,7 @@ def my_form_open(dialog, layer, feature): - + @@ -15819,1982 +15863,1992 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - @@ -17803,63 +17857,65 @@ def my_form_open(dialog, layer, feature): + 0 0 1 - - - - + + + + - + - - - + @@ -17883,936 +17939,936 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -19371,320 +19427,320 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "node_id" - + __XMIN__ __YMIN__ @@ -19749,7 +19805,7 @@ def my_form_open(dialog, layer, feature): - + @@ -19774,173 +19830,173 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - 0 0 1 - - - - + + + + - + - - - + - - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + - + - + - @@ -20190,21 +20279,21 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - + + + + + + + - - - - - - + + + + + + @@ -20212,7 +20301,7 @@ def my_form_open(dialog, layer, feature): "name" - + __XMIN__ __YMIN__ @@ -20277,7 +20366,7 @@ def my_form_open(dialog, layer, feature): - + @@ -20302,173 +20391,173 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - 0 0 1 - - - - + + + + - + - - - + - - + - + - + - + - + - + - + - + - + + + + + + + - + - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + - + - + - @@ -20747,23 +20847,23 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + @@ -20771,7 +20871,7 @@ def my_form_open(dialog, layer, feature): COALESCE( "descript", '<NULL>' ) - + __XMIN__ __YMIN__ @@ -20836,7 +20936,7 @@ def my_form_open(dialog, layer, feature): - + @@ -20861,181 +20961,181 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - - + - - - - + + + + - + - + - + - + - - - + + + - + 0 0 0.61 - - - - + + + + - + - - - + @@ -21249,140 +21349,140 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - + - + - @@ -21414,24 +21514,24 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + @@ -21439,7 +21539,7 @@ def my_form_open(dialog, layer, feature): COALESCE( "id", '<NULL>' ) - + __XMIN__ __YMIN__ @@ -21504,7 +21604,7 @@ def my_form_open(dialog, layer, feature): - + @@ -21529,173 +21629,173 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - 0 0 1 - - - - + + + + - + - - - + - - - + - + - + - + - + - + - + - + - + - + - + - + @@ -21912,79 +22012,79 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - + - @@ -22017,32 +22117,32 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + @@ -22050,7 +22150,7 @@ def my_form_open(dialog, layer, feature): id - + __XMIN__ __YMIN__ @@ -22115,7 +22215,7 @@ def my_form_open(dialog, layer, feature): - + @@ -22140,189 +22240,189 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - - + - - - - + + + + - + - + - + - + - - - + + + - - - - + 0 0 1 - - - - + + + + - + - - - + @@ -22553,140 +22653,140 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - + - + - @@ -22718,41 +22818,41 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + COALESCE( "name", '<NULL>' ) - + __XMIN__ __YMIN__ @@ -22817,7 +22917,7 @@ def my_form_open(dialog, layer, feature): - + @@ -22842,208 +22942,208 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - + + - + - - - + - - 0 0 1 - - - - + + + + - + - - - + - - + - + - + - + - + - + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + - @@ -23258,14 +23358,14 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - + + + - - - + + + @@ -23273,7 +23373,7 @@ def my_form_open(dialog, layer, feature): "pol_id" - + __XMIN__ __YMIN__ @@ -23338,7 +23438,7 @@ def my_form_open(dialog, layer, feature): - + @@ -23363,240 +23463,240 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - - + + + - + - - - + - - - + - - 0 0 1 - - - - + + + + - + - - - + - - + - + - + - + - + - + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + - @@ -23810,14 +23910,14 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - + + + - - - + + + @@ -24509,9 +24609,9 @@ def my_form_open(dialog, layer, feature): @@ -24538,83 +24638,83 @@ def my_form_open(dialog, layer, feature): - - - + + + - + - + - - - + + + - + - - - - - + + + @@ -24638,942 +24738,942 @@ def my_form_open(dialog, layer, feature): - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - + - - - + + + - + - + - - - + + + - + - + - - - + + + - + - + - - - + + + - + - cat_mat_node20160224165702530 - cat_mat_arc20160224165702501 - cat_node20151105202206790 - cat_arc20151120192002466 - cat_connec20160216122620764 - v_edit_dimensions20170628134034849 - ext_municipality20171204170633784 - v_ext_address20180201103159332 - v_ext_plot20180201103159443 + cat_mat_node20160224165702530 + cat_mat_arc20160224165702501 + cat_node20151105202206790 + cat_arc20151120192002466 + cat_connec20160216122620764 + v_edit_dimensions20170628134034849 + ext_municipality20171204170633784 + v_ext_address20180201103159332 + v_ext_plot20180201103159443 - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + .. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + - + - .. @@ -25605,129 +25705,129 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + COALESCE("id", '<NULL>') 4 - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + .. - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - .. @@ -25759,57 +25859,57 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + COALESCE("id", '<NULL>') 4 - - + + - + - + - + .. - - - + + + - + - + - .. @@ -25825,44 +25925,44 @@ def my_form_open(dialog, layer, feature): - - - + + + COALESCE("id", '<NULL>') 4 - - + + - + - + - + .. - - - + + + - + - + - .. @@ -25878,114 +25978,114 @@ def my_form_open(dialog, layer, feature): - - - + + + COALESCE("id", '<NULL>') 4 - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + .. - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - + - .. @@ -26017,45 +26117,45 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + COALESCE("id", '<NULL>') 4 - - + + - + - + - + - + - - + + @@ -26075,145 +26175,145 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -26225,30 +26325,30 @@ def my_form_open(dialog, layer, feature): - - - - + + + + - - + + @@ -26270,22 +26370,22 @@ def my_form_open(dialog, layer, feature): - + .. - - - + + + - + - .. @@ -26317,69 +26417,69 @@ def my_form_open(dialog, layer, feature): - - - + + + COALESCE( "name", '<NULL>' ) 2 - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - + + @@ -26396,7 +26496,7 @@ def my_form_open(dialog, layer, feature): - + @@ -26408,8 +26508,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -26431,7 +26531,7 @@ def my_form_open(dialog, layer, feature): - + @@ -26443,8 +26543,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -26470,7 +26570,7 @@ def my_form_open(dialog, layer, feature): - + @@ -26482,8 +26582,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -26506,8 +26606,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -26524,7 +26624,7 @@ def my_form_open(dialog, layer, feature): - + @@ -26536,8 +26636,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -26559,7 +26659,7 @@ def my_form_open(dialog, layer, feature): - + @@ -26571,8 +26671,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -26598,7 +26698,7 @@ def my_form_open(dialog, layer, feature): - + @@ -26610,8 +26710,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -26634,8 +26734,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -26652,11 +26752,11 @@ def my_form_open(dialog, layer, feature): - + - - + + @@ -26675,7 +26775,7 @@ def my_form_open(dialog, layer, feature): - + @@ -26687,8 +26787,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -26714,11 +26814,11 @@ def my_form_open(dialog, layer, feature): - + - - + + @@ -26733,11 +26833,11 @@ def my_form_open(dialog, layer, feature): - + - - + + @@ -26761,290 +26861,290 @@ def my_form_open(dialog, layer, feature): - + - + - - - - - - + + + + + + - - - + + + - + - + - - - - - - + + + + + + - - - + + + - + - + - - - - - - + + + + + + - - + + - + - + - - - - - - + + + + + + - - - + + + - + - + - - - - - - + + + + + + - - - + + + - + - + - - - - - - + + + + + + - - + + - + - + - - - - - - + + + + + + - - + + - + - + - - - - - - + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -27056,30 +27156,30 @@ def my_form_open(dialog, layer, feature): - - - - + + + + - - + + @@ -27101,44 +27201,44 @@ def my_form_open(dialog, layer, feature): - + . - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - ../../../../../../Users/usuario/.qgis2/python/plugins/giswater/ui/dimensions.ui @@ -27170,54 +27270,54 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - + + + + + + + + + + + + + + COALESCE( "id", '<NULL>' ) 1 - - + + - + - + - + - + - + - + - + - + - - + + @@ -27244,144 +27344,144 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -27393,30 +27493,30 @@ def my_form_open(dialog, layer, feature): - - - - + + + + - - + + @@ -27438,30 +27538,30 @@ def my_form_open(dialog, layer, feature): - + .. - - - - - - - + + + + + + + - + - .. @@ -27493,62 +27593,62 @@ def my_form_open(dialog, layer, feature): - - - - - - - + + + + + + + COALESCE( "id", '<NULL>' ) 0 - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -27568,144 +27668,144 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -27717,30 +27817,30 @@ def my_form_open(dialog, layer, feature): - - - - + + + + - - + + @@ -27762,26 +27862,26 @@ def my_form_open(dialog, layer, feature): - + .. - - - - - - - - - - - - + + + + + + + + + + + + - + .. @@ -27813,167 +27913,167 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - + + + + + + + + + + + + 2 - + - + - - - + - - - + - - - - + + + + - + - + @@ -27981,34 +28081,34 @@ def my_form_open(dialog, layer, feature): - - + + - - - + - + - + - - - + + + - + - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + @@ -28406,248 +28506,248 @@ def my_form_open(dialog, layer, feature): - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - + - - - + + + @@ -28655,15 +28755,15 @@ def my_form_open(dialog, layer, feature): - - - + + + @@ -28671,291 +28771,291 @@ def my_form_open(dialog, layer, feature): - - - + + + - + - + - - - + + + - + - - - - + + + + - - - + - - - + + + - - - - + - + - + - - - + - - - + - - - - + + + + - + - + @@ -28963,21 +29063,21 @@ def my_form_open(dialog, layer, feature): - + - + - + - + @@ -28985,167 +29085,167 @@ def my_form_open(dialog, layer, feature): - + - - - - + + + + - + - + - + - - - - + + + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -29161,14 +29261,14 @@ def my_form_open(dialog, layer, feature): - + @@ -29176,167 +29276,167 @@ def my_form_open(dialog, layer, feature): - + - - - - + + + + - + - + - + - - - - + + + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -29354,88 +29454,88 @@ def my_form_open(dialog, layer, feature): - + - - - + + + - + - + - - - + + + - + - - - - - + + + - + - - - - + + + + - - - + - + - - + + - + - - - + - - - + - - - + - - - + - - - - - + + + - + - - - - + + + + - - - + - - - + + + - + - v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086 - v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f - v_edit_connec_decaeb94_529d_4842_9e89_33c065483403 - v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca - ve_pol_connec_da965155_3efa_448d_83c5_82ce457fd689 - ve_pol_node_f56fce40_7d46_402c_b62d_87c0348f9226 - v_edit_dimensions20170628134034849 - ext_municipality20171204170633784 - v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7 - v_ext_plot20180201103159443 + v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086 + v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f + v_edit_connec_decaeb94_529d_4842_9e89_33c065483403 + v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca + ve_pol_connec_da965155_3efa_448d_83c5_82ce457fd689 + ve_pol_node_f56fce40_7d46_402c_b62d_87c0348f9226 + v_edit_dimensions20170628134034849 + ext_municipality20171204170633784 + v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7 + v_ext_plot20180201103159443 - - + + - - - + - + - + - - - + + + - + - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - + - - - + + + - + - + - - - + + + - + - + - - - + + + - + - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - @@ -30441,395 +30541,395 @@ def my_form_open(dialog, layer, feature): - - - + + + - + - + - - - + + + - + - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086 - v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f - v_edit_connec_decaeb94_529d_4842_9e89_33c065483403 - v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca - ve_pol_connec_da965155_3efa_448d_83c5_82ce457fd689 - ve_pol_node_f56fce40_7d46_402c_b62d_87c0348f9226 - v_edit_dimensions20170628134034849 - ext_municipality20171204170633784 - v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7 - v_ext_plot20180201103159443 + v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086 + v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f + v_edit_connec_decaeb94_529d_4842_9e89_33c065483403 + v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca + ve_pol_connec_da965155_3efa_448d_83c5_82ce457fd689 + ve_pol_node_f56fce40_7d46_402c_b62d_87c0348f9226 + v_edit_dimensions20170628134034849 + ext_municipality20171204170633784 + v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7 + v_ext_plot20180201103159443 - + - + - - - + - - - + - - - - + + + + - + - + @@ -30837,28 +30937,28 @@ def my_form_open(dialog, layer, feature): - + - + - + - - - + + + - @@ -30868,17 +30968,17 @@ def my_form_open(dialog, layer, feature): - + - + +proj=utm +zone=31 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs @@ -30892,41 +30992,41 @@ def my_form_open(dialog, layer, feature): - + - + - + diff --git a/resources/templates/qgisproject/en_US/ws_master.qgs b/resources/templates/qgisproject/en_US/ws_master.qgs index bb1f7575a..17044e33d 100644 --- a/resources/templates/qgisproject/en_US/ws_master.qgs +++ b/resources/templates/qgisproject/en_US/ws_master.qgs @@ -1,5 +1,5 @@ - + @@ -21,262 +21,262 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -340,87 +340,87 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -477,59 +477,59 @@ v_om_mincut_initpoint_c9f43f41_e77c_4d1d_b59d_cbf512a20788 - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + meters __XMIN__ @@ -556,349 +556,349 @@ - - - - - + Annotations_a3df3e48_0a8f_4af8_b12e_b88b251e29e3 @@ -949,7 +949,7 @@ - + Node_minimum_values_d5bea8e4_feb1_40fe_8aad_3ee2a7f2532f __DATASOURCE__ key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_node" (the_geom) @@ -1002,7 +1002,7 @@ - + @@ -1027,13 +1027,13 @@ 1 0 - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -1435,12 +1435,12 @@ - + - - - - + + + + - + - + - + - + - - - + + + - + cat_arc20151120192002466 __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_arc" @@ -2068,7 +2068,7 @@ def my_form_open(dialog, layer, feature): - + @@ -2093,13 +2093,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + @@ -2503,159 +2503,159 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - @@ -2748,7 +2748,7 @@ def my_form_open(dialog, layer, feature): COALESCE("id", '<NULL>') - + cat_connec20160216122620764 __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_connec" @@ -2801,7 +2801,7 @@ def my_form_open(dialog, layer, feature): - + @@ -2826,13 +2826,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + @@ -3113,98 +3113,98 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + - + - @@ -3279,7 +3279,7 @@ def my_form_open(dialog, layer, feature): COALESCE("id", '<NULL>') - + cat_mat_arc20160224165702501 __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_mat_arc" @@ -3340,13 +3340,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + cat_mat_node20160224165702530 __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_mat_node" @@ -3653,13 +3653,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + cat_mat_roughness_c053cb42_acf7_41ae_a018_24e99b2c84d9 __DATASOURCE__ key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."cat_mat_roughness" @@ -3966,13 +3966,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + cat_node20151105202206790 __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_node" @@ -4329,7 +4329,7 @@ def my_form_open(dialog, layer, feature): - + @@ -4354,13 +4354,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + @@ -4739,125 +4739,125 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + - + - @@ -4938,7 +4938,7 @@ def my_form_open(dialog, layer, feature): COALESCE("id", '<NULL>') - + __XMIN__ __YMIN__ @@ -5003,7 +5003,7 @@ def my_form_open(dialog, layer, feature): - + @@ -5028,13 +5028,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + plan_price_compost_1fb72596_6bf3_4b52_a200_541f4842a928 __DATASOURCE__ key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."plan_price_compost" @@ -5494,13 +5505,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + @@ -5684,40 +5695,40 @@ def my_form_open(dialog, layer, feature): - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + - + - @@ -5745,7 +5756,7 @@ def my_form_open(dialog, layer, feature): "id" - + plan_price_d25e3b47_1205_4ddb_8cd2_1a19e6a19d3b __DATASOURCE__ key='id' checkPrimaryKeyUnicity='0' table="SCHEMA_NAME"."plan_price" @@ -5806,13 +5817,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + @@ -6014,50 +6025,50 @@ def my_form_open(dialog, layer, feature): - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + - @@ -6087,7 +6098,7 @@ def my_form_open(dialog, layer, feature): "descript" - + __XMIN__ __YMIN__ @@ -6152,7 +6163,7 @@ def my_form_open(dialog, layer, feature): - + @@ -6177,13 +6188,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - - - + + + - + v_edit_cat_dscenario_f8980445_ef78_4616_8d5e_88de29347aec __DATASOURCE__ key='dscenario_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_cat_dscenario" @@ -8489,13 +8500,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + v_edit_cat_feature_arc_e9a8f87d_5db9_4265_9496_b9ee76cffadd __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_cat_feature_arc" @@ -8824,13 +8835,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + v_edit_cat_feature_connec_79421626_dc83_4ace_a970_9edeceeef98d __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_cat_feature_connec" @@ -9159,13 +9170,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + v_edit_cat_feature_node_ea70bfb4_8fbc_4012_8ac4_3f3f7b2557ae __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_cat_feature_node" @@ -9494,13 +9505,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + __XMIN__ __YMIN__ @@ -9899,7 +9910,7 @@ def my_form_open(dialog, layer, feature): - + @@ -9924,13 +9935,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - + - + v_edit_dimensions20170628134034849 __DATASOURCE__ key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_dimensions" (the_geom) @@ -12273,7 +12284,7 @@ def my_form_open(dialog, layer, feature): - + @@ -12298,13 +12309,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - - - + + + - + - + - - - - + + + + - + - + - - - + + + - + - + - - - - + + + + - + - + - - - + + + - + - + - - - - + + + + - + - + - - - + + + - + - + - - - - + + + + - + - + - - - + + + - + - + - - - - + + + + - + - + - - - + + + - + - + - - - - + + + + - + - + - - - + + + - + - + - - - - + + + + - + - + - - - + + + - + __XMIN__ __YMIN__ @@ -14742,7 +14753,7 @@ def my_form_open(dialog, layer, feature): - + @@ -14767,13 +14778,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + __XMIN__ __YMIN__ @@ -15405,7 +15427,7 @@ def my_form_open(dialog, layer, feature): - + @@ -15430,13 +15452,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + v_edit_element20170828122555146 __DATASOURCE__ key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_element" (the_geom) @@ -16009,7 +16053,7 @@ def my_form_open(dialog, layer, feature): - + @@ -16034,13 +16078,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + __XMIN__ __YMIN__ @@ -17012,7 +17056,7 @@ def my_form_open(dialog, layer, feature): - + @@ -17037,13 +17081,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + __XMIN__ __YMIN__ @@ -17542,7 +17586,7 @@ def my_form_open(dialog, layer, feature): - + @@ -17567,13 +17611,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + v_edit_inp_curve_858af3e6_c3c9_4a73_ba0c_0285e68d4f63 __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_curve" @@ -18390,13 +18434,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + __XMIN__ __YMIN__ @@ -18718,7 +18762,7 @@ def my_form_open(dialog, layer, feature): - + @@ -18743,13 +18787,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + __XMIN__ __YMIN__ @@ -19575,7 +19619,7 @@ def my_form_open(dialog, layer, feature): - + @@ -19600,13 +19644,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + v_edit_inp_pattern_aa06a7c7_458c_4809_a192_2495d2bf77fd __DATASOURCE__ key='pattern_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_pattern" @@ -20298,13 +20342,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + __XMIN__ __YMIN__ @@ -20636,7 +20680,7 @@ def my_form_open(dialog, layer, feature): - + @@ -20661,13 +20705,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - - - + + + - + __XMIN__ __YMIN__ @@ -21494,7 +21538,7 @@ def my_form_open(dialog, layer, feature): - + @@ -21519,13 +21563,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + - + __XMIN__ __YMIN__ @@ -22312,7 +22356,7 @@ def my_form_open(dialog, layer, feature): - + @@ -22337,13 +22381,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + __XMIN__ __YMIN__ @@ -23009,7 +23053,7 @@ def my_form_open(dialog, layer, feature): - + @@ -23034,13 +23078,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 0 1 - - - - + + + + - + - + - + - + - + @@ -23460,100 +23671,100 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - @@ -23642,7 +23853,7 @@ def my_form_open(dialog, layer, feature): "node_id" - + v_edit_inp_tank_8676b600_bb6e_4637_bf1b_f920e82136f0 __DATASOURCE__ key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_tank" (the_geom) @@ -23695,7 +23906,7 @@ def my_form_open(dialog, layer, feature): - + @@ -23720,13 +23931,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + __XMIN__ __YMIN__ @@ -24522,7 +24733,7 @@ def my_form_open(dialog, layer, feature): - + @@ -24547,13 +24758,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + - + v_edit_inp_virtualpump_7093a152_e097_463d_b769_eb56f6dac57f __DATASOURCE__ key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_virtualpump" (the_geom) @@ -25350,7 +25561,7 @@ def my_form_open(dialog, layer, feature): - + @@ -25375,13 +25586,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + v_edit_inp_virtualvalve_4b99c158_7f04_4765_9bff_b93fe2f489c8 __DATASOURCE__ key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_virtualvalve" (the_geom) @@ -26153,7 +26364,7 @@ def my_form_open(dialog, layer, feature): - + @@ -26178,13 +26389,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + __XMIN__ __YMIN__ @@ -27059,7 +27270,7 @@ def my_form_open(dialog, layer, feature): - + @@ -27084,13 +27295,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + __XMIN__ __YMIN__ @@ -28231,7 +28442,7 @@ def my_form_open(dialog, layer, feature): - + @@ -28256,13 +28467,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + __XMIN__ __YMIN__ @@ -32186,7 +32409,7 @@ def my_form_open(dialog, layer, feature): - + @@ -32211,13 +32434,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - - - + + + - + __XMIN__ __YMIN__ @@ -33120,7 +33343,7 @@ def my_form_open(dialog, layer, feature): - + @@ -33145,13 +33368,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + __XMIN__ __YMIN__ @@ -33648,7 +33904,7 @@ def my_form_open(dialog, layer, feature): - + @@ -33673,13 +33929,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + __XMIN__ __YMIN__ @@ -34207,7 +34474,7 @@ def my_form_open(dialog, layer, feature): - + @@ -34232,13 +34499,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - - - + + + - + __XMIN__ __YMIN__ @@ -34875,7 +35142,7 @@ def my_form_open(dialog, layer, feature): - + @@ -34900,13 +35167,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + __XMIN__ __YMIN__ @@ -35486,7 +35753,7 @@ def my_form_open(dialog, layer, feature): - + @@ -35511,13 +35778,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - - - + + + - + v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96 __DATASOURCE__ key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_arc" (the_geom) @@ -36176,7 +36443,7 @@ def my_form_open(dialog, layer, feature): - + @@ -36201,13 +36468,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + - + v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b __DATASOURCE__ key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_connec" (the_geom) @@ -36684,7 +36951,7 @@ def my_form_open(dialog, layer, feature): - + @@ -36709,13 +36976,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + v_om_mincut_initpoint_c9f43f41_e77c_4d1d_b59d_cbf512a20788 __DATASOURCE__ key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_initpoint" (anl_the_geom) @@ -37170,13 +37437,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5 __DATASOURCE__ key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_node" (the_geom) @@ -38092,7 +38359,7 @@ def my_form_open(dialog, layer, feature): - + @@ -38117,13 +38384,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a __DATASOURCE__ key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_valve" (the_geom) @@ -38565,7 +38832,7 @@ def my_form_open(dialog, layer, feature): - + @@ -38590,13 +38857,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + __XMIN__ __YMIN__ @@ -39191,7 +39458,7 @@ def my_form_open(dialog, layer, feature): - + @@ -39216,13 +39483,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - - - + + + - + v_plan_psector_arc_dce5486b_c6a3_4689_a9de_daac853ecaf0 __DATASOURCE__ key='rid' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_plan_psector_arc" (the_geom) @@ -40082,13 +40349,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + - + v_plan_psector_connec_15a9ba6e_663a_42b9_8d65_66377a94eb7c __DATASOURCE__ key='rid' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_plan_psector_connec" (the_geom) @@ -40570,13 +40837,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - + - + v_plan_psector_link_70d1eea8_15c5_473e_95d2_a50a6da9d7ef __DATASOURCE__ key='rid' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_plan_psector_link" (the_geom) @@ -41214,13 +41481,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + v_plan_psector_node_2c158ecf_3501_42c0_9eca_ac0a9b49f34e __DATASOURCE__ key='rid' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_plan_psector_node" (the_geom) @@ -41784,13 +42051,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - + - + - + - + v_rpt_arc_all_1a5f8bfc_1ba7_4596_9364_647fe51d4de7 __DATASOURCE__ key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_arc_all" (the_geom) @@ -42241,7 +42508,7 @@ def my_form_open(dialog, layer, feature): - + @@ -42266,13 +42533,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - - - + + + - + v_rpt_arc_c1c32dd7_4e28_4a25_a25b_c6e425e67bcc __DATASOURCE__ key='arc_id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_arc" (the_geom) @@ -43467,7 +43734,7 @@ def my_form_open(dialog, layer, feature): - + @@ -43492,13 +43759,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - - - + + + - + v_rpt_arc_hourly_7d8fcfd3_31e9_4b2e_b773_37b089981522 __DATASOURCE__ key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_arc_hourly" (the_geom) @@ -44789,7 +45056,7 @@ def my_form_open(dialog, layer, feature): - + @@ -44814,13 +45081,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - - - + + + - + v_rpt_node_05f30732_cb83_4bca_9d49_6160ac61b3ae __DATASOURCE__ key='node_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_node" (the_geom) @@ -45987,7 +46254,7 @@ def my_form_open(dialog, layer, feature): - + @@ -46012,13 +46279,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -46420,12 +46687,12 @@ def my_form_open(dialog, layer, feature): - + - - - - + + + + - + - + - + - + - - - + + + - + v_rpt_node_all_99d83ee9_a698_42d2_b04c_c78c50a9bbae __DATASOURCE__ key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_node_all" (the_geom) @@ -47048,7 +47315,7 @@ def my_form_open(dialog, layer, feature): - + @@ -47073,13 +47340,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -47481,12 +47748,12 @@ def my_form_open(dialog, layer, feature): - + - - - - + + + + - + - + - + - + - - - + + + - + v_rpt_node_hourly_aaae159a_78ad_4885_a43a_20faa971123c __DATASOURCE__ key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_rpt_node_hourly" (the_geom) @@ -48007,7 +48274,7 @@ def my_form_open(dialog, layer, feature): - + @@ -48032,13 +48299,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -48440,12 +48707,12 @@ def my_form_open(dialog, layer, feature): - + - - - - + + + + - + - + - + - + - - - + + + - + __XMIN__ __YMIN__ @@ -48944,7 +49211,7 @@ def my_form_open(dialog, layer, feature): - + @@ -48969,13 +49236,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + __XMIN__ __YMIN__ @@ -49465,7 +49732,7 @@ def my_form_open(dialog, layer, feature): - + @@ -49490,13 +49757,13 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - @@ -1201,60 +1201,60 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1262,7 +1262,7 @@ def my_form_open(dialog, layer, feature): COALESCE("id", '<NULL>') - + cat_connec20160216122620764 __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_connec" @@ -1315,7 +1315,7 @@ def my_form_open(dialog, layer, feature): - + @@ -1340,138 +1340,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - @@ -1492,233 +1492,233 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + - + - @@ -1750,42 +1750,42 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -1793,7 +1793,7 @@ def my_form_open(dialog, layer, feature): COALESCE("id", '<NULL>') - + cat_mat_arc20160224165702501 __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_mat_arc" @@ -1854,138 +1854,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + cat_mat_node20160224165702530 __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_mat_node" @@ -2167,138 +2167,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + cat_node20151105202206790 __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."cat_node" @@ -2472,7 +2472,7 @@ def my_form_open(dialog, layer, feature): - + @@ -2497,138 +2497,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - @@ -2650,357 +2650,357 @@ def my_form_open(dialog, layer, feature): - + - + - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + - + - @@ -3032,48 +3032,48 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -3081,7 +3081,7 @@ def my_form_open(dialog, layer, feature): COALESCE("id", '<NULL>') - + __XMIN__ __YMIN__ @@ -3146,7 +3146,7 @@ def my_form_open(dialog, layer, feature): - + @@ -3171,173 +3171,173 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - 0 0 1 - - - - + + + + - + - - - + - - + - + - + - + - + - + + + + + + + - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - - - + + + + + + + - + - + - @@ -3559,16 +3570,16 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - + + + + - - - - + + + + @@ -3576,7 +3587,7 @@ def my_form_open(dialog, layer, feature): COALESCE( "name", '<NULL>' ) - + __XMIN__ __YMIN__ @@ -3641,7 +3652,7 @@ def my_form_open(dialog, layer, feature): - + @@ -3666,336 +3677,336 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - - - + + + + - + - - - + - - - + - - - + - - - + - - - - + + + + - + - + - + - + - - - + + + - + - 0 0 1 - - - - + + + + - + - - - + @@ -4210,911 +4221,911 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -5653,271 +5664,271 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "arc_id" - + v_edit_cat_feature_arc_e9a8f87d_5db9_4265_9496_b9ee76cffadd __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_cat_feature_arc" @@ -5978,138 +5989,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + v_edit_cat_feature_connec_79421626_dc83_4ace_a970_9edeceeef98d __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_cat_feature_connec" @@ -6313,138 +6324,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + v_edit_cat_feature_node_ea70bfb4_8fbc_4012_8ac4_3f3f7b2557ae __DATASOURCE__ key='id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_cat_feature_node" @@ -6648,138 +6659,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + __XMIN__ __YMIN__ @@ -7053,7 +7064,7 @@ def my_form_open(dialog, layer, feature): - + @@ -7078,462 +7089,462 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - - - + + + + - + - - - - + - - - - - - - + - - - - + - - - - - - @@ -7542,62 +7553,62 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - + - - - + @@ -7621,948 +7632,948 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -9114,267 +9125,267 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "connec_id" - + v_edit_dimensions20170628134034849 __DATASOURCE__ key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_dimensions" (the_geom) @@ -9427,7 +9438,7 @@ def my_form_open(dialog, layer, feature): - + @@ -9452,933 +9463,933 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - - + + + - + - - - - - + - - - - - + - - - + - + - + - + - + - + @@ -10389,898 +10400,898 @@ def my_form_open(dialog, layer, feature): - + - + - - - - + + + + - + - + - - - - - - + + + - - - - - + - + - - - - + + + + - + - + - - - - - - + + + - - - - - + - + - - - - + + + + - + - + - - - - - + + + - - - - + - + - - - - + + + + - + - + - - - - - - + + + - - - - - + - + - - - - + + + + - + - + - - - - - - + + + - - - - - + - + - - - - + + + + - + - + - - - - - + + + - - - - + - + - - - - + + + + - + - + - - - - - + + + - - - - + - + - - - - + + + + - + - + - - - - - + + + - - - @@ -11289,202 +11300,202 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - + - - - + - @@ -11514,251 +11525,251 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - @@ -11790,40 +11801,40 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -11831,7 +11842,7 @@ def my_form_open(dialog, layer, feature): COALESCE( "id", '<NULL>' ) - + __XMIN__ __YMIN__ @@ -11896,7 +11907,7 @@ def my_form_open(dialog, layer, feature): - + @@ -11921,173 +11932,173 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - - 0 0 1 - - - - + + + + - + - - - + - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + - + - @@ -12458,35 +12480,35 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -12494,7 +12516,7 @@ def my_form_open(dialog, layer, feature): COALESCE( "descript", '<NULL>' ) - + __XMIN__ __YMIN__ @@ -12559,7 +12581,7 @@ def my_form_open(dialog, layer, feature): - + @@ -12584,173 +12606,173 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - - 0 0 1 - - - - + + + + - + - - - + - - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + - + - + - @@ -13076,33 +13120,33 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + @@ -13110,7 +13154,7 @@ def my_form_open(dialog, layer, feature): COALESCE( "descript", '<NULL>' ) - + v_edit_element20170828122555146 __DATASOURCE__ key='element_id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_element" (the_geom) @@ -13163,7 +13207,7 @@ def my_form_open(dialog, layer, feature): - + @@ -13188,181 +13232,181 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - 0 0 1 - - - - + + + + - + - - - + @@ -13452,349 +13496,349 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -14023,70 +14067,70 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -14101,7 +14145,7 @@ def my_form_open(dialog, layer, feature): COALESCE( "element_id", '<NULL>' ) - + __XMIN__ __YMIN__ @@ -14166,7 +14210,7 @@ def my_form_open(dialog, layer, feature): - + @@ -14191,173 +14235,173 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - 0 0 1 - - - - + + + + - + - - - + - - - + - + - + - + - + - + - + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + - + - @@ -14609,21 +14653,21 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - + + + + + + + - - - - - - + + + + + + @@ -14631,7 +14675,7 @@ def my_form_open(dialog, layer, feature): COALESCE("short_descript", '<NULL>') short_descript - + __XMIN__ __YMIN__ @@ -14696,7 +14740,7 @@ def my_form_open(dialog, layer, feature): - + @@ -14721,359 +14765,359 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - + + - + - - - + - - 0 0 1 - - - - + + + + - + - - - + - @@ -15167,293 +15211,293 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -15677,133 +15721,133 @@ def my_form_open(dialog, layer, feature): 1 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "link_id" - + __XMIN__ __YMIN__ @@ -15868,7 +15912,7 @@ def my_form_open(dialog, layer, feature): - + @@ -15893,1982 +15937,1992 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - @@ -17877,63 +17931,65 @@ def my_form_open(dialog, layer, feature): + 0 0 1 - - - - + + + + - + - - - + @@ -17957,936 +18013,936 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -19445,320 +19501,320 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "node_id" - + __XMIN__ __YMIN__ @@ -19823,7 +19879,7 @@ def my_form_open(dialog, layer, feature): - + @@ -19848,173 +19904,173 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - 0 0 1 - - - - + + + + - + - - - + - - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + - + - + - @@ -20264,21 +20353,21 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - + + + + + + + - - - - - - + + + + + + @@ -20286,7 +20375,7 @@ def my_form_open(dialog, layer, feature): "name" - + __XMIN__ __YMIN__ @@ -20351,7 +20440,7 @@ def my_form_open(dialog, layer, feature): - + @@ -20376,173 +20465,173 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - 0 0 1 - - - - + + + + - + - - - + - - + - + - + - + - + - + - + - + - + + + + + + + - + - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + - + - + - @@ -20821,23 +20921,23 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + @@ -20845,7 +20945,7 @@ def my_form_open(dialog, layer, feature): COALESCE( "descript", '<NULL>' ) - + __XMIN__ __YMIN__ @@ -20910,7 +21010,7 @@ def my_form_open(dialog, layer, feature): - + @@ -20935,181 +21035,181 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - - + - - - - + + + + - + - + - + - + - - - + + + - + 0 0 0.61 - - - - + + + + - + - - - + @@ -21323,140 +21423,140 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - + - + - @@ -21488,24 +21588,24 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + @@ -21513,7 +21613,7 @@ def my_form_open(dialog, layer, feature): COALESCE( "id", '<NULL>' ) - + __XMIN__ __YMIN__ @@ -21578,7 +21678,7 @@ def my_form_open(dialog, layer, feature): - + @@ -21603,173 +21703,173 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - 0 0 1 - - - - + + + + - + - - - + - - - + - + - + - + - + - + - + - + - + - + - + - + @@ -21986,79 +22086,79 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - + - @@ -22091,32 +22191,32 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + @@ -22124,7 +22224,7 @@ def my_form_open(dialog, layer, feature): id - + __XMIN__ __YMIN__ @@ -22189,7 +22289,7 @@ def my_form_open(dialog, layer, feature): - + @@ -22214,189 +22314,189 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - - + - - - - + + + + - + - + - + - + - - - + + + - - - - + 0 0 1 - - - - + + + + - + - - - + @@ -22627,140 +22727,140 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - + - + - @@ -22792,41 +22892,41 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + COALESCE( "name", '<NULL>' ) - + v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96 __DATASOURCE__ key='id' srid=__SRID__ type=LineString checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_arc" (the_geom) @@ -22879,7 +22979,7 @@ def my_form_open(dialog, layer, feature): - + @@ -22904,227 +23004,227 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - 0 0 1 - - - - + + + + - + - - - + @@ -23214,77 +23314,77 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + - + - @@ -23317,16 +23417,16 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - + + + + - - - - + + + + @@ -23334,7 +23434,7 @@ def my_form_open(dialog, layer, feature): COALESCE( "id", '<NULL>' ) - + v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b __DATASOURCE__ key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_connec" (the_geom) @@ -23387,7 +23487,7 @@ def my_form_open(dialog, layer, feature): - + @@ -23412,181 +23512,181 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - 0 0 1 - - - - + + + + - + - - - + @@ -23676,91 +23776,91 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + - + - @@ -23793,18 +23893,18 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - + + + + + - - - - - + + + + + @@ -23812,7 +23912,7 @@ def my_form_open(dialog, layer, feature): id - + v_om_mincut_initpoint_c9f43f41_e77c_4d1d_b59d_cbf512a20788 __DATASOURCE__ key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_initpoint" (anl_the_geom) @@ -23873,181 +23973,181 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - - 0 0 1 - - - - + + + + - + - - - + @@ -24140,303 +24240,303 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -24663,78 +24763,78 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -24742,7 +24842,7 @@ def my_form_open(dialog, layer, feature): expl_name - + v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5 __DATASOURCE__ key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_node" (the_geom) @@ -24795,7 +24895,7 @@ def my_form_open(dialog, layer, feature): - + @@ -24820,181 +24920,181 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - 0 0 1 - - - - + + + + - + - - - + @@ -25084,43 +25184,43 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + - + - @@ -25198,16 +25298,16 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - + + + + - - - - + + + + @@ -25215,7 +25315,7 @@ def my_form_open(dialog, layer, feature): id - + v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a __DATASOURCE__ key='id' srid=__SRID__ type=Point checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_om_mincut_valve" (the_geom) @@ -25268,7 +25368,7 @@ def my_form_open(dialog, layer, feature): - + @@ -25293,265 +25393,265 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - + + - + - - - + - - - + - - 0 0 1 - - - - + + + + - + - - - + @@ -25641,137 +25741,137 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - + - + - @@ -25804,24 +25904,24 @@ def my_form_open(dialog, layer, feature): 2 generatedlayout - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + @@ -25829,7 +25929,7 @@ def my_form_open(dialog, layer, feature): id - + __XMIN__ __YMIN__ @@ -25894,7 +25994,7 @@ def my_form_open(dialog, layer, feature): - + @@ -25919,208 +26019,208 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - + + - + - - - + - - 0 0 1 - - - - + + + + - + - - - + - - + - + - + - + - + - + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + - @@ -26335,14 +26435,14 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - + + + - - - + + + @@ -26350,7 +26450,7 @@ def my_form_open(dialog, layer, feature): "pol_id" - + __XMIN__ __YMIN__ @@ -26415,7 +26515,7 @@ def my_form_open(dialog, layer, feature): - + @@ -26440,240 +26540,240 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - - + + + - + - - - + - - - + - - 0 0 1 - - - - + + + + - + - - - + - - + - + - + - + - + - + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + - @@ -26887,14 +26987,14 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - + + + - - - + + + @@ -27591,9 +27691,9 @@ def my_form_open(dialog, layer, feature): @@ -27620,83 +27720,83 @@ def my_form_open(dialog, layer, feature): - - - + + + - + - + - - - + + + - + - - - - - + + + @@ -27720,942 +27820,942 @@ def my_form_open(dialog, layer, feature): - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - + - - - + + + - + - + - - - + + + - + - + - - - + + + - + - + - - - + + + - + - cat_mat_node20160224165702530 - cat_mat_arc20160224165702501 - cat_node20151105202206790 - cat_arc20151120192002466 - cat_connec20160216122620764 - v_edit_dimensions20170628134034849 - ext_municipality20171204170633784 - v_ext_address20180201103159332 - v_ext_plot20180201103159443 + cat_mat_node20160224165702530 + cat_mat_arc20160224165702501 + cat_node20151105202206790 + cat_arc20151120192002466 + cat_connec20160216122620764 + v_edit_dimensions20170628134034849 + ext_municipality20171204170633784 + v_ext_address20180201103159332 + v_ext_plot20180201103159443 - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + .. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + - + - .. @@ -28687,129 +28787,129 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + COALESCE("id", '<NULL>') 4 - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + .. - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - .. @@ -28841,57 +28941,57 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + COALESCE("id", '<NULL>') 4 - - + + - + - + - + .. - - - + + + - + - + - .. @@ -28907,44 +29007,44 @@ def my_form_open(dialog, layer, feature): - - - + + + COALESCE("id", '<NULL>') 4 - - + + - + - + - + .. - - - + + + - + - + - .. @@ -28960,114 +29060,114 @@ def my_form_open(dialog, layer, feature): - - - + + + COALESCE("id", '<NULL>') 4 - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + .. - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - + - .. @@ -29099,45 +29199,45 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + COALESCE("id", '<NULL>') 4 - - + + - + - + - + - + - - + + @@ -29157,145 +29257,145 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -29307,30 +29407,30 @@ def my_form_open(dialog, layer, feature): - - - - + + + + - - + + @@ -29352,22 +29452,22 @@ def my_form_open(dialog, layer, feature): - + .. - - - + + + - + - .. @@ -29399,69 +29499,69 @@ def my_form_open(dialog, layer, feature): - - - + + + COALESCE( "name", '<NULL>' ) 2 - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - + + @@ -29478,7 +29578,7 @@ def my_form_open(dialog, layer, feature): - + @@ -29490,8 +29590,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -29513,7 +29613,7 @@ def my_form_open(dialog, layer, feature): - + @@ -29525,8 +29625,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -29552,7 +29652,7 @@ def my_form_open(dialog, layer, feature): - + @@ -29564,8 +29664,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -29588,8 +29688,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -29606,7 +29706,7 @@ def my_form_open(dialog, layer, feature): - + @@ -29618,8 +29718,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -29641,7 +29741,7 @@ def my_form_open(dialog, layer, feature): - + @@ -29653,8 +29753,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -29680,7 +29780,7 @@ def my_form_open(dialog, layer, feature): - + @@ -29692,8 +29792,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -29716,8 +29816,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -29734,11 +29834,11 @@ def my_form_open(dialog, layer, feature): - + - - + + @@ -29757,7 +29857,7 @@ def my_form_open(dialog, layer, feature): - + @@ -29769,8 +29869,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -29796,11 +29896,11 @@ def my_form_open(dialog, layer, feature): - + - - + + @@ -29815,11 +29915,11 @@ def my_form_open(dialog, layer, feature): - + - - + + @@ -29843,290 +29943,290 @@ def my_form_open(dialog, layer, feature): - + - + - - - - - - + + + + + + - - - + + + - + - + - - - - - - + + + + + + - - - + + + - + - + - - - - - - + + + + + + - - + + - + - + - - - - - - + + + + + + - - - + + + - + - + - - - - - - + + + + + + - - - + + + - + - + - - - - - - + + + + + + - - + + - + - + - - - - - - + + + + + + - - + + - + - + - - - - - - + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -30138,30 +30238,30 @@ def my_form_open(dialog, layer, feature): - - - - + + + + - - + + @@ -30183,44 +30283,44 @@ def my_form_open(dialog, layer, feature): - + . - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - ../../../../../../Users/usuario/.qgis2/python/plugins/giswater/ui/dimensions.ui @@ -30252,54 +30352,54 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - + + + + + + + + + + + + + + COALESCE( "id", '<NULL>' ) 1 - - + + - + - + - + - + - + - + - + - + - - + + @@ -30326,144 +30426,144 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -30475,30 +30575,30 @@ def my_form_open(dialog, layer, feature): - - - - + + + + - - + + @@ -30520,30 +30620,30 @@ def my_form_open(dialog, layer, feature): - + .. - - - - - - - + + + + + + + - + - .. @@ -30575,62 +30675,62 @@ def my_form_open(dialog, layer, feature): - - - - - - - + + + + + + + COALESCE( "id", '<NULL>' ) 0 - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -30650,144 +30750,144 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -30799,30 +30899,30 @@ def my_form_open(dialog, layer, feature): - - - - + + + + - - + + @@ -30844,26 +30944,26 @@ def my_form_open(dialog, layer, feature): - + .. - - - - - - - - - - - - + + + + + + + + + + + + - + .. @@ -30895,167 +30995,167 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - + + + + + + + + + + + + 2 - + - + - - - + - - - + - - - - + + + + - + - + @@ -31063,34 +31163,34 @@ def my_form_open(dialog, layer, feature): - - + + - - - + - + - + - - - + + + - + - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + @@ -31488,248 +31588,248 @@ def my_form_open(dialog, layer, feature): - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - + - - - + + + @@ -31737,15 +31837,15 @@ def my_form_open(dialog, layer, feature): - - - + + + @@ -31753,291 +31853,291 @@ def my_form_open(dialog, layer, feature): - - - + + + - + - + - - - + + + - + - - - - + + + + - - - + - - - + + + - - - - + - + - + - - - + - - - + - - - - + + + + - + - + @@ -32045,21 +32145,21 @@ def my_form_open(dialog, layer, feature): - + - + - + - + @@ -32067,167 +32167,167 @@ def my_form_open(dialog, layer, feature): - + - - - - + + + + - + - + - + - - - - + + + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -32243,14 +32343,14 @@ def my_form_open(dialog, layer, feature): - + @@ -32258,167 +32358,167 @@ def my_form_open(dialog, layer, feature): - + - - - - + + + + - + - + - + - - - - + + + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -32436,88 +32536,88 @@ def my_form_open(dialog, layer, feature): - + - - - + + + - + - + - - - + + + - + - - - - - + + + - + - - - - + + + + - - - + - + - - + + - + - - - + - - - + - - - + - - - + - - - - - + + + - + - - - - + + + + - - - + - - - + + + - + - v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086 - v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f - v_edit_connec_decaeb94_529d_4842_9e89_33c065483403 - v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca - ve_pol_connec_da965155_3efa_448d_83c5_82ce457fd689 - ve_pol_node_f56fce40_7d46_402c_b62d_87c0348f9226 - v_edit_dimensions20170628134034849 - ext_municipality20171204170633784 - v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7 - v_ext_plot20180201103159443 + v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086 + v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f + v_edit_connec_decaeb94_529d_4842_9e89_33c065483403 + v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca + ve_pol_connec_da965155_3efa_448d_83c5_82ce457fd689 + ve_pol_node_f56fce40_7d46_402c_b62d_87c0348f9226 + v_edit_dimensions20170628134034849 + ext_municipality20171204170633784 + v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7 + v_ext_plot20180201103159443 - - + + - - - + - + - + - - - + + + - + - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - + - - - + + + - + - + - - - + + + - + - + - - - + + + - + - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - @@ -33523,399 +33623,399 @@ def my_form_open(dialog, layer, feature): - - - + + + - + - + - - - + + + - + - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - - - - + + + + - - - + - - - + + + - + - v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a - v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5 - v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b - v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96 - v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086 - v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f - v_edit_connec_decaeb94_529d_4842_9e89_33c065483403 - v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca - ve_pol_connec_da965155_3efa_448d_83c5_82ce457fd689 - ve_pol_node_f56fce40_7d46_402c_b62d_87c0348f9226 - v_edit_dimensions20170628134034849 - ext_municipality20171204170633784 - v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7 - v_ext_plot20180201103159443 + v_om_mincut_valve_c9c9c530_f8de_40a3_89c2_eef396ae238a + v_om_mincut_node_889396c9_30eb_40d5_bf2c_f464fff186a5 + v_om_mincut_connec_ff9f2dd2_aeb7_4283_bb51_bb070d81309b + v_om_mincut_arc_0b67d4c7_c3e5_4fdf_aff6_33078cacec96 + v_edit_exploitation_fd06cc08_9e9d_4a22_bfca_586b3919d086 + v_edit_node_79e9d657_9f6a_4303_b422_e1ba0c998c2f + v_edit_connec_decaeb94_529d_4842_9e89_33c065483403 + v_edit_arc_c8e5e4a7_f9e3_4940_b0b2_40bf55f4c3ca + ve_pol_connec_da965155_3efa_448d_83c5_82ce457fd689 + ve_pol_node_f56fce40_7d46_402c_b62d_87c0348f9226 + v_edit_dimensions20170628134034849 + ext_municipality20171204170633784 + v_ext_streetaxis_4f78944b_a2c1_4f3c_924c_ec36fd045dc7 + v_ext_plot20180201103159443 - + - + - - - + - - - + - - - - + + + + - + - + @@ -33923,28 +34023,28 @@ def my_form_open(dialog, layer, feature): - + - + - + - - - + + + - @@ -33954,17 +34054,17 @@ def my_form_open(dialog, layer, feature): - + - + +proj=utm +zone=31 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs @@ -33978,41 +34078,41 @@ def my_form_open(dialog, layer, feature): - + - + - + From 83779920ad22d27af82ada180bbbd663db42615b Mon Sep 17 00:00:00 2001 From: Albert Bofill Date: Fri, 5 Jul 2024 12:48:29 +0200 Subject: [PATCH 19/22] Minor bug fix on v_edit_node symbology --- resources/templates/qgisproject/en_US/ws_epa.qgs | 2 +- resources/templates/qgisproject/en_US/ws_inventory.qgs | 2 +- resources/templates/qgisproject/en_US/ws_master.qgs | 2 +- resources/templates/qgisproject/en_US/ws_om.qgs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/templates/qgisproject/en_US/ws_epa.qgs b/resources/templates/qgisproject/en_US/ws_epa.qgs index 297d590a9..32a5fbdf2 100644 --- a/resources/templates/qgisproject/en_US/ws_epa.qgs +++ b/resources/templates/qgisproject/en_US/ws_epa.qgs @@ -27858,7 +27858,7 @@ def my_form_open(dialog, layer, feature): - + diff --git a/resources/templates/qgisproject/en_US/ws_inventory.qgs b/resources/templates/qgisproject/en_US/ws_inventory.qgs index b9654735c..2333e8575 100644 --- a/resources/templates/qgisproject/en_US/ws_inventory.qgs +++ b/resources/templates/qgisproject/en_US/ws_inventory.qgs @@ -16021,7 +16021,7 @@ def my_form_open(dialog, layer, feature): - + diff --git a/resources/templates/qgisproject/en_US/ws_master.qgs b/resources/templates/qgisproject/en_US/ws_master.qgs index 17044e33d..8a8f3821d 100644 --- a/resources/templates/qgisproject/en_US/ws_master.qgs +++ b/resources/templates/qgisproject/en_US/ws_master.qgs @@ -28625,7 +28625,7 @@ def my_form_open(dialog, layer, feature): - + diff --git a/resources/templates/qgisproject/en_US/ws_om.qgs b/resources/templates/qgisproject/en_US/ws_om.qgs index 769b06718..fe6d5e76e 100644 --- a/resources/templates/qgisproject/en_US/ws_om.qgs +++ b/resources/templates/qgisproject/en_US/ws_om.qgs @@ -16095,7 +16095,7 @@ def my_form_open(dialog, layer, feature): - + From 9c52d33bf31b9675b1ef0dddd9fc33ef538d70b2 Mon Sep 17 00:00:00 2001 From: "xtorret@bgeo.es" Date: Fri, 5 Jul 2024 20:31:09 +0200 Subject: [PATCH 20/22] Update metadata file --- metadata.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/metadata.txt b/metadata.txt index 53b6ae813..de80a9edd 100644 --- a/metadata.txt +++ b/metadata.txt @@ -10,7 +10,8 @@ author=David Erill, Barbara Rzepka, Sergi Muñoz, Josep Lluís Sala, Edgar Fust Changelog=Version 3.6.011 - Add support for tab visit in Giswater Info - Remove psector_type combobox from psector dialog - - Various bug fixes + - Add combo for feature_type on dimensions dialog [ARC, NODE, CONNEC {GULLY}] + - Several bugs fixed tags= giswater, water networks, sewerage, urban drainage, EPANET, SWMM From 41ebc365eba563083a86fe422bbd4ffe300050cf Mon Sep 17 00:00:00 2001 From: Xavier Torret Date: Fri, 5 Jul 2024 20:32:29 +0200 Subject: [PATCH 21/22] Update metadata.txt --- metadata.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.txt b/metadata.txt index de80a9edd..194ce204a 100644 --- a/metadata.txt +++ b/metadata.txt @@ -10,7 +10,7 @@ author=David Erill, Barbara Rzepka, Sergi Muñoz, Josep Lluís Sala, Edgar Fust Changelog=Version 3.6.011 - Add support for tab visit in Giswater Info - Remove psector_type combobox from psector dialog - - Add combo for feature_type on dimensions dialog [ARC, NODE, CONNEC {GULLY}] + - Add combo for feature_type on dimensions dialog [ARC, NODE, CONNEC {GULLY}] - Several bugs fixed From 8a6d7819f0a053895ec32ab06d1191508ca7ee7a Mon Sep 17 00:00:00 2001 From: edgarfuste <34737125+edgarfuste@users.noreply.github.com> Date: Mon, 8 Jul 2024 15:14:01 +0200 Subject: [PATCH 22/22] Update dbmodel --- dbmodel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbmodel b/dbmodel index c02cad67b..c8c860af0 160000 --- a/dbmodel +++ b/dbmodel @@ -1 +1 @@ -Subproject commit c02cad67ba550041f2ef1420a518c91f008ab1b4 +Subproject commit c8c860af0647934ebbd66ad1109ad530090c0d5f