Moving items in the graph

src/bedit_gui/documents/document.py

@@ -10,13 +10,14 @@ from bedit_core.models import ID, Component, ComponentID, GraphImplementation, P
 from bedit_core.models import Document as CoreDocument
 from bedit_gui.commands.change_icon_command import ChangeIconCommand
 from bedit_gui.commands.equation_text_command import ChangeEquationTextCommand
+from bedit_gui.commands.graph_position_command import MoveGraphComponentCommand
 from bedit_gui.commands.port_commands import AddPortCommand, ChangePortCommand, RemovePortCommand
 from bedit_gui.commands.param_commands import AddParamCommand, ChangeParamCommand, RemoveParamCommand
 from bedit_gui.commands.rename_component_command import RenameComponentCommand
 from bedit_gui.commands.rename_document_command import RenameDocumentCommand
 from bedit_gui.commands.simulation_database_command import ChangeSimulationDatabaseCommand
 from bedit_gui.commands.component_command import AddEmptyEquationComponent, AddEmptyGraphComponent, DeleteComponent, PasteComponents
-from bedit_gui.models import GraphDatabase, Icon, IconDatabase, Simulation, SimulationDatabase
+from bedit_gui.models import Graph, GraphDatabase, Icon, IconDatabase, Simulation, SimulationDatabase
 from bedit_gui.services import document_files
 
 
@@ -29,6 +30,7 @@ class Document(QObject):
     icon_changed = Signal(object, object)
     equation_text_changed = Signal(object, str)
     simulation_database_changed = Signal(object)
+    graph_component_position_changed = Signal(object, object, object)
 
     def __init__(self, parent: QObject | None = None) -> None:
         super().__init__(parent)
@@ -122,12 +124,44 @@ class Document(QObject):
         return self.stored_component_icon(component_id) or Icon()
 
     def graph_database(self) -> GraphDatabase:
+        database = self._graph_database(False)
+        return deepcopy(database) if database is not None else GraphDatabase()
+
+    def move_graph_component(self, graph_component: Component, component_id: ComponentID, position: tuple[int, int]) -> None:
+        graph_id = self.component_id(graph_component)
+        database = self._graph_database(False)
+        graph = database.graphs.get(graph_id) if database is not None else None
+        if graph is None or graph.component_positions.get(component_id) != position:
+            self.undo_stack.push(MoveGraphComponentCommand(self, graph_id, component_id, position))
+
+    def _set_graph_component_position(self, graph_id: ComponentID, component_id: ComponentID, position: tuple[int, int] | None) -> None:
+        if position is None:
+            database = self._graph_database(False)
+            graph = database.graphs.get(graph_id) if database is not None else None
+            if graph is not None:
+                graph.component_positions.pop(component_id, None)
+        else:
+            database = self._graph_database(True)
+            graph = database.graphs.setdefault(graph_id, Graph())
+            graph.component_positions[component_id] = position
+        self.graph_component_position_changed.emit(graph_id, component_id, position)
+
+    def _graph_database(self, create: bool) -> GraphDatabase | None:
         metadata = self.model.metadata
         value = metadata.get("graph_database") if metadata is not None else None
         if isinstance(value, dict):
             value = GraphDatabase.from_data(value)
             metadata["graph_database"] = value
-        return deepcopy(value) if isinstance(value, GraphDatabase) else GraphDatabase()
+        if isinstance(value, GraphDatabase):
+            return value
+        if not create:
+            return None
+        if metadata is None:
+            metadata = {}
+            self.model.metadata = metadata
+        database = GraphDatabase()
+        metadata["graph_database"] = database
+        return database
 
     def change_icon(self, component_id: ComponentID, icon: Icon) -> None:
         self.undo_stack.push(ChangeIconCommand(self, component_id, icon))