add possibility to open regulation group as form/dialog from plan feature form dialog

Author: nmaarnio

arho_feature_template/gui/components/plan_regulation_group_widget.py

@@ -6,12 +6,14 @@
 from qgis.core import QgsApplication
 from qgis.PyQt import uic
 from qgis.PyQt.QtCore import pyqtSignal
+from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtWidgets import QWidget
 
 from arho_feature_template.core.models import Proposition, Regulation, RegulationGroup
 from arho_feature_template.gui.components.plan_proposition_widget import PropositionWidget
 from arho_feature_template.gui.components.plan_regulation_widget import RegulationWidget
 from arho_feature_template.project.layers.code_layers import PlanRegulationGroupTypeLayer
+from arho_feature_template.qgis_plugin_tools.tools.resources import resources_path
 
 if TYPE_CHECKING:
     from qgis.PyQt.QtWidgets import QFormLayout, QFrame, QLabel, QLineEdit, QPushButton
@@ -23,9 +25,10 @@
 class RegulationGroupWidget(QWidget, FormClass):  # type: ignore
     """A widget representation of a plan regulation group."""
 
+    open_as_form_signal = pyqtSignal(QWidget)
     delete_signal = pyqtSignal(QWidget)
 
-    def __init__(self, regulation_group_data: RegulationGroup, layer_name: str):
+    def __init__(self, regulation_group: RegulationGroup, layer_name: str):
         super().__init__()
         self.setupUi(self)
 
@@ -34,24 +37,36 @@ def __init__(self, regulation_group_data: RegulationGroup, layer_name: str):
         self.name: QLineEdit
         self.short_name: QLineEdit
         self.short_name_label: QLabel
+        self.edit_btn: QPushButton
         self.del_btn: QPushButton
         self.regulation_group_details_layout: QFormLayout
 
         # INIT
-        self.regulation_group_data = regulation_group_data
-        self.regulation_widgets: list[RegulationWidget] = [
-            self.add_regulation_widget(regulation) for regulation in self.regulation_group_data.regulations
-        ]
-        self.proposition_widgets: list[PropositionWidget] = [
-            self.add_proposition_widget(proposition) for proposition in self.regulation_group_data.propositions
-        ]
-
-        regulation_group_data.type_code_id = PlanRegulationGroupTypeLayer.get_id_by_feature_layer_name(layer_name)
-        self.name.setText(self.regulation_group_data.name if self.regulation_group_data.name else "")
-        self.short_name.setText(self.regulation_group_data.short_name if self.regulation_group_data.short_name else "")
+        self.regulation_widgets: list[RegulationWidget] = []
+        self.proposition_widgets: list[PropositionWidget] = []
+
+        regulation_group.type_code_id = PlanRegulationGroupTypeLayer.get_id_by_feature_layer_name(layer_name)
+        self.from_model(regulation_group)
+
+        self.edit_btn.setIcon(QIcon(resources_path("icons", "settings.svg")))
+        self.edit_btn.clicked.connect(lambda: self.open_as_form_signal.emit(self))
         self.del_btn.setIcon(QgsApplication.getThemeIcon("mActionDeleteSelected.svg"))
         self.del_btn.clicked.connect(lambda: self.delete_signal.emit(self))
 
+    def from_model(self, regulation_group: RegulationGroup):
+        self.regulation_group = regulation_group
+
+        self.name.setText(regulation_group.name if regulation_group.name else "")
+        self.short_name.setText(regulation_group.short_name if regulation_group.short_name else "")
+
+        # Remove existing child widgets if reinitializing
+        for widget in self.regulation_widgets:
+            self.delete_regulation_widget(widget)
+        for widget in self.proposition_widgets:
+            self.delete_proposition_widget(widget)
+        self.regulation_widgets = [self.add_regulation_widget(reg) for reg in regulation_group.regulations]
+        self.proposition_widgets = [self.add_proposition_widget(prop) for prop in regulation_group.propositions]
+
     def add_regulation_widget(self, regulation: Regulation) -> RegulationWidget:
         widget = RegulationWidget(regulation=regulation, parent=self.frame)
         widget.delete_signal.connect(self.delete_regulation_widget)
@@ -76,11 +91,11 @@ def delete_proposition_widget(self, proposition_widget: RegulationWidget):
 
     def into_model(self) -> RegulationGroup:
         return RegulationGroup(
-            type_code_id=self.regulation_group_data.type_code_id,
+            type_code_id=self.regulation_group.type_code_id,
             name=self.name.text(),
             short_name=None if not self.short_name.text() else self.short_name.text(),
-            color_code=self.regulation_group_data.color_code,
+            color_code=self.regulation_group.color_code,
             regulations=[widget.into_model() for widget in self.regulation_widgets],
             propositions=[widget.into_model() for widget in self.proposition_widgets],
-            id_=self.regulation_group_data.id_,
+            id_=self.regulation_group.id_,
         )

arho_feature_template/gui/components/plan_regulation_group_widget.ui

@@ -68,6 +68,28 @@
           </property>
          </spacer>
         </item>
+        <item>
+         <widget class="QPushButton" name="edit_btn">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>30</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="toolTip">
+           <string>Muokkaa kaavamääräysryhmää</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
         <item>
          <widget class="QPushButton" name="del_btn">
           <property name="sizePolicy">
@@ -82,6 +104,9 @@
             <height>16777215</height>
            </size>
           </property>
+          <property name="toolTip">
+           <string>Poista kaavamääräysryhmä</string>
+          </property>
           <property name="text">
            <string/>
           </property>

arho_feature_template/gui/dialogs/plan_attribute_form.py

@@ -19,11 +19,13 @@
 from arho_feature_template.core.models import Plan, RegulationGroup, RegulationGroupLibrary
 from arho_feature_template.gui.components.plan_regulation_group_widget import RegulationGroupWidget
 from arho_feature_template.gui.components.tree_with_search_widget import TreeWithSearchWidget
+from arho_feature_template.gui.dialogs.plan_regulation_group_form import PlanRegulationGroupForm
 from arho_feature_template.project.layers.code_layers import (
     LifeCycleStatusLayer,
     OrganisationLayer,
     PlanTypeLayer,
 )
+from arho_feature_template.utils.misc_utils import disconnect_signal
 
 if TYPE_CHECKING:
     from qgis.PyQt.QtWidgets import QComboBox, QLineEdit, QTextEdit, QVBoxLayout, QWidget
@@ -132,12 +134,20 @@ def add_selected_plan_regulation_group(self, item: QTreeWidgetItem, column: int)
     def add_plan_regulation_group(self, regulation_group: RegulationGroup):
         regulation_group_widget = RegulationGroupWidget(regulation_group, layer_name="Kaava")
         regulation_group_widget.delete_signal.connect(self.remove_plan_regulation_group)
+        regulation_group_widget.open_as_form_signal.connect(self.open_plan_regulation_group_form)
         self._remove_spacer()
         self.plan_regulation_group_scrollarea_contents.layout().addWidget(regulation_group_widget)
         self.regulation_group_widgets.append(regulation_group_widget)
         self._add_spacer()
 
+    def open_plan_regulation_group_form(self, regulation_group_widget: RegulationGroupWidget):
+        group_as_form = PlanRegulationGroupForm(regulation_group_widget.into_model())
+        if group_as_form.exec_():
+            regulation_group_widget.from_model(group_as_form.model)
+
     def remove_plan_regulation_group(self, regulation_group_widget: RegulationGroupWidget):
+        disconnect_signal(regulation_group_widget.delete_signal)
+        disconnect_signal(regulation_group_widget.open_as_form_signal)
         self.plan_regulation_group_scrollarea_contents.layout().removeWidget(regulation_group_widget)
         self.regulation_group_widgets.remove(regulation_group_widget)
         regulation_group_widget.deleteLater()

arho_feature_template/gui/dialogs/plan_feature_form.py

@@ -21,7 +21,9 @@
 from arho_feature_template.core.models import PlanFeature, RegulationGroup
 from arho_feature_template.gui.components.plan_regulation_group_widget import RegulationGroupWidget
 from arho_feature_template.gui.components.tree_with_search_widget import TreeWithSearchWidget
+from arho_feature_template.gui.dialogs.plan_regulation_group_form import PlanRegulationGroupForm
 from arho_feature_template.project.layers.code_layers import UndergroundTypeLayer
+from arho_feature_template.utils.misc_utils import disconnect_signal
 
 if TYPE_CHECKING:
     from qgis.PyQt.QtWidgets import QVBoxLayout, QWidget
@@ -105,12 +107,20 @@ def add_selected_plan_regulation_group(self, item: QTreeWidgetItem, column: int)
     def add_plan_regulation_group(self, definition: RegulationGroup):
         regulation_group_widget = RegulationGroupWidget(definition, cast(str, self.layer_name))
         regulation_group_widget.delete_signal.connect(self.remove_plan_regulation_group)
+        regulation_group_widget.open_as_form_signal.connect(self.open_plan_regulation_group_form)
         self._remove_spacer()
         self.plan_regulation_group_scrollarea_contents.layout().addWidget(regulation_group_widget)
         self.regulation_group_widgets.append(regulation_group_widget)
         self._add_spacer()
 
+    def open_plan_regulation_group_form(self, regulation_group_widget: RegulationGroupWidget):
+        group_as_form = PlanRegulationGroupForm(regulation_group_widget.into_model())
+        if group_as_form.exec_():
+            regulation_group_widget.from_model(group_as_form.model)
+
     def remove_plan_regulation_group(self, regulation_group_widget: RegulationGroupWidget):
+        disconnect_signal(regulation_group_widget.delete_signal)
+        disconnect_signal(regulation_group_widget.open_as_form_signal)
         self.plan_regulation_group_scrollarea_contents.layout().removeWidget(regulation_group_widget)
         self.regulation_group_widgets.remove(regulation_group_widget)
         regulation_group_widget.deleteLater()