Skip to content

Commit

Permalink
Work on schema 219 implementation.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ldebek
ldebek committed Apr 5, 2024
1 parent cb4103c commit aa4f6c7
Show file tree
Hide file tree
Showing 5 changed files with 513 additions and 184 deletions.
2 changes: 1 addition & 1 deletion HISTORY.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ History
1.10 (unreleased)
-----------------

- Fixes/enhancements: #191
- Fixes/enhancements: #188, #191


1.9 (2024-03-14)
Expand Down
63 changes: 41 additions & 22 deletions threedi_schematisation_editor/forms/custom_forms.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
optional_type,
setup_cross_section_widgets,
setup_friction_and_vegetation_widgets,
setup_cross_section_definition_widgets,
)

field_types_widgets = MappingProxyType(
Expand Down Expand Up @@ -152,9 +153,11 @@ def toggle_edit_mode(self):
widget.setEnabled(editing_active)
if hasattr(self, "cross_section_shape"):
setup_cross_section_widgets(self, self.cross_section_shape, self.cross_section_prefix)
friction_type = self.dialog.findChild(QObject, "friction_type")
if friction_type is not None:
setup_friction_and_vegetation_widgets(self, self.cross_section_shape, friction_type)
if self.MODEL in [dm.CrossSectionLocation, dm.Channel]:
friction_type = self.dialog.findChild(QObject, "friction_type")
setup_friction_and_vegetation_widgets(
self, self.cross_section_shape, friction_type, self.cross_section_prefix
)

def populate_widgets(self, data_model_cls=None, feature=None, start_end_modifier=None):
"""
Expand Down Expand Up @@ -452,9 +455,9 @@ def setup_cross_section_table_widgets(self):
self.custom_widgets[xs_table_add] = self.cross_section_table_add
self.custom_widgets[xs_table_delete] = self.cross_section_table_delete
self.custom_widgets[xs_table_paste] = self.cross_section_table_paste
if self.MODEL == dm.CrossSectionLocation:
xs_friction = "cross_section_friction_widget"
xs_vegetation = "cross_section_vegetation_widget"
if self.MODEL in [dm.CrossSectionLocation, dm.Channel]:
xs_friction = f"{self.cross_section_prefix}cross_section_friction_widget"
xs_vegetation = f"{self.cross_section_prefix}cross_section_vegetation_widget"
self.cross_section_friction = self.dialog.findChild(QTableWidget, xs_friction)
self.cross_section_vegetation = self.dialog.findChild(QTableWidget, xs_vegetation)
self.custom_widgets[xs_friction] = self.cross_section_friction
Expand All @@ -464,9 +467,11 @@ def setup_form_widgets(self):
"""Setting up all form widgets."""
super().setup_form_widgets()
setup_cross_section_widgets(self, self.cross_section_shape, self.cross_section_prefix)
friction_type = self.dialog.findChild(QObject, "friction_type")
if friction_type is not None:
setup_friction_and_vegetation_widgets(self, self.cross_section_shape, friction_type)
friction_type = self.dialog.findChild(QObject, f"{self.cross_section_prefix}friction_type")
if self.MODEL in [dm.CrossSectionLocation, dm.Channel]:
setup_friction_and_vegetation_widgets(
self, self.cross_section_shape, friction_type, self.cross_section_prefix
)

def connect_custom_widgets(self):
"""Connect other widgets."""
Expand All @@ -492,7 +497,7 @@ def connect_custom_widgets(self):
paste_slot = self.paste_table_rows
connect_signal(paste_signal, paste_slot)
self.dialog.active_form_signals.add((paste_signal, paste_slot))
if self.MODEL == dm.CrossSectionLocation:
if self.MODEL in [dm.CrossSectionLocation, dm.Channel]:
cross_section_friction_edit_signal = self.cross_section_friction.cellChanged
cross_section_vegetation_edit_signal = self.cross_section_vegetation.cellChanged
cross_section_friction_edit_slot = partial(self.edit_table_row, "cross_section_friction_table")
Expand Down Expand Up @@ -573,7 +578,7 @@ def add_table_row(self):
else:
last_row_number = self.cross_section_table.rowCount()
self.cross_section_table.insertRow(last_row_number)
if self.MODEL == dm.CrossSectionLocation:
if self.MODEL in [dm.CrossSectionLocation, dm.Channel]:
self.cross_section_friction.insertRow(last_row_number)
self.cross_section_vegetation.insertRow(last_row_number)

Expand All @@ -582,11 +587,11 @@ def delete_table_rows(self):
selected_rows = {idx.row() for idx in self.cross_section_table.selectedIndexes()}
for row in sorted(selected_rows, reverse=True):
self.cross_section_table.removeRow(row)
if self.MODEL == dm.CrossSectionLocation:
if self.MODEL in [dm.CrossSectionLocation, dm.Channel]:
self.cross_section_friction.removeRow(row)
self.cross_section_vegetation.removeRow(row)
self.save_cross_section_table_edits()
if self.MODEL == dm.CrossSectionLocation:
if self.MODEL in [dm.CrossSectionLocation, dm.Channel]:
self.save_cross_section_table_edits("cross_section_friction_table")
self.save_cross_section_table_edits("cross_section_vegetation_table")

Expand All @@ -606,7 +611,7 @@ def paste_table_rows(self):
self.cross_section_table.insertRow(last_row_num)
self.cross_section_table.setItem(last_row_num, 0, QTableWidgetItem(height_str))
self.cross_section_table.setItem(last_row_num, 1, QTableWidgetItem(width_str))
if self.MODEL == dm.CrossSectionLocation:
if self.MODEL in [dm.CrossSectionLocation, dm.Channel]:
self.cross_section_friction.insertRow(last_row_num)
self.cross_section_vegetation.insertRow(last_row_num)
last_row_num += 1
Expand Down Expand Up @@ -655,12 +660,26 @@ def populate_with_extra_widgets(self):

def activate_field_based_conditions(self):
"""Activate filed based conditions."""
widget = self.dialog.findChild(QObject, f"{self.cross_section_prefix}cross_section_shape")
if widget is not None:
edit_signal = self.get_widget_editing_signal(widget)
edit_slot = partial(setup_cross_section_widgets, self, widget, self.cross_section_prefix)
connect_signal(edit_signal, edit_slot)
self.dialog.active_form_signals.add((edit_signal, edit_slot))
shape_widget = self.dialog.findChild(QObject, f"{self.cross_section_prefix}cross_section_shape")
friction_widget = self.dialog.findChild(QObject, f"{self.cross_section_prefix}friction_type")
if shape_widget is not None:
shape_edit_signal = self.get_widget_editing_signal(shape_widget)
shape_edit_slot = partial(
setup_cross_section_definition_widgets, self, shape_widget, friction_widget, self.cross_section_prefix
)
connect_signal(shape_edit_signal, shape_edit_slot)
self.dialog.active_form_signals.add((shape_edit_signal, shape_edit_slot))
if friction_widget is not None:
friction_edit_signal = self.get_widget_editing_signal(friction_widget)
friction_edit_slot = partial(
setup_friction_and_vegetation_widgets,
self,
shape_widget,
friction_widget,
self.cross_section_prefix,
)
connect_signal(friction_edit_signal, friction_edit_slot)
self.dialog.active_form_signals.add((friction_edit_signal, friction_edit_slot))


class FormWithNode(BaseForm):
Expand Down Expand Up @@ -1458,8 +1477,8 @@ def fill_related_attributes(self):
"cross_section_width",
"cross_section_height",
"cross_section_table",
"cross_section_friction",
"cross_section_vegetation",
"cross_section_friction_table",
"cross_section_vegetation_table",
]:
self.feature[xs_field_name] = closest_existing_cross_section[xs_field_name]
try:
Expand Down
Loading

0 comments on commit aa4f6c7

Please sign in to comment.