Reset View (#77)

* intermediate

* syncing visibility

* misc

* more sensible resizing

Author: PaulJonasJost

src/petab_gui/controllers/mother_controller.py

@@ -162,26 +162,8 @@ def setup_connections(self):
         self.model.sbml.something_changed.connect(
             self.unsaved_changes_change
         )
-        # correctly update the visibility even when "x" is clicked in a dock
-        self.view.measurement_dock.visibilityChanged.connect(
-            lambda visible: self.actions["show_measurement"].setChecked(
-                visible)
-        )
-        self.view.observable_dock.visibilityChanged.connect(
-            lambda visible: self.actions["show_observable"].setChecked(visible)
-        )
-        self.view.parameter_dock.visibilityChanged.connect(
-            lambda visible: self.actions["show_parameter"].setChecked(visible)
-        )
-        self.view.condition_dock.visibilityChanged.connect(
-            lambda visible: self.actions["show_condition"].setChecked(visible)
-        )
-        self.view.logger_dock.visibilityChanged.connect(
-            lambda visible: self.actions["show_logger"].setChecked(visible)
-        )
-        self.view.plot_dock.visibilityChanged.connect(
-            lambda visible: self.actions["show_plot"].setChecked(visible)
-        )
+        # Visibility
+        self.sync_visibility_with_actions()
         # Recent Files
         self.recent_files_manager.open_file.connect(
             partial(self.open_file, mode="overwrite")
@@ -342,23 +324,12 @@ def setup_actions(self):
         actions["show_plot"].setCheckable(True)
         actions["show_plot"].setChecked(True)
         # connect actions
-        actions["show_measurement"].toggled.connect(
-            lambda checked: self.view.measurement_dock.setVisible(checked)
-        )
-        actions["show_observable"].toggled.connect(
-            lambda checked: self.view.observable_dock.setVisible(checked)
-        )
-        actions["show_parameter"].toggled.connect(
-            lambda checked: self.view.parameter_dock.setVisible(checked)
+        actions["reset_view"] = QAction(
+            qta.icon("mdi6.view-grid-plus"),
+            "Reset View", self.view
         )
-        actions["show_condition"].toggled.connect(
-            lambda checked: self.view.condition_dock.setVisible(checked)
-        )
-        actions["show_logger"].toggled.connect(
-            lambda checked: self.view.logger_dock.setVisible(checked)
-        )
-        actions["show_plot"].toggled.connect(
-            lambda checked: self.view.plot_dock.setVisible(checked)
+        actions["reset_view"].triggered.connect(
+            self.view.default_view
         )
         # Clear Log
         actions["clear_log"] = QAction(
@@ -381,6 +352,30 @@ def setup_actions(self):
 
         return actions
 
+    def sync_visibility_with_actions(self):
+        """Sync dock visibility and QAction states in both directions."""
+
+        dock_map = {
+            "measurement": self.view.measurement_dock,
+            "observable": self.view.observable_dock,
+            "parameter": self.view.parameter_dock,
+            "condition": self.view.condition_dock,
+            "logger": self.view.logger_dock,
+            "plot": self.view.plot_dock,
+        }
+
+        for key, dock in dock_map.items():
+            action = self.actions[f"show_{key}"]
+
+            # Initial sync: block signal to avoid triggering unwanted visibility changes
+            was_blocked = action.blockSignals(True)
+            action.setChecked(dock.isVisible())
+            action.blockSignals(was_blocked)
+
+            # Connect QAction ↔ DockWidget syncing
+            action.toggled.connect(dock.setVisible)
+            dock.visibilityChanged.connect(action.setChecked)
+
     def save_model(self):
         options = QFileDialog.Options()
         file_name, _ = QFileDialog.getSaveFileName(

src/petab_gui/views/main_view.py

@@ -46,38 +46,6 @@ def __init__(self):
         self.logger_dock.setWidget(self.logger_views[1])
         self.plot_dock = MeasuremenPlotter(self)
 
-        # Add docks to the QMainWindow of the data tab
-        self.data_tab.addDockWidget(
-            Qt.TopDockWidgetArea,
-            self.measurement_dock
-        )
-        self.data_tab.splitDockWidget(
-            self.measurement_dock, self.parameter_dock, Qt.Orientation.Vertical
-        )
-        self.data_tab.addDockWidget(
-            Qt.TopDockWidgetArea,
-            self.observable_dock
-        )
-        self.data_tab.splitDockWidget(
-            self.observable_dock, self.condition_dock, Qt.Orientation.Vertical
-        )
-        self.data_tab.addDockWidget(
-            Qt.BottomDockWidgetArea,
-            self.logger_dock
-        )
-        self.data_tab.addDockWidget(
-            Qt.BottomDockWidgetArea,
-            self.plot_dock
-        )
-        self.data_tab.tabifyDockWidget(self.plot_dock, self.logger_dock)
-        # TODO: Needs better initial sizing. @Frank can you help?
-        self.data_tab.resizeDocks(
-            [self.logger_dock, self.measurement_dock],
-            [self.height() * 0.15, self.height() * 0.3],
-            Qt.Vertical
-        )
-
-
         # Connect the visibility changes of the QDockWidget instances to a slot that saves their visibility status
         self.dock_visibility = {
             self.condition_dock: self.condition_dock.isVisible(),
@@ -87,6 +55,7 @@ def __init__(self):
             self.logger_dock: self.logger_dock.isVisible(),
             self.plot_dock: self.plot_dock.isVisible(),
         }
+        self.default_view()
         self.condition_dock.visibilityChanged.connect(
             self.save_dock_visibility
         )
@@ -120,6 +89,49 @@ def __init__(self):
 
         self.find_replace_bar = None
 
+    def default_view(self):
+        """Reset the view to a fixed 3x2 grid using manual geometry."""
+        if hasattr(self, "dock_visibility"):
+            for dock in self.dock_visibility:
+                dock.setParent(None)  # fully remove from layout
+
+        self.tab_widget.setCurrentIndex(0)
+        self.data_tab.updateGeometry()
+        self.data_tab.repaint()
+
+        # Get available geometry
+        available_rect = self.data_tab.contentsRect()
+        width = available_rect.width() // 2
+        height = available_rect.height() // 3
+        x_left = available_rect.left()
+        x_right = x_left + width
+        y_positions = [available_rect.top() + i * height for i in range(3)]
+
+        # Define dock + positions
+        layout = [
+            (self.measurement_dock, x_left, y_positions[0]),
+            (self.parameter_dock, x_left, y_positions[1]),
+            (self.logger_dock, x_left, y_positions[2]),
+            (self.observable_dock, x_right, self.measurement_dock),
+            (self.condition_dock, x_right, self.parameter_dock),
+            (self.plot_dock, x_right, self.logger_dock),
+        ]
+
+        for dock, x, y in layout:
+            area = Qt.LeftDockWidgetArea
+            if x == x_left:
+                self.data_tab.addDockWidget(area, dock)
+                dock.setFloating(True)
+                dock.setGeometry(x, y, width, height)
+                dock.setFloating(False)
+            if x == x_right:
+                self.data_tab.splitDockWidget(
+                    y, dock, Qt.Horizontal
+                )
+
+        if hasattr(self, "dock_visibility"):
+            for dock in self.dock_visibility:
+                dock.setVisible(True)
 
     def dragEnterEvent(self, event):
         if event.mimeData().hasUrls():
@@ -214,7 +226,6 @@ def load_settings(self):
         self.data_tab.restoreGeometry(settings.value("data_tab/geometry"))
         self.data_tab.restoreState(settings.value("data_tab/state"))
 
-
     def save_settings(self):
         """Save the settings to the QSettings object."""
         settings = QSettings("petab", "petab_gui")

src/petab_gui/views/task_bar.py

@@ -106,6 +106,7 @@ def __init__(self, parent, actions):
         self.menu.addAction(actions["show_logger"])
         self.menu.addAction(actions["show_plot"])
         self.menu.addSeparator()
+        self.menu.addAction(actions["reset_view"])
         self.menu.addAction(actions["clear_log"])