digsim-logic-simulator 0.3.0__py3-none-any.whl → 0.5.0__py3-none-any.whl

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/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/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/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/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/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/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

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/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/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/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/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/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
 
@@ -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/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/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/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/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/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

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/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/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/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/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/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/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/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/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

digsim/app/model/_model_objects.py

@@ -1,12 +1,11 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2024
 # All rights reserved
 
 """Handle objects in the model"""
 
-# pylint: disable=too-many-public-methods
-
 from digsim.circuit import Circuit
 from digsim.circuit.components.atoms import DigsimException
+from digsim.storage_model import AppFileDataClass, ModelDataClass
 
 from ._model_components import ModelComponents
 from ._model_new_wire import NewWire
@@ -74,32 +73,37 @@ class ModelObjects:
             self._app_model.model_changed()
         self._app_model.sig_delete_wires.emit()
 
-    def circuit_to_dict(self, circuit_folder):
-        """Convert circuit and objects to dict"""
-        circuit_dict = self.circuit.to_dict(circuit_folder)
-        model_components_dict = self.components.get_circuit_dict()
-        circuit_dict.update(model_components_dict)
-        return circuit_dict
+    def model_to_circuit(self, model_dc, circuit_folder):
+        if isinstance(model_dc, AppFileDataClass):
+            # Loaded model
+            dc = ModelDataClass.from_app_file_dc(model_dc)
+        else:
+            dc = model_dc
 
-    def dict_to_circuit(self, circuit_dict, circuit_folder):
-        """Convert dict to circuit and objects"""
-        exception_str_list = []
         try:
-            exception_str_list = self.circuit.from_dict(
-                circuit_dict, circuit_folder, component_exceptions=False, connect_exceptions=False
+            # Create circuit
+            exception_str_list = self.circuit.from_dataclass(
+                dc.circuit,
+                circuit_folder,
+                component_exceptions=False,
+                connect_exceptions=False,
             )
+            # Add component positions
+            self.components.add_gui_positions(dc.gui)
         except DigsimException as exc:
             self.sig_error.emit(f"Circuit error: {str(exc)}")
             return exception_str_list
-
-        # Create GUI components
-        self.components.create_from_dict(circuit_dict)
-
         return exception_str_list
 
-    def _restore_state(self, state):
+    def circuit_to_model(self, circuit_folder):
+        model_dc = ModelDataClass(
+            circuit=self.circuit.to_dataclass(circuit_folder), gui=self.components.get_gui_dict()
+        )
+        return model_dc
+
+    def _restore_state(self, model_dc):
         self.clear()
-        exception_str_list = self.dict_to_circuit(state, "/")
+        exception_str_list = self.model_to_circuit(model_dc, None)
         self._app_model.model_init()
         self._app_model.model_changed()
         if len(exception_str_list) > 0:
@@ -113,7 +117,7 @@ class ModelObjects:
 
     def push_undo_state(self, clear_redo_stack=True):
         """Push undo state to stack"""
-        self._undo_stack.append(self.circuit_to_dict("/"))
+        self._undo_stack.append(self.circuit_to_model("/"))
         if clear_redo_stack:
             self._redo_stack = []
             self._app_model.sig_control_notify.emit()
@@ -126,14 +130,14 @@ class ModelObjects:
 
     def push_redo_state(self):
         """Push redo state to stack"""
-        self._redo_stack.append(self.circuit_to_dict("/"))
+        self._redo_stack.append(self.circuit_to_model("/"))
 
     def undo(self):
         """Undo to last saved state"""
         if len(self._undo_stack) > 0:
             self.push_redo_state()
-            state = self._undo_stack.pop()
-            self._restore_state(state)
+            model_dc = self._undo_stack.pop()
+            self._restore_state(model_dc)
             self._app_model.sig_control_notify.emit()
             self._app_model.sig_synchronize_gui.emit()
 
@@ -141,8 +145,8 @@ class ModelObjects:
         """Undo to last saved state"""
         if len(self._redo_stack) > 0:
             self.push_undo_state(clear_redo_stack=False)
-            state = self._redo_stack.pop()
-            self._restore_state(state)
+            model_dc = self._redo_stack.pop()
+            self._restore_state(model_dc)
             self._app_model.sig_control_notify.emit()
             self._app_model.sig_synchronize_gui.emit()
 

digsim/app/model/_model_settings.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2024
 # All rights reserved
 
 """Handle settings in the model"""
@@ -25,10 +25,6 @@ class ModelSettings:
         """Return settings dict"""
         return self._settings
 
-    def to_dict(self):
-        """Return settings dict to save"""
-        return {"settings": self._settings}
-
     def from_dict(self, circuit_dict):
         """Get settings from circuit dict"""
         for key, data in circuit_dict.get("settings", {}).items():

digsim/app/model/_model_shortcuts.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2024
 # All rights reserved
 
 """Handle shortcuts in the model"""
@@ -72,9 +72,9 @@ class ModelShortcuts:
 
     def to_dict(self):
         """Generate dict from shortcuts"""
-        shortcuts_dict = {"shortcuts": {}}
+        shortcuts_dict = {}
         for key, component in self._shortcut_component.items():
-            shortcuts_dict["shortcuts"][key] = component.name()
+            shortcuts_dict[key] = component.name()
         return shortcuts_dict
 
     def from_dict(self, model_dict):

digsim/app/settings/__init__.py

@@ -1,7 +1,7 @@
 # Copyright (c) Fredrik Andersson, 2023
 # All rights reserved
 
-""" All classes within digsim.app.settings namespace """
+"""All classes within digsim.app.settings namespace"""
 
 from ._component_settings import ComponentSettingsDialog  # noqa: F401
 from ._gui_settings import GuiSettingsDialog  # noqa: F401

digsim/app/settings/_component_settings.py

@@ -1,10 +1,8 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2024
 # All rights reserved
 
 """The component settings dialog(s)"""
 
-# pylint: disable=too-many-branches
-
 import pathlib
 
 from PySide6.QtCore import Qt, Signal
@@ -360,9 +358,9 @@ class ComponentSettingsDialog(QDialog):
                 widget = ComponentSettingsCheckBoxWidthBool(
                     self, parameter, parameter_dict, self._settings
                 )
-            elif parameter_dict["type"] == int:
+            elif parameter_dict["type"] == "int":
                 widget = ComponentSettingsSlider(self, parameter, parameter_dict, self._settings)
-            elif parameter_dict["type"] == str:
+            elif parameter_dict["type"] == "str":
                 single_line = parameter_dict.get("single_line", False)
                 if single_line:
                     widget = ComponentSettingSingleLineText(
@@ -370,7 +368,7 @@ class ComponentSettingsDialog(QDialog):
                     )
                 else:
                     widget = ComponentSettingText(self, parameter, parameter_dict, self._settings)
-            elif parameter_dict["type"] == bool:
+            elif parameter_dict["type"] == "bool":
                 widget = ComponentSettingsCheckBox(self, parameter, parameter_dict, self._settings)
             elif parameter_dict["type"] == "intrange":
                 widget = ComponentSettingsIntRangeSlider(
@@ -384,7 +382,7 @@ class ComponentSettingsDialog(QDialog):
                 widget = ComponentSettingsNameSelector(
                     self, parameter, parameter_dict, self._settings
                 )
-            elif parameter_dict["type"] == list:
+            elif parameter_dict["type"] == "list":
                 widget = ComponentSettingsListSelector(
                     self, parameter, parameter_dict, self._settings
                 )