Skip to content

Refactor/decompose main window #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gbradham merged 2 commits into from
Mar 10, 2026
Merged

Refactor/decompose main window #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a798bdf
Update gitignore
gbradham Mar 10, 2026
1ac8d07
Decompose massive files
gbradham Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,4 +181,5 @@ CLAUDE.md
*.cpython-313.pyc
*.glider
uv.lock
*.ipynb
*.ipynb
.serena*
81 changes: 44 additions & 37 deletions src/glider/gui/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@
Undo/Redo Command Pattern Implementation for GLIDER.

This module contains command classes for undoable operations in the
node graph editor.
node graph editor. Commands accept a controller object that provides:
- _graph_view: NodeGraphView instance
- _session (property): current ExperimentSession or None
- setup_node_ports(node_item, node_type): set up ports on a node
"""

from typing import TYPE_CHECKING

if TYPE_CHECKING:
from glider.gui.main_window import MainWindow
from glider.gui.panels.node_editor_controller import NodeEditorController


class Command:
Expand All @@ -30,8 +33,10 @@ def description(self) -> str:
class CreateNodeCommand(Command):
"""Command for creating a node."""

def __init__(self, main_window: "MainWindow", node_id: str, node_type: str, x: float, y: float):
self._main_window = main_window
def __init__(
self, controller: "NodeEditorController", node_id: str, node_type: str, x: float, y: float
):
self._controller = controller
self._node_id = node_id
self._node_type = node_type
self._x = x
Expand All @@ -44,9 +49,10 @@ def execute(self) -> None:

def undo(self) -> None:
"""Delete the node."""
self._main_window._graph_view.remove_node(self._node_id)
if self._main_window._core.session:
self._main_window._core.session.remove_node(self._node_id)
self._controller._graph_view.remove_node(self._node_id)
session = self._controller._session
if session:
session.remove_node(self._node_id)

def description(self) -> str:
return f"Create {self._node_type}"
Expand All @@ -55,8 +61,8 @@ def description(self) -> str:
class DeleteNodeCommand(Command):
"""Command for deleting a node."""

def __init__(self, main_window: "MainWindow", node_id: str, node_data: dict):
self._main_window = main_window
def __init__(self, controller: "NodeEditorController", node_id: str, node_data: dict):
self._controller = controller
self._node_id = node_id
self._node_data = node_data # Saved node state for restoration

Expand All @@ -67,13 +73,14 @@ def execute(self) -> None:
def undo(self) -> None:
"""Restore the node."""
data = self._node_data
node_item = self._main_window._graph_view.add_node(
node_item = self._controller._graph_view.add_node(
data["id"], data["node_type"], data["x"], data["y"]
)
self._main_window._setup_node_ports(node_item, data["node_type"])
self._main_window._graph_view._connect_port_signals(node_item)
self._controller.setup_node_ports(node_item, data["node_type"])
self._controller._graph_view._connect_port_signals(node_item)

if self._main_window._core.session:
session = self._controller._session
if session:
from glider.core.experiment_session import NodeConfig

node_config = NodeConfig(
Expand All @@ -84,7 +91,7 @@ def undo(self) -> None:
device_id=data.get("device_id"),
visible_in_runner=data.get("visible_in_runner", False),
)
self._main_window._core.session.add_node(node_config)
session.add_node(node_config)

def description(self) -> str:
return f"Delete {self._node_data.get('node_type', 'node')}"
Expand All @@ -95,14 +102,14 @@ class MoveNodeCommand(Command):

def __init__(
self,
main_window: "MainWindow",
controller: "NodeEditorController",
node_id: str,
old_x: float,
old_y: float,
new_x: float,
new_y: float,
):
self._main_window = main_window
self._controller = controller
self._node_id = node_id
self._old_x = old_x
self._old_y = old_y
Expand All @@ -115,13 +122,12 @@ def execute(self) -> None:

def undo(self) -> None:
"""Move node back to original position."""
node_item = self._main_window._graph_view.nodes.get(self._node_id)
node_item = self._controller._graph_view.nodes.get(self._node_id)
if node_item:
node_item.setPos(self._old_x, self._old_y)
if self._main_window._core.session:
self._main_window._core.session.update_node_position(
self._node_id, self._old_x, self._old_y
)
session = self._controller._session
if session:
session.update_node_position(self._node_id, self._old_x, self._old_y)

def description(self) -> str:
return "Move node"
Expand All @@ -132,15 +138,15 @@ class CreateConnectionCommand(Command):

def __init__(
self,
main_window: "MainWindow",
controller: "NodeEditorController",
conn_id: str,
from_node: str,
from_port: int,
to_node: str,
to_port: int,
conn_type: str,
):
self._main_window = main_window
self._controller = controller
self._conn_id = conn_id
self._from_node = from_node
self._from_port = from_port
Expand All @@ -154,9 +160,10 @@ def execute(self) -> None:

def undo(self) -> None:
"""Remove the connection."""
self._main_window._graph_view.remove_connection(self._conn_id)
if self._main_window._core.session:
self._main_window._core.session.remove_connection(self._conn_id)
self._controller._graph_view.remove_connection(self._conn_id)
session = self._controller._session
if session:
session.remove_connection(self._conn_id)

def description(self) -> str:
return "Create connection"
Expand All @@ -165,8 +172,8 @@ def description(self) -> str:
class DeleteConnectionCommand(Command):
"""Command for deleting a connection."""

def __init__(self, main_window: "MainWindow", conn_id: str, conn_data: dict):
self._main_window = main_window
def __init__(self, controller: "NodeEditorController", conn_id: str, conn_data: dict):
self._controller = controller
self._conn_id = conn_id
self._conn_data = conn_data

Expand All @@ -177,10 +184,11 @@ def execute(self) -> None:
def undo(self) -> None:
"""Restore the connection."""
data = self._conn_data
self._main_window._graph_view.add_connection(
self._controller._graph_view.add_connection(
data["id"], data["from_node"], data["from_port"], data["to_node"], data["to_port"]
)
if self._main_window._core.session:
session = self._controller._session
if session:
from glider.core.experiment_session import ConnectionConfig

conn_config = ConnectionConfig(
Expand All @@ -191,7 +199,7 @@ def undo(self) -> None:
to_input=data["to_port"],
connection_type=data.get("conn_type", "data"),
)
self._main_window._core.session.add_connection(conn_config)
session.add_connection(conn_config)

def description(self) -> str:
return "Delete connection"
Expand All @@ -201,9 +209,9 @@ class PropertyChangeCommand(Command):
"""Command for changing a node property."""

def __init__(
self, main_window: "MainWindow", node_id: str, prop_name: str, old_value, new_value
self, controller: "NodeEditorController", node_id: str, prop_name: str, old_value, new_value
):
self._main_window = main_window
self._controller = controller
self._node_id = node_id
self._prop_name = prop_name
self._old_value = old_value
Expand All @@ -215,10 +223,9 @@ def execute(self) -> None:

def undo(self) -> None:
"""Restore old property value."""
if self._main_window._core.session:
self._main_window._core.session.update_node_state(
self._node_id, {self._prop_name: self._old_value}
)
session = self._controller._session
if session:
session.update_node_state(self._node_id, {self._prop_name: self._old_value})

def description(self) -> str:
return f"Change {self._prop_name}"
Expand Down
Loading
Loading