Skip to content

Commit 323a51f

Browse files
committed
Project tabs now update properly when changing between domains/non-domains and absorption/non-abs projects
1 parent 1c78edd commit 323a51f

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

Diff for: rascal2/widgets/project/lists.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,9 @@ def __init__(self, init_list: list[str], parent):
261261
self.layer_list = QtWidgets.QListView(parent)
262262
self.layer_list.setModel(self.model)
263263
if parent.model.domains:
264-
self.layer_list.setItemDelegateForColumn(0, ProjectFieldDelegate(parent.project_widget, "domain_contrasts", self))
264+
self.layer_list.setItemDelegateForColumn(
265+
0, ProjectFieldDelegate(parent.project_widget, "domain_contrasts", self)
266+
)
265267
else:
266268
self.layer_list.setItemDelegateForColumn(0, ProjectFieldDelegate(parent.project_widget, "layers", self))
267269
self.layer_list.setDragEnabled(True)

Diff for: rascal2/widgets/project/project.py

+4-9
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,10 @@ def update_project_view(self) -> None:
242242
# because we don't want validation errors going off while editing the model is in-progress
243243
self.draft_project: dict = create_draft_project(self.parent_model.project)
244244

245+
for tab in self.tabs:
246+
self.view_tabs[tab].update_model(self.draft_project)
247+
self.edit_tabs[tab].update_model(self.draft_project)
248+
245249
self.absorption_checkbox.setChecked(self.parent_model.project.absorption)
246250
self.calculation_type.setText(self.parent_model.project.calculation)
247251
self.model_type.setText(self.parent_model.project.model)
@@ -252,10 +256,6 @@ def update_project_view(self) -> None:
252256
self.model_combobox.setCurrentText(self.parent_model.project.model)
253257
self.geometry_combobox.setCurrentText(self.parent_model.project.geometry)
254258

255-
for tab in self.tabs:
256-
self.view_tabs[tab].update_model(self.draft_project)
257-
self.edit_tabs[tab].update_model(self.draft_project)
258-
259259
self.handle_tabs()
260260
self.handle_controls_update()
261261

@@ -460,11 +460,6 @@ def update_model(self, new_model):
460460
table.update_model(classlist)
461461
if self.edit_mode:
462462
table.edit()
463-
if "layers" in self.tables:
464-
self.tables["layers"].set_absorption(new_model["absorption"])
465-
if "contrasts" in self.tables:
466-
self.tables["contrasts"].set_domains(new_model["calculation"] == Calculations.Domains)
467-
468463

469464
def handle_controls_update(self, controls):
470465
"""Reflect changes to the Controls object."""

0 commit comments

Comments
 (0)