digsim-logic-simulator 0.12.0__py3-none-any.whl → 0.14.0__py3-none-any.whl

digsim/app/gui_objects/_shortcut_objects.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023-2024
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """A button component with an image as symbol the GUI"""
@@ -37,6 +37,8 @@ class ButtonObject(ImageObject):
     IMAGE_FILENAME = "images/PB.png"
     BUTTON_RADIUS = 35
 
+    _BUTTON_ACTIVE_PEN = QPen(Qt.green)
+
     def __init__(self, app_model, component, xpos, ypos):
         super().__init__(app_model, component, xpos, ypos)
         self.show_name(False)
@@ -45,9 +47,8 @@ class ButtonObject(ImageObject):
     def paint_component(self, painter):
         super().paint_component(painter)
         if self.component.active:
-            pen = QPen()
+            pen = self._BUTTON_ACTIVE_PEN
             pen.setWidth(4)
-            pen.setColor(Qt.green)
             painter.setPen(pen)
             painter.setBrush(Qt.NoBrush)
             painter.drawEllipse(

digsim/app/gui_objects/_yosys_object.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """A yosys component with an image as symbol the GUI"""

digsim/app/model/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """All classes within digsim.app.model namespace"""

digsim/app/model/_model.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023-2024
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """An application model for a GUI simulated circuit"""
@@ -37,15 +37,18 @@ class AppModel(QThread):
 
     def __init__(self):
         super().__init__()
-        self._model_objects = ModelObjects(self)
-        self._model_shortcuts = ModelShortcuts(self)
-        self._model_settings = ModelSettings(self)
+        self._setup_model_components()
         self._started = False
         self._single_step = False
         self._changed = False
         self._gui_event_queue = queue.Queue()
         self._multi_select = False
 
+    def _setup_model_components(self):
+        self._model_objects = ModelObjects(self)
+        self._model_shortcuts = ModelShortcuts(self)
+        self._model_settings = ModelSettings(self)
+
     @property
     def objects(self):
         """return the model objects"""
@@ -100,6 +103,7 @@ class AppModel(QThread):
     def model_stop(self):
         """Stop model simulation thread"""
         self._started = False
+        self.wait()
 
     def model_reset(self):
         """Reset model simulation"""

digsim/app/model/_model_components.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023-2024
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """Handle component objects in the model"""
@@ -125,10 +125,7 @@ class ModelComponents:
 
     def get_object_list(self):
         """Get list of component objects"""
-        component_objects = []
-        for _, comp in self._component_objects.items():
-            component_objects.append(comp)
-        return component_objects
+        return list(self._component_objects.values())
 
     def update_settings(self, component_object, settings):
         """Update settings for a component"""

digsim/app/model/_model_new_wire.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """Handle new wire object in the model"""
@@ -29,11 +29,12 @@ class NewWire:
 
     def end(self, component, portname):
         """End new wire object"""
-        self._app_model.objects.push_undo_state()
         end_port = component.port(portname)
         if self._start_port.is_output() and end_port.is_input():
+            self._app_model.objects.push_undo_state()
             self._start_port.wire = end_port
         elif self._start_port.is_input() and end_port.is_output():
+            self._app_model.objects.push_undo_state()
             end_port.wire = self._start_port
         else:
             raise PortConnectionError("Cannot connect to port of same type")

digsim/app/model/_model_objects.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023-2024
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """Handle objects in the model"""
@@ -53,11 +53,7 @@ class ModelObjects:
 
     def get_selected(self):
         """Get selected objects"""
-        objects = []
-        for obj in self.get_list():
-            if obj.selected:
-                objects.append(obj)
-        return objects
+        return [obj for obj in self.get_list() if obj.selected]
 
     def _delete(self, selected_objects):
         for obj in selected_objects:

digsim/app/model/_model_settings.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023-2024
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """Handle settings in the model"""
@@ -23,7 +23,7 @@ class ModelSettings:
 
     def get_all(self):
         """Return settings dict"""
-        return self._settings
+        return self._settings.copy()
 
     def from_dict(self, circuit_dict):
         """Get settings from circuit dict"""

digsim/app/model/_model_shortcuts.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023-2024
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """Handle shortcuts in the model"""
@@ -38,20 +38,6 @@ class ModelShortcuts:
         """Get shortcut"""
         return self._shortcut_component.get(key)
 
-    def _qtkey_to_key(self, qt_key):
-        return {
-            Qt.Key_0: "0",
-            Qt.Key_1: "1",
-            Qt.Key_2: "2",
-            Qt.Key_3: "3",
-            Qt.Key_4: "4",
-            Qt.Key_5: "5",
-            Qt.Key_6: "6",
-            Qt.Key_7: "7",
-            Qt.Key_8: "8",
-            Qt.Key_9: "9",
-        }.get(qt_key)
-
     def press(self, qtkey):
         """Handle shortcut keypress"""
         key = self.QT_KEY_TO_KEY.get(qtkey)

digsim/app/settings/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """All classes within digsim.app.settings namespace"""

digsim/app/settings/_component_settings.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023-2024
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """The component settings dialog(s)"""
@@ -271,7 +271,7 @@ class ComponentSettingsCheckBoxWidthBool(ComponentSettingsBase):
             checkbox = QCheckBox(f"bit{checkbox_id}")
             checkbox.setChecked(True)
             checkbox.stateChanged.connect(self._update)
-            self.layout().addWidget(checkbox, checkbox_id % 8, checkbox_id / 8, 1, 1)
+            self.layout().addWidget(checkbox, checkbox_id % 8, checkbox_id // 8, 1, 1)
             self._bit_checkboxes.append(checkbox)
         disable_all = QPushButton("Disable All")
         disable_all.clicked.connect(self._disable_all)

digsim/app/settings/_gui_settings.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023-2024
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """The GUI settings dialog"""

digsim/app/settings/_shortcut_dialog.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023-2024
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """The shurtcut dialog"""
@@ -20,12 +20,11 @@ class ShortcutDialog(QDialog):
         self.layout().addWidget(QLabel("Select shortcut key for component"))
         self._key_selector = QComboBox(parent)
         for key in "1234567890":
-            shortcut_key = str(key)
-            shortcut_string = shortcut_key
-            shortcut_component = app_model.shortcuts.get_component(shortcut_key)
+            shortcut_string = key
+            shortcut_component = app_model.shortcuts.get_component(key)
             if shortcut_component is not None:
                 shortcut_string += f" - {shortcut_component.name()}"
-            self._key_selector.addItem(shortcut_string, userData=shortcut_key)
+            self._key_selector.addItem(shortcut_string, userData=key)
         self.layout().addWidget(self._key_selector)
         self.buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
         self.buttonBox.accepted.connect(self.accept)

digsim/circuit/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """All classes within digsim.circuit namespace"""

digsim/circuit/_circuit.py

@@ -7,13 +7,14 @@ Module that handles the circuit simulation of components
 
 from __future__ import annotations
 
-import os
+import heapq
+import pathlib
 from typing import Tuple
 
 from digsim.storage_model import CircuitDataClass, CircuitFileDataClass
 
 from ._waves_writer import WavesWriter
-from .components.atoms import Component, DigsimException, PortOutDelta
+from .components.atoms import VALUE_TYPE, Component, DigsimException, PortOutDelta
 
 
 class CircuitError(DigsimException):
@@ -26,10 +27,10 @@ class CircuitEvent:
     delta events in the simulation.
     """
 
-    def __init__(self, time_ns: int, port: PortOutDelta, value: int | str | None):
+    def __init__(self, time_ns: int, port: PortOutDelta, value: VALUE_TYPE):
         self._time_ns: int = time_ns
         self._port: PortOutDelta = port
-        self._value: int | str | None = value
+        self._value: VALUE_TYPE = value
 
     @property
     def time_ns(self) -> int:
@@ -42,7 +43,7 @@ class CircuitEvent:
         return self._port
 
     @property
-    def value(self) -> int | str | None:
+    def value(self) -> VALUE_TYPE:
         """Get the delta cycle value of this event"""
         return self._value
 
@@ -50,7 +51,7 @@ class CircuitEvent:
         """Return True if the in the event is the same as"""
         return port == self._port
 
-    def update(self, time_ns: int, value: int | str | None):
+    def update(self, time_ns: int, value: VALUE_TYPE):
         """Update the event with a new time (ns) and a new value"""
         self._time_ns = time_ns
         self._value = value
@@ -58,6 +59,14 @@ class CircuitEvent:
     def __lt__(self, other) -> bool:
         return other.time_ns > self.time_ns
 
+    def __eq__(self, other) -> bool:
+        return (
+            isinstance(other, CircuitEvent)
+            and self._port == other._port
+            and self._time_ns == other._time_ns
+            and self._value == other._value
+        )
+
 
 class Circuit:
     """Class thay handles the circuit simulation"""
@@ -65,6 +74,7 @@ class Circuit:
     def __init__(self, name: str | None = None, vcd: str | None = None):
         self._components: dict[str, Component] = {}
         self._circuit_events: list[CircuitEvent] = []
+        self._events_by_port: dict[PortOutDelta, CircuitEvent] = {}
         self._name: str | None = name
         self._time_ns: int = 0
         self._folder: str | None = None
@@ -86,10 +96,7 @@ class Circuit:
     @property
     def components(self) -> list[Component]:
         """Get the components in this circuit"""
-        comp_array = []
-        for _, comp in self._components.items():
-            comp_array.append(comp)
-        return comp_array
+        return list(self._components.values())
 
     def load_path(self, path) -> str:
         """Get the load path relative to the circuit path"""
@@ -100,7 +107,9 @@ class Circuit:
     def store_path(self, path) -> str:
         """Get the store path relative to the circuit path"""
         if self._folder is not None:
-            return os.path.relpath(path, self._folder)
+            return str(
+                pathlib.Path(path).resolve().absolute().relative_to(pathlib.Path(self._folder))
+            )
         return path
 
     def delete_component(self, component: Component):
@@ -110,16 +119,13 @@ class Circuit:
 
     def get_toplevel_components(self) -> list[Component]:
         """Get toplevel components in the circuit"""
-        toplevel_components = []
-        for _, comp in self._components.items():
-            if comp.is_toplevel():
-                toplevel_components.append(comp)
-        return toplevel_components
+        return [comp for comp in self._components.values() if comp.is_toplevel()]
 
     def init(self):
         """Initialize circuit and components (and ports)"""
         self._time_ns = 0
         self._circuit_events = []
+        self._events_by_port = {}
         if self._vcd is not None:
             self._vcd_init()
         for _, comp in self._components.items():
@@ -175,22 +181,32 @@ class Circuit:
         Process one simulation event
         Return False if ther are now events of if the stop_time has passed
         """
-        if len(self._circuit_events) == 0:
-            return False, False
-        self._circuit_events.sort()
-        if stop_time_ns is None or self._circuit_events[0].time_ns > stop_time_ns:
-            return False, False
-        event = self._circuit_events.pop(0)
-        # print(
-        #     f"Execute event {event.port.path()}.{event.port.name()}"
-        #     " {event.time_ns} {event.value}"
-        # )
-        self._time_ns = event.time_ns
-        event.port.delta_cycle(event.value)
-        toplevel = event.port.parent().is_toplevel()
-        if self._vcd is not None:
-            self._vcd.write(event.port, self._time_ns)
-        return True, toplevel
+        while self._circuit_events:
+            event = heapq.heappop(self._circuit_events)
+
+            # Check if this is the latest event for this port
+            if event != self._events_by_port.get(event.port):
+                # This is a stale event, ignore it
+                continue
+
+            if stop_time_ns is not None and event.time_ns > stop_time_ns:
+                # Put the event back if it's after the stop time
+                heapq.heappush(self._circuit_events, event)
+                return False, False
+
+            del self._events_by_port[event.port]
+            # print(
+            #     f"Execute event {event.port.path()}.{event.port.name()}"
+            #     f" {event.time_ns} {event.value}"
+            # )
+            self._time_ns = event.time_ns
+            event.port.delta_cycle(event.value)
+            toplevel = event.port.parent().is_toplevel()
+            if self._vcd is not None:
+                self._vcd.write(event.port, self._time_ns)
+            return True, toplevel
+
+        return False, False
 
     def _is_toplevel_event(self) -> bool:
         if len(self._circuit_events) == 0:
@@ -231,15 +247,13 @@ class Circuit:
         if stop_time_ns >= self._time_ns:
             self.run(ns=stop_time_ns - self._time_ns)
 
-    def add_event(self, port: PortOutDelta, value: int | str | None, propagation_delay_ns: int):
+    def add_event(self, port: PortOutDelta, value: VALUE_TYPE, propagation_delay_ns: int):
         """Add delta cycle event, this will also write values to .vcd file"""
         event_time_ns = self._time_ns + propagation_delay_ns
         # print(f"Add event {port.parent().name()}:{port.name()} => {value}")
-        for event in self._circuit_events:
-            if event.is_same_event(port):
-                event.update(event_time_ns, value)
-                return
-        self._circuit_events.append(CircuitEvent(event_time_ns, port, value))
+        event = CircuitEvent(event_time_ns, port, value)
+        self._events_by_port[port] = event
+        heapq.heappush(self._circuit_events, event)
 
     def add_component(self, component: Component):
         """Add component to circuit"""

digsim/circuit/components/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """All classes within digsim.circuit.components namespace"""

digsim/circuit/components/_bus_bits.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """Module with the bus/bit <=> bus/bit components"""

digsim/circuit/components/_button.py

@@ -1,23 +1,19 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """A PushButton component"""
 
-import logging
-
 from .atoms import CallbackComponent, PortOutImmediate
 
 
 class PushButton(CallbackComponent):
     """PushButton component class"""
 
-    def __init__(self, circuit, name=None, inverted=False):
+    def __init__(self, circuit, name=None):
         super().__init__(circuit, name)
         portout = PortOutImmediate(self, "O")
         self.add_port(portout)
         portout.update_parent(True)
-        if inverted:
-            logging.warning("Setting 'inverted' has been removed")
 
     def default_state(self):
         self.release()

digsim/circuit/components/_buzzer.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """Module with the Buzzer component"""

digsim/circuit/components/_clock.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """Clock component module"""

digsim/circuit/components/_dip_switch.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """A Dip-switch component"""

digsim/circuit/components/_flip_flops.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """Module with flip flops and latches"""

digsim/circuit/components/_hexdigit.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """HexDigit component module"""

digsim/circuit/components/_ic.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """

digsim/circuit/components/_label_wire.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """Label Wire components module"""

digsim/circuit/components/_led.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """Module with the LED component"""

digsim/circuit/components/_logic_analyzer.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """Module with Logic Analyzer component"""

digsim/circuit/components/_mem64kbyte.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """

digsim/circuit/components/_memstdout.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """

digsim/circuit/components/_note.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """Components that only exist in the model"""

digsim/circuit/components/_on_off_switch.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """An On/Off Switch  component"""

digsim/circuit/components/_seven_segment.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """Module with 7-segment LED component"""

digsim/circuit/components/_static_level.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """Module with the Static Logic components"""

digsim/circuit/components/_static_value.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """Module with the Static Leve component"""

digsim/circuit/components/_yosys_component.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023-2024
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """
@@ -26,7 +26,7 @@ class YosysComponent(MultiComponent):
     def __init__(self, circuit, path=None, name=None, nets=True):
         super().__init__(circuit, name)
         self._circuit = circuit
-        self._path = path
+        self._path = str(path)
         self._gates_comp = None
         self._net_comp = None
         self._netlist_module = None

digsim/circuit/components/atoms/__init__.py

@@ -11,6 +11,7 @@ from ._component import (  # noqa: F401
 )
 from ._digsim_exception import DigsimException  # noqa: F401
 from ._port import (  # noqa: F401
+    VALUE_TYPE,
     Port,
     PortConnectionError,
     PortIn,

digsim/circuit/components/atoms/_component.py

@@ -63,10 +63,20 @@ class Component(abc.ABC):
         self._ports = []
 
     def path(self) -> str:
-        """Get component path"""
-        if self._parent is not None:
-            return f"{self._parent.path()}.{self.name()}"
-        return f"{self.name()}"
+        """Get component path (iterative)"""
+        path_parts = []
+        current_component = self
+        while current_component is not None:
+            name = current_component.name()
+            if not isinstance(name, str):
+                raise TypeError(
+                    f"Component name is not a string: "
+                    f"{name} ({type(name)}), "
+                    f"component: {current_component.__class__.__name__}"
+                )
+            path_parts.append(name)
+            current_component = current_component._parent
+        return ".".join(reversed(path_parts))
 
     @property
     def ports(self):

digsim/circuit/components/atoms/_digsim_exception.py

@@ -1,4 +1,4 @@
-# Copyright (c) Fredrik Andersson, 2023
+# Copyright (c) Fredrik Andersson, 2023-2025
 # All rights reserved
 
 """The digsim exception base"""