digsim-logic-simulator 0.3.0__tar.gz → 0.7.0__tar.gz

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/LICENSE.md

@@ -1,6 +1,6 @@
 The Clear BSD License
 
-Copyright (c) 2023, Fredrik Andersson
+Copyright (c) 2023-2024, Fredrik Andersson
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

{digsim-logic-simulator-0.3.0/src/digsim_logic_simulator.egg-info → digsim_logic_simulator-0.7.0}/PKG-INFO

@@ -1,12 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: digsim-logic-simulator
-Version: 0.3.0
+Version: 0.7.0
 Summary: Interactive Digital Logic Simulator
 Author-email: Fredrik Andersson <freand@gmail.com>
 Maintainer-email: Fredrik Andersson <freand@gmail.com>
 License: The Clear BSD License
         
-        Copyright (c) 2023, Fredrik Andersson
+        Copyright (c) 2023-2024, Fredrik Andersson
         All rights reserved.
         
         Redistribution and use in source and binary forms, with or without
@@ -41,20 +41,22 @@ Project-URL: homepage, https://github.com/freand76/digsim
 Keywords: educational,simulation,digital
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
-Requires-Dist: pyvcd>=0.3.0
-Requires-Dist: pyside6>=6.6.0
-Requires-Dist: pexpect==4.8.0
-Requires-Dist: qtawesome
-Requires-Dist: yowasp-yosys==0.36.0.8.post620
+Requires-Dist: pyvcd>=0.4.1
+Requires-Dist: pyside6>=6.9.0
+Requires-Dist: pexpect==4.9.0
+Requires-Dist: pydantic==2.11.4
+Requires-Dist: qtawesome==1.4.0
+Requires-Dist: yowasp-yosys==0.53.0.0.post912
+Dynamic: license-file
 
 # DigSim - Interactive Digital Logic Simulator
 
@@ -135,6 +137,11 @@ Then the following package must be installed:
 > gtkwave sr.vcd
 ```
 
+### Examples of writing pytest/python test benches for synthesized verilog code
+```
+> pytest examples/pytest_tb
+```
+
 ## Yosys synthesis helper tool
 
 ```

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/README.md

@@ -77,6 +77,11 @@ Then the following package must be installed:
 > gtkwave sr.vcd
 ```
 
+### Examples of writing pytest/python test benches for synthesized verilog code
+```
+> pytest examples/pytest_tb
+```
+
 ## Yosys synthesis helper tool
 
 ```

digsim_logic_simulator-0.7.0/pyproject.toml

@@ -0,0 +1,83 @@
+[build-system]
+requires = ["setuptools>=61.0.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "digsim-logic-simulator"
+description = "Interactive Digital Logic Simulator"
+version = "0.7.0"
+authors = [{name = "Fredrik Andersson", email = "freand@gmail.com"}]
+maintainers =  [{name = "Fredrik Andersson", email = "freand@gmail.com"}]
+readme = "README.md"
+license = { file = "LICENSE.md" }
+urls = { homepage = "https://github.com/freand76/digsim" }
+
+classifiers = [
+  "Development Status :: 5 - Production/Stable",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3 :: Only",
+]
+
+requires-python = ">=3.9"
+dependencies = [
+  "pyvcd>=0.4.1",
+  "pyside6>=6.9.0",
+  "pexpect==4.9.0",
+  "pydantic==2.11.4",
+  "qtawesome==1.4.0",
+  "yowasp-yosys==0.53.0.0.post912",
+]
+
+keywords = ["educational", "simulation", "digital"]
+
+[tool.ruff]
+line-length = 99
+target-version = "py39"
+
+show-fixes = true
+output-format = "full"
+
+src = ["src"]
+namespace-packages = ["src/digsim"]
+
+[tool.ruff.lint]
+# "extend" here adds to the ruff defaults, rather than replacing.
+# Q = flake8-quotes, TID = flake8-tidy-imports, I = isort, FA = flake8-future-annotations
+extend-select = ["Q", "TID", "I", "FA"]
+# E501 = "line too long". Handled by black.
+extend-ignore = ["E501"]
+
+[tool.ruff.lint.per-file-ignores]
+"__init__.py" = ["F401"]
+
+[tool.ruff.lint.flake8-tidy-imports]
+ban-relative-imports = "parents"
+
+[tool.ruff.lint.isort]
+lines-after-imports = 2
+
+known-third-party = [
+    "pexpect",
+    "pytest",
+    "pyvcd",
+    "qtawesome",
+    "yowasp-yosys",
+]
+section-order = [
+    "future",
+    "standard-library",
+    "third-party",
+    "PySide6",
+    "pyqtgraph",
+    "first-party",
+    "local-folder",
+]
+
+[tool.ruff.lint.isort.sections]
+"PySide6" = ["PySide6"]
+"pyqtgraph" = ["pyqtgraph"]

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/__init__.py

@@ -1,6 +1,6 @@
 # Copyright (c) Fredrik Andersson, 2023
 # All rights reserved
 
-""" All classes within digsim namespace """
+"""All classes within digsim namespace"""
 
 from .circuit import Circuit  # noqa: F401

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/__main__.py

@@ -1,7 +1,7 @@
 # Copyright (c) Fredrik Andersson, 2023
 # All rights reserved
 
-""" The main class module of the digsim.app namespace """
+"""The main class module of the digsim.app namespace"""
 
 import argparse
 import sys

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/gui/__init__.py

@@ -1,6 +1,6 @@
 # Copyright (c) Fredrik Andersson, 2023
 # All rights reserved
 
-""" All classes within digsim.app.gui namespace """
+"""All classes within digsim.app.gui namespace"""
 
 from ._main_window import MainWindow  # noqa: F401

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/gui/_circuit_area.py

@@ -1,12 +1,8 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2024
 # All rights reserved
 
 """The circuit area and component widget"""
 
-# pylint: disable=unused-argument
-# pylint: disable=useless-parent-delegation
-# pylint: disable=too-few-public-methods
-
 from functools import partial
 
 from PySide6.QtCore import QPoint, QPointF, QRect, QRectF, Qt, QTimer
@@ -23,7 +19,6 @@ from digsim.app.settings import ComponentSettingsDialog
 
 
 class WirePartGraphicsItem(QGraphicsRectItem):
-
     """A part of a wire graphcis item"""
 
     CLOSE_TO_WIRE_MARGIN = 10

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/gui/_component_selection.py

@@ -1,10 +1,8 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2024
 # All rights reserved
 
 """Module for the component selection classes"""
 
-# pylint: disable=too-few-public-methods
-
 from functools import partial
 
 from PySide6.QtCore import QMimeData, QSize, Qt, QTimer

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/gui/_main_window.py

@@ -1,10 +1,8 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2024
 # All rights reserved
 
 """The main window and widgets of the digsim gui application"""
 
-# pylint: disable=too-few-public-methods
-
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QKeySequence, QShortcut
 from PySide6.QtWidgets import (

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/gui/_top_bar.py

@@ -1,11 +1,8 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2024
 # All rights reserved
 
 """The top bar of the main window/gui application"""
 
-# pylint: disable=too-few-public-methods
-# pylint: disable=too-many-instance-attributes
-
 from pathlib import Path
 
 import qtawesome as qta
@@ -262,7 +259,7 @@ class LoadSaveWidget(QFrame):
         self._redo_button.setToolTip("Redo")
         self.layout().addWidget(self._redo_button)
         self._settings_button = QPushButton("", self)
-        self._settings_button.setIcon(qta.icon("fa.cog"))
+        self._settings_button.setIcon(qta.icon("mdi.cog"))
         self._settings_button.clicked.connect(self._settings_dialog)
         self._settings_button.setToolTip("Settings")
         self.layout().addWidget(self._settings_button)

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/gui/_warning_dialog.py

@@ -1,10 +1,8 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2024
 # All rights reserved
 
 """A warning dialog"""
 
-# pylint: disable=too-few-public-methods
-
 from PySide6.QtCore import QSize, Qt
 from PySide6.QtWidgets import (
     QDialog,

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/gui_objects/__init__.py

@@ -1,7 +1,7 @@
 # Copyright (c) Fredrik Andersson, 2023
 # All rights reserved
 
-""" All classes within digsim.app.gui_object namespace """
+"""All classes within digsim.app.gui_object namespace"""
 
 from ._component_object import ComponentObject  # noqa: F401
 from ._gui_object_factory import get_class_by_name as class_factory  # noqa: F401

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/gui_objects/_bus_bit_object.py

@@ -1,7 +1,7 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2024
 # All rights reserved
 
-""" A hexdigit component placed in the GUI """
+"""A hexdigit component placed in the GUI"""
 
 from PySide6.QtCore import QPoint, QSize, Qt
 from PySide6.QtGui import QPen
@@ -9,9 +9,6 @@ from PySide6.QtGui import QPen
 from ._component_object import ComponentObject
 
 
-# pylint: disable=too-many-arguments
-
-
 class BusBitsObject(ComponentObject):
     """The class for a bus/bit component placed in the GUI"""
 

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/gui_objects/_buzzer_object.py

@@ -1,7 +1,7 @@
 # Copyright (c) Fredrik Andersson, 2023
 # All rights reserved
 
-""" A buzzer component object """
+"""A buzzer component object"""
 
 from math import pi, sin
 from struct import pack

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/gui_objects/_component_context_menu.py

@@ -1,7 +1,7 @@
 # Copyright (c) Fredrik Andersson, 2023
 # All rights reserved
 
-""" A component context menu """
+"""A component context menu"""
 
 from PySide6.QtGui import QAction
 from PySide6.QtWidgets import QMenu
@@ -58,7 +58,7 @@ class ComponentContextMenu(QMenu):
         return self._menu_action.text() if self._menu_action is not None else ""
 
     def _delete(self):
-        self._component_object.select(True)
+        self._component_object.setSelected(True)
         self._app_model.objects.delete_selected()
 
     def _raise(self):

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/gui_objects/_component_object.py

@@ -1,12 +1,7 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2024
 # All rights reserved
 
-""" A component placed in the GUI """
-
-# pylint: disable=unused-argument
-# pylint: disable=too-many-public-methods
-# pylint: disable=too-many-instance-attributes
-# pylint: disable=too-many-arguments
+"""A component placed in the GUI"""
 
 import abc
 
@@ -14,6 +9,8 @@ from PySide6.QtCore import QPoint, QRect, QSize, Qt
 from PySide6.QtGui import QFont, QFontMetrics, QPen
 from PySide6.QtWidgets import QGraphicsItem, QGraphicsRectItem
 
+from digsim.storage_model import GuiPositionDataClass
+
 from ._component_context_menu import ComponentContextMenu
 from ._component_port_item import PortGraphicsItem
 
@@ -154,7 +151,7 @@ class ComponentObject(QGraphicsRectItem):
             if port.width == 1:
                 self._port_dict[port]["name"] = port.name()
             else:
-                self._port_dict[port]["name"] = f"{port.name()}[{port.width-1}:0]"
+                self._port_dict[port]["name"] = f"{port.name()}[{port.width - 1}:0]"
             item = PortGraphicsItem(self._app_model, self, port)
             self._port_dict[port]["item"] = item
         self.update_ports()
@@ -370,6 +367,7 @@ class ComponentObject(QGraphicsRectItem):
         """Set zlevel"""
         self.setZValue(level)
 
-    def to_dict(self):
-        """Return position as dict"""
-        return {"x": int(self._save_pos.x()), "y": int(self._save_pos.y()), "z": self.zlevel}
+    def to_gui_dataclass(self):
+        return GuiPositionDataClass(
+            x=int(self._save_pos.x()), y=int(self._save_pos.y()), z=int(self.zlevel)
+        )

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/gui_objects/_component_port_item.py

@@ -1,7 +1,7 @@
 # Copyright (c) Fredrik Andersson, 2023
 # All rights reserved
 
-""" A component port graphics item """
+"""A component port graphics item"""
 
 from PySide6.QtCore import QRect, Qt
 from PySide6.QtGui import QBrush, QPen

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/gui_objects/_dip_switch_object.py

@@ -1,7 +1,7 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2024
 # All rights reserved
 
-""" A hexdigit component placed in the GUI """
+"""A hexdigit component placed in the GUI"""
 
 from PySide6.QtCore import QPoint, QRect, Qt
 from PySide6.QtGui import QFont, QPen
@@ -9,9 +9,6 @@ from PySide6.QtGui import QFont, QPen
 from ._image_objects import ImageObject
 
 
-# pylint: disable=too-many-arguments
-
-
 class DipSwitchObject(ImageObject):
     """The class for a bus/bit component placed in the GUI"""
 

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/gui_objects/_gui_note_object.py

@@ -1,7 +1,7 @@
 # Copyright (c) Fredrik Andersson, 2023
 # All rights reserved
 
-""" A GUI note object """
+"""A GUI note object"""
 
 from PySide6.QtCore import QPoint, QRect, Qt
 from PySide6.QtGui import QFont, QFontMetrics, QPen

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/gui_objects/_gui_object_factory.py

@@ -1,7 +1,7 @@
 # Copyright (c) Fredrik Andersson, 2023
 # All rights reserved
 
-""" A GUI component object factory module """
+"""A GUI component object factory module"""
 
 from digsim.circuit.components.atoms import DigsimException
 

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/gui_objects/_hexdigit_object.py

@@ -1,7 +1,7 @@
 # Copyright (c) Fredrik Andersson, 2023
 # All rights reserved
 
-""" A hexdigit component placed in the GUI """
+"""A hexdigit component placed in the GUI"""
 
 from ._component_object import ComponentObject
 from ._seven_segment_object import SevenSegmentObject
@@ -22,7 +22,7 @@ class HexDigitObject(SevenSegmentObject):
     def setup_size(self):
         """Setup the size of the component"""
         self.digits = self.component.get_digits()
-        str_pixels_w, _ = self.get_string_metrics(f"val[{4*self.digits-1}:0]")
+        str_pixels_w, _ = self.get_string_metrics(f"val[{4 * self.digits - 1}:0]")
         self.digit_left = self.inport_x_pos() + str_pixels_w + self.PORT_TO_RECT_MARGIN
         self.digit_top = self.RECT_TO_DIGIT_RECT_MARGIN
         self.width = (

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/gui_objects/_image_objects.py

@@ -1,9 +1,7 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2024
 # All rights reserved
 
-""" A component with an image as symbol the GUI """
-
-# pylint: disable=too-many-arguments
+"""A component with an image as symbol the GUI"""
 
 from pathlib import Path
 

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/gui_objects/_label_object.py

@@ -1,7 +1,7 @@
 # Copyright (c) Fredrik Andersson, 2023
 # All rights reserved
 
-""" A label component placed in the GUI """
+"""A label component placed in the GUI"""
 
 from PySide6.QtCore import QPoint, QRect, Qt
 from PySide6.QtGui import QPen, QPolygon

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/gui_objects/_logic_analyzer_object.py

@@ -1,7 +1,7 @@
 # Copyright (c) Fredrik Andersson, 2023
 # All rights reserved
 
-""" A Logic Analyzer component placed in the GUI """
+"""A Logic Analyzer component placed in the GUI"""
 
 from PySide6.QtCore import QPoint, QRect, Qt
 from PySide6.QtGui import QPainterPath, QPen
@@ -23,7 +23,6 @@ class LogicAnalyzerObject(ImageObject):
         self.update_ports()
 
     def paint_component(self, painter):
-
         self.paint_component_base(painter)
         painter.setBrush(Qt.SolidPattern)
         painter.setBrush(Qt.black)

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/gui_objects/_seven_segment_object.py

@@ -1,9 +1,7 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2024
 # All rights reserved
 
-""" A 7-segment component placed in the GUI """
-
-# pylint: disable=too-many-arguments
+"""A 7-segment component placed in the GUI"""
 
 from PySide6.QtCore import QPoint, Qt
 from PySide6.QtGui import QPainterPath

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/gui_objects/_shortcut_objects.py

@@ -1,9 +1,7 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2024
 # All rights reserved
 
-""" A button component with an image as symbol the GUI """
-
-# pylint: disable=too-few-public-methods
+"""A button component with an image as symbol the GUI"""
 
 from functools import partial
 

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/gui_objects/_yosys_object.py

@@ -1,7 +1,7 @@
 # Copyright (c) Fredrik Andersson, 2023
 # All rights reserved
 
-""" A yosys component with an image as symbol the GUI """
+"""A yosys component with an image as symbol the GUI"""
 
 from PySide6.QtGui import QAction
 

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/model/__init__.py

@@ -1,6 +1,6 @@
 # Copyright (c) Fredrik Andersson, 2023
 # All rights reserved
 
-""" All classes within digsim.app.model namespace """
+"""All classes within digsim.app.model namespace"""
 
 from ._model import AppModel  # noqa: F401

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/model/_model.py

@@ -1,11 +1,8 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2024
 # All rights reserved
 
-""" An application model for a GUI simulated circuit """
+"""An application model for a GUI simulated circuit"""
 
-# pylint: disable=too-many-instance-attributes
-
-import json
 import queue
 import time
 from pathlib import Path
@@ -14,6 +11,7 @@ from PySide6.QtCore import QThread, Signal
 
 from digsim.app.gui_objects import ComponentObject
 from digsim.circuit.components.atoms import Component
+from digsim.storage_model import AppFileDataClass
 
 from ._model_objects import ModelObjects
 from ._model_settings import ModelSettings
@@ -157,28 +155,27 @@ class AppModel(QThread):
     def save_circuit(self, path):
         """Save the circuit with GUI information"""
         circuit_folder = str(Path(path).parent)
-        circuit_dict = self.objects.circuit_to_dict(circuit_folder)
-        shortcuts_dict = self.shortcuts.to_dict()
-        circuit_dict.update(shortcuts_dict)
-        settings_dict = self.settings.to_dict()
-        circuit_dict.update(settings_dict)
-        json_object = json.dumps(circuit_dict, indent=4)
-        with open(path, mode="w", encoding="utf-8") as json_file:
-            json_file.write(json_object)
+        model_dataclass = self.objects.circuit_to_model(circuit_folder)
+        appfile_dataclass = AppFileDataClass(
+            circuit=model_dataclass.circuit,
+            gui=model_dataclass.gui,
+            shortcuts=self.shortcuts.to_dict(),
+            settings=self.settings.get_all(),
+        )
+        appfile_dataclass.save(path)
         self._changed = False
         self.sig_control_notify.emit()
 
     def load_circuit(self, path):
         """Load a circuit with GUI information"""
         self._model_clear()
-        with open(path, mode="r", encoding="utf-8") as json_file:
-            circuit_dict = json.load(json_file)
+        app_file_dc = AppFileDataClass.load(path)
         circuit_folder = str(Path(path).parent)
         if len(circuit_folder) == 0:
             circuit_folder = "."
-        exception_str_list = self.objects.dict_to_circuit(circuit_dict, circuit_folder)
-        self.shortcuts.from_dict(circuit_dict)
-        self.settings.from_dict(circuit_dict)
+        exception_str_list = self.objects.model_to_circuit(app_file_dc, circuit_folder)
+        self.shortcuts.from_dict(app_file_dc.shortcuts)
+        self.settings.from_dict(app_file_dc.settings)
         self.model_init()
         self._changed = False
         self.objects.reset_undo_stack()

{digsim-logic-simulator-0.3.0 → digsim_logic_simulator-0.7.0}/src/digsim/app/model/_model_components.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2024
 # All rights reserved
 
 """Handle component objects in the model"""
@@ -7,6 +7,7 @@ import digsim.circuit.components
 from digsim.app.gui_objects import ComponentObject
 from digsim.circuit.components import Buzzer
 from digsim.circuit.components.atoms import CallbackComponent
+from digsim.storage_model import GuiPositionDataClass
 
 
 class ModelComponents:
@@ -149,20 +150,16 @@ class ModelComponents:
         self._circuit.delete_component(component_object.component)
         self._app_model.sig_delete_component.emit(component_object)
 
-    def create_from_dict(self, circuit_dict):
+    def add_gui_positions(self, gui_dc_dict):
         """Create model components from circuit_dict"""
         for comp in self._circuit.get_toplevel_components():
-            gui_dict = circuit_dict.get("gui", {})
-            component_dict = gui_dict.get(comp.name(), {})
-            x = component_dict.get("x", 100)
-            y = component_dict.get("y", 100)
-            z = component_dict.get("z", 0)
-            component_object = self._add_object(comp, x, y)
-            component_object.zlevel = z
-
-    def get_circuit_dict(self):
-        """Create model components dict"""
-        model_components_dict = {"gui": {}}
+            gui_dc = gui_dc_dict.get(comp.name(), GuiPositionDataClass())
+            component_object = self._add_object(comp, gui_dc.x, gui_dc.y)
+            component_object.zlevel = gui_dc.z
+
+    def get_gui_dict(self):
+        """Return gui dict from component objects"""
+        gui_dict = {}
         for comp, comp_object in self.get_dict().items():
-            model_components_dict["gui"][comp.name()] = comp_object.to_dict()
-        return model_components_dict
+            gui_dict[comp.name()] = comp_object.to_gui_dataclass()
+        return gui_dict