digsim-logic-simulator 0.11.0__tar.gz → 0.13.0__tar.gz

{digsim_logic_simulator-0.11.0/src/digsim_logic_simulator.egg-info → digsim_logic_simulator-0.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digsim-logic-simulator
-Version: 0.11.0
+Version: 0.13.0
 Summary: Interactive Digital Logic Simulator
 Author-email: Fredrik Andersson <freand@gmail.com>
 Maintainer-email: Fredrik Andersson <freand@gmail.com>

{digsim_logic_simulator-0.11.0 → digsim_logic_simulator-0.13.0}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "digsim-logic-simulator"
 description = "Interactive Digital Logic Simulator"
-version = "0.11.0"
+version = "0.13.0"
 authors = [{name = "Fredrik Andersson", email = "freand@gmail.com"}]
 maintainers =  [{name = "Fredrik Andersson", email = "freand@gmail.com"}]
 readme = "README.md"

{digsim_logic_simulator-0.11.0 → digsim_logic_simulator-0.13.0}/src/digsim/app/__main__.py

@@ -16,21 +16,25 @@ from digsim.app.model import AppModel
 
 
 if __name__ == "__main__":
+
+    def _create_app_icon(image_path: Path) -> QIcon:
+        image_pixmap = QPixmap(image_path)
+        size = max(image_pixmap.size().height(), image_pixmap.size().width())
+        icon_pixmap = QPixmap(size, size)
+        icon_pixmap.fill(Qt.transparent)
+        painter = QPainter(icon_pixmap)
+        painter.drawPixmap(
+            (icon_pixmap.size().width() - image_pixmap.size().width()) // 2,
+            (icon_pixmap.size().height() - image_pixmap.size().height()) // 2,
+            image_pixmap,
+        )
+        painter.end()
+        return QIcon(icon_pixmap)
+
     app = QApplication(sys.argv)
     main_path = Path(__file__).parent
     image_path = main_path / "images/app_icon.png"
-    image_pixmap = QPixmap(image_path)
-    size = max(image_pixmap.size().height(), image_pixmap.size().width())
-    icon_pixmap = QPixmap(size, size)
-    icon_pixmap.fill(Qt.transparent)
-    painter = QPainter(icon_pixmap)
-    painter.drawPixmap(
-        (icon_pixmap.size().width() - image_pixmap.size().width()) // 2,
-        (icon_pixmap.size().height() - image_pixmap.size().height()) // 2,
-        image_pixmap,
-    )
-    painter.end()
-    icon = QIcon(icon_pixmap)
+    icon = _create_app_icon(image_path)
     app.setWindowIcon(icon)
     app_model = AppModel()
     window = MainWindow(app_model)

{digsim_logic_simulator-0.11.0 → digsim_logic_simulator-0.13.0}/src/digsim/app/gui/_circuit_area.py

@@ -6,7 +6,7 @@
 from functools import partial
 
 from PySide6.QtCore import QPoint, QPointF, QRect, QRectF, Qt, QTimer
-from PySide6.QtGui import QBrush, QPainterPath, QPen
+from PySide6.QtGui import QBrush, QColor, QPainterPath, QPen
 from PySide6.QtWidgets import (
     QGraphicsItem,
     QGraphicsPathItem,
@@ -52,6 +52,19 @@ class WirePartGraphicsItem(QGraphicsRectItem):
             self._parent.select(self.isSelected())
         return super().itemChange(change, value)
 
+    def _get_wire_color(self, port_value, bus_width):
+        if port_value == "X":
+            return Qt.red
+        if port_value == 0:
+            return Qt.darkGray
+
+        max_value = 2**bus_width - 1
+        # Start with dark gray
+        green = 128
+        # Calculate the green component, ranging from 128 to 255
+        green += int(127 * port_value / max_value)
+        return QColor(128, green, 128)
+
     def paint(self, painter, option, widget=None):
         """QT function"""
         pen = QPen(Qt.darkGray)
@@ -60,20 +73,13 @@ class WirePartGraphicsItem(QGraphicsRectItem):
             pen.setWidth(4)
         else:
             pen.setWidth(2)
+
         if not self._app_model.is_running and self._selected:
             pen.setColor(Qt.black)
-        else:
-            if self._app_model.settings.get("color_wires"):
-                port_value = self._src_port.value
-                if port_value == "X":
-                    pen.setColor(Qt.red)
-                elif port_value != 0:
-                    max_value = 2**bus_width - 1
-                    color = pen.color()
-                    green = color.green()
-                    full_range = 255 - green
-                    color.setGreen(green + (full_range * port_value / max_value))
-                    pen.setColor(color)
+        elif self._app_model.settings.get("color_wires"):
+            port_value = self._src_port.value
+            pen.setColor(self._get_wire_color(port_value, bus_width))
+
         painter.setPen(pen)
         painter.drawLine(self._start, self._end)
 
@@ -82,6 +88,7 @@ class WireGraphicsItem(QGraphicsPathItem):
     """A wire graphics item"""
 
     WIRE_TO_COMPONENT_DIST = 5
+    X_OFFSET = 10
 
     def __init__(self, app_model, connection, src_port_item, dst_port_item):
         super().__init__()
@@ -116,14 +123,14 @@ class WireGraphicsItem(QGraphicsPathItem):
     def create_points(cls, source, dest, rect):
         """Create a wire path"""
         points = []
-
         points.append(source)
+
         if source.x() < dest.x():
             half_dist_x = (dest.x() - source.x()) / 2
             points.append(QPointF(source.x() + half_dist_x, source.y()))
             points.append(QPointF(source.x() + half_dist_x, dest.y()))
         else:
-            half_dist_y = dest.y() - (dest.y() - source.y()) / 2
+            half_dist_y = (source.y() + dest.y()) / 2
             if dest.y() < source.y():
                 comp_top = rect.y() - cls.WIRE_TO_COMPONENT_DIST
                 y_mid = min(comp_top, half_dist_y)
@@ -131,10 +138,11 @@ class WireGraphicsItem(QGraphicsPathItem):
                 comp_bottom = rect.y() + rect.height() + cls.WIRE_TO_COMPONENT_DIST
                 y_mid = max(comp_bottom, half_dist_y)
 
-            points.append(QPointF(source.x() + 10, source.y()))
-            points.append(QPointF(source.x() + 10, y_mid))
-            points.append(QPointF(dest.x() - 10, y_mid))
-            points.append(QPointF(dest.x() - 10, dest.y()))
+            points.append(QPointF(source.x() + cls.X_OFFSET, source.y()))
+            points.append(QPointF(source.x() + cls.X_OFFSET, y_mid))
+            points.append(QPointF(dest.x() - cls.X_OFFSET, y_mid))
+            points.append(QPointF(dest.x() - cls.X_OFFSET, dest.y()))
+
         points.append(dest)
         return points
 
@@ -315,6 +323,9 @@ class _CircuitAreaScene(QGraphicsScene):
 class CircuitArea(QGraphicsView):
     """The circuit area graphics view"""
 
+    ZOOM_IN_FACTOR = 1.25
+    ZOOM_OUT_FACTOR = 0.8
+
     def __init__(self, app_model, parent):
         super().__init__(parent=parent)
         self._app_model = app_model
@@ -333,10 +344,10 @@ class CircuitArea(QGraphicsView):
         return len(self._scene.selectedItems()) > 0
 
     def _zoom_in(self):
-        self.scale(1.25, 1.25)
+        self.scale(self.ZOOM_IN_FACTOR, self.ZOOM_IN_FACTOR)
 
     def _zoom_out(self):
-        self.scale(0.8, 0.8)
+        self.scale(self.ZOOM_OUT_FACTOR, self.ZOOM_OUT_FACTOR)
 
     def _repaint(self):
         """Make scene repaint for component update"""

{digsim_logic_simulator-0.11.0 → digsim_logic_simulator-0.13.0}/src/digsim/app/gui/_component_selection.py

@@ -40,6 +40,8 @@ class SelectableComponentWidget(QPushButton):
             mime.setText(self._name)
             drag.setMimeData(mime)
             drag.setHotSpot(event.pos() - self.rect().topLeft())
+            # Create a square pixmap for dragging, using the widget's width for both dimensions.
+            # This is intentional to maintain a consistent visual representation during drag operations.
             pixmap = QPixmap(self.size().width(), self.size().width())
             self.render(pixmap)
             drag.setPixmap(pixmap)

{digsim_logic_simulator-0.11.0 → digsim_logic_simulator-0.13.0}/src/digsim/app/gui_objects/__init__.py

@@ -4,4 +4,4 @@
 """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
+from ._gui_object_factory import class_factory  # noqa: F401

{digsim_logic_simulator-0.11.0 → digsim_logic_simulator-0.13.0}/src/digsim/app/gui_objects/_buzzer_object.py

@@ -66,12 +66,7 @@ class BuzzerObject(ImageObjectWithActiveRect):
         self.audio_sink = None
         self._app_model.sig_audio_start.connect(self._audio_start)
         self._app_model.sig_audio_notify.connect(self._audio_notify)
-        self.device = None
-        devices = QMediaDevices.audioOutputs()
-        if len(devices) == 0:
-            return
-        self.device = devices[0]
-
+        self.device = QMediaDevices.defaultAudioOutput()
         self.audio_format = QAudioFormat()
         self.audio_format.setSampleRate(self.DATA_SAMPLE_RATE_HZ)
         self.audio_format.setChannelCount(1)
@@ -92,11 +87,11 @@ class BuzzerObject(ImageObjectWithActiveRect):
         if self.device is None:
             return
         if active:
-            self.audio_sink = QAudioSink(self.device, self.audio_format)
-            self.audio_sink.setVolume(0.1)
+            if self.audio_sink is None:
+                self.audio_sink = QAudioSink(self.device, self.audio_format)
+                self.audio_sink.setVolume(0.1)
             self.audio_sink.start(self.audio_output)
         else:
-            if self.audio_sink is None:
-                return
-            self.audio_sink.stop()
-            self.audio_sink = None
+            if self.audio_sink is not None:
+                self.audio_sink.stop()
+                self.audio_sink = None

{digsim_logic_simulator-0.11.0 → digsim_logic_simulator-0.13.0}/src/digsim/app/gui_objects/_component_context_menu.py

@@ -18,7 +18,7 @@ class ComponentContextMenu(QMenu):
         self._app_model = app_model
         self._component_object = component_object
         self._component = self._component_object.component
-        self._reconfigurable_parameters = None
+        self._reconfigurable_parameters = {}
         # Title
         titleAction = QAction(self._component.display_name(), self)
         titleAction.setEnabled(False)

{digsim_logic_simulator-0.11.0 → digsim_logic_simulator-0.13.0}/src/digsim/app/gui_objects/_component_object.py

@@ -25,6 +25,10 @@ class ComponentObject(QGraphicsRectItem):
     PORT_SIDE = 8
     DEFAULT_PORT_TO_PORT_DISTANCE = 20
 
+    _COMPONENT_NAME_FONT = QFont("Arial", 10)
+    _PORT_NAME_FONT = QFont("Arial", 8)
+    _SELECTABLE_COMPONENT_NAME_FONT = QFont("Arial", 8)
+
     def __init__(
         self, app_model, component, xpos, ypos, port_distance=DEFAULT_PORT_TO_PORT_DISTANCE
     ):
@@ -237,9 +241,8 @@ class ComponentObject(QGraphicsRectItem):
 
     def paint_component_name(self, painter):
         """Paint the component name"""
-        font = QFont("Arial", 10)
-        painter.setFont(font)
-        fm = QFontMetrics(font)
+        painter.setFont(self._COMPONENT_NAME_FONT)
+        fm = QFontMetrics(self._COMPONENT_NAME_FONT)
         display_name_str = self._component.display_name()
         str_pixels_w = fm.horizontalAdvance(display_name_str)
         str_pixels_h = fm.height()
@@ -278,11 +281,10 @@ class ComponentObject(QGraphicsRectItem):
     @classmethod
     def paint_selectable_component_name(cls, painter, point, size, name):
         """Paint the name for the selectable component"""
-        font = QFont("Arial", 8)
-        fm = QFontMetrics(font)
+        painter.setFont(cls._SELECTABLE_COMPONENT_NAME_FONT)
+        fm = QFontMetrics(cls._SELECTABLE_COMPONENT_NAME_FONT)
         str_pixels_w = fm.horizontalAdvance(name)
         str_pixels_h = fm.height()
-        painter.setFont(font)
         painter.setPen(Qt.black)
         painter.drawText(
             point.x() + size.width() / 2 - str_pixels_w / 2,
@@ -297,12 +299,11 @@ class ComponentObject(QGraphicsRectItem):
     def paint_portnames(self, painter, color=Qt.black):
         """Paint component ports"""
         painter.setPen(color)
-        font = QFont("Arial", 8)
-        painter.setFont(font)
+        painter.setFont(self._PORT_NAME_FONT)
         for port in self._component.ports:
             rect = self.get_port_item(port).rect()
             port_str = self._port_dict[port]["name"]
-            str_pixels_w, str_pixels_h = self.get_string_metrics(port_str, font)
+            str_pixels_w, str_pixels_h = self.get_string_metrics(port_str, self._PORT_NAME_FONT)
             text_y = rect.y() + str_pixels_h - self.PORT_SIDE / 2
             if rect.x() < self.object_pos.x():
                 text_pos = QPoint(rect.x() + self.inport_x_pos(), text_y)

{digsim_logic_simulator-0.11.0 → digsim_logic_simulator-0.13.0}/src/digsim/app/gui_objects/_component_port_item.py

@@ -44,7 +44,6 @@ class PortGraphicsItem(QGraphicsRectItem):
             return
         self.setBrush(QBrush(Qt.black))
         self.setCursor(Qt.CrossCursor)
-        self._repaint()
 
     def hoverLeaveEvent(self, _):
         """QT event callback function"""
@@ -52,7 +51,6 @@ class PortGraphicsItem(QGraphicsRectItem):
             return
         self.setBrush(QBrush(Qt.gray))
         self.setCursor(Qt.ArrowCursor)
-        self._repaint()
 
     def portParentRect(self):
         """return the parent rect"""

{digsim_logic_simulator-0.11.0 → digsim_logic_simulator-0.13.0}/src/digsim/app/gui_objects/_dip_switch_object.py

@@ -16,6 +16,8 @@ class DipSwitchObject(ImageObject):
     DIP_SWITCH_WIDTH = 20
     DIP_SWITCH_HEIGHT = 10
 
+    _DIP_SWITCH_FONT = QFont("Arial", 8)
+
     def __init__(self, app_model, component, xpos, ypos):
         super().__init__(app_model, component, xpos, ypos, port_distance=self.DIP_SWITCH_HEIGHT)
         self.width = 2.5 * self.DIP_SWITCH_WIDTH
@@ -77,17 +79,16 @@ class DipSwitchObject(ImageObject):
                 painter.drawRect(
                     rect.x() + 1, rect.y() + 1, rect.width() / 2 - 2, rect.height() - 2
                 )
-        font = QFont("Arial", 8)
-        painter.setFont(font)
+        painter.setFont(self._DIP_SWITCH_FONT)
         painter.setPen(Qt.white)
         for idx, rect in enumerate(self._rects):
             port_str = f"{idx + 1}"
-            str_pixels_w, _ = self.get_string_metrics(port_str, font)
+            str_pixels_w, _ = self.get_string_metrics(port_str, self._DIP_SWITCH_FONT)
             painter.drawText(
                 QPoint(rect.x() - str_pixels_w - 4, rect.y() + rect.height() - 1), port_str
             )
 
-        _, str_h = self.get_string_metrics("ON", font)
+        _, str_h = self.get_string_metrics("ON", self._DIP_SWITCH_FONT)
         painter.drawText(
             self.rect().x() + self.rect().width() / 2,
             self.rect().y() + self.BORDER_TO_PORT - str_h,

{digsim_logic_simulator-0.11.0 → digsim_logic_simulator-0.13.0}/src/digsim/app/gui_objects/_gui_note_object.py

@@ -16,16 +16,18 @@ class GuiNoteObject(ComponentObject):
     NOTE_MINIMUM_WIDTH = 50
     NOTE_MINIMUM_HEIGHT = 20
 
+    _NOTE_FONT = QFont("Arial", 8)
+    _NOTE_PEN = QPen(Qt.black)
+
     def __init__(self, app_model, component, xpos, ypos):
         super().__init__(app_model, component, xpos, ypos)
-        self._font = QFont("Arial", 8)
         self.update_size()
 
     def _get_lines(self):
         return self.component.parameter_get("text").split("\n")
 
     def update_size(self):
-        fm = QFontMetrics(self._font)
+        fm = QFontMetrics(self._NOTE_FONT)
         width = self.NOTE_MINIMUM_WIDTH
         lines = self._get_lines()
         for line in lines:
@@ -39,19 +41,18 @@ class GuiNoteObject(ComponentObject):
 
     def paint_component(self, painter):
         """Paint note rectangle"""
-        fm = QFontMetrics(self._font)
+        fm = QFontMetrics(self._NOTE_FONT)
         lines = self._get_lines()
-        pen = QPen()
+        pen = self._NOTE_PEN
         if self.selected:
             pen.setWidth(4)
         else:
             pen.setWidth(1)
-        pen.setColor(Qt.black)
         painter.setPen(pen)
         painter.setBrush(Qt.SolidPattern)
         painter.setBrush(Qt.yellow)
         painter.drawRect(self.rect())
-        painter.setFont(self._font)
+        painter.setFont(self._NOTE_FONT)
         for idx, line in enumerate(lines):
             painter.drawText(
                 self.object_pos.x() + self.NOTE_BORDER,
@@ -67,15 +68,13 @@ class GuiNoteObject(ComponentObject):
             size.width() - 2 * cls.NOTE_BORDER,
             size.width() - 2 * cls.NOTE_BORDER,
         )
-        pen = QPen()
+        pen = cls._NOTE_PEN
         pen.setWidth(1)
-        pen.setColor(Qt.black)
         painter.setPen(pen)
         painter.setBrush(Qt.SolidPattern)
         painter.setBrush(Qt.yellow)
         painter.drawRect(note_rect)
-        font = QFont("Arial", 8)
-        fm = QFontMetrics(font)
-        painter.setFont(font)
+        painter.setFont(cls._NOTE_FONT)
+        fm = QFontMetrics(cls._NOTE_FONT)
         painter.drawText(2 * cls.NOTE_BORDER, 2 * cls.NOTE_BORDER + fm.height(), "abc..")
         cls.paint_selectable_component_name(painter, QPoint(0, 0), size, name)

{digsim_logic_simulator-0.11.0 → digsim_logic_simulator-0.13.0}/src/digsim/app/gui_objects/_gui_object_factory.py

@@ -70,7 +70,7 @@ CLASS_NAME_TO_COMPONENT_OBJECT = {
 }
 
 
-def get_class_by_name(component_class_name):
+def class_factory(component_class_name):
     """A function that returns the GUI for a component class (str or class)"""
 
     if component_class_name in CLASS_NAME_TO_COMPONENT_OBJECT:

{digsim_logic_simulator-0.11.0 → digsim_logic_simulator-0.13.0}/src/digsim/app/gui_objects/_image_objects.py

@@ -165,6 +165,8 @@ class ImageObjectStaticValue(ImageObject):
     IMAGE_FILENAME = "images/ZERO.png"
     ACTIVE_IMAGE_FILENAME = "images/ONE.png"
 
+    _STATIC_VALUE_FONT = QFont("Arial", 16)
+
     def __init__(self, app_model, component, xpos, ypos):
         super().__init__(app_model, component, xpos, ypos)
         self.show_name(False)
@@ -174,10 +176,9 @@ class ImageObjectStaticValue(ImageObject):
             super().paint_component(painter)
         else:
             self.paint_component_base(painter)
-            font = QFont("Arial", 16)
             value_str = f"{self.component.parameter_get('value')}"
-            str_w, str_h = self.get_string_metrics(value_str, font=font)
-            painter.setFont(font)
+            str_w, str_h = self.get_string_metrics(value_str, font=self._STATIC_VALUE_FONT)
+            painter.setFont(self._STATIC_VALUE_FONT)
             painter.drawText(
                 self.rect().x() + self.rect().width() / 2 - str_w / 2,
                 self.rect().y() + str_h,
@@ -213,6 +214,8 @@ class ImageObjectWithActiveRect(ImageObject):
     When active the image will have a green border painted around it.
     """
 
+    _ACTIVE_RECT_PEN = QPen(Qt.green)
+
     def __init__(self, app_model, component, xpos, ypos):
         super().__init__(app_model, component, xpos, ypos)
         self.show_name(False)
@@ -223,9 +226,8 @@ class ImageObjectWithActiveRect(ImageObject):
         if self.component.active:
             xpos = self.object_pos.x() + self.size.width() / 2 - self._pixmap.width() / 2
             ypos = self.object_pos.y() + self.size.height() / 2 - self._pixmap.height() / 2
-            pen = QPen()
+            pen = self._ACTIVE_RECT_PEN
             pen.setWidth(4)
-            pen.setColor(Qt.green)
             painter.setPen(pen)
             painter.setBrush(Qt.NoBrush)
             painter.drawRoundedRect(xpos, ypos, self._pixmap.width(), self._pixmap.height(), 5, 5)

{digsim_logic_simulator-0.11.0 → digsim_logic_simulator-0.13.0}/src/digsim/app/gui_objects/_label_object.py

@@ -12,6 +12,8 @@ from ._component_object import ComponentObject
 class LabelObject(ComponentObject):
     """The class for a bus/bit component placed in the GUI"""
 
+    _LABEL_PEN = QPen(Qt.black)
+
     def __init__(self, app_model, component, xpos, ypos):
         super().__init__(app_model, component, xpos, ypos)
         label = component.label()
@@ -35,12 +37,11 @@ class LabelObject(ComponentObject):
 
     @classmethod
     def _paint_label(cls, painter, comp_rect, name, selected=False):
-        pen = QPen()
+        pen = cls._LABEL_PEN
         if selected:
             pen.setWidth(4)
         else:
             pen.setWidth(1)
-        pen.setColor(Qt.black)
         painter.setPen(pen)
         painter.setBrush(Qt.SolidPattern)
         painter.setBrush(Qt.gray)

{digsim_logic_simulator-0.11.0 → digsim_logic_simulator-0.13.0}/src/digsim/app/gui_objects/_logic_analyzer_object.py

@@ -17,6 +17,10 @@ class LogicAnalyzerObject(ImageObject):
     SIGNAL_NAME_WIDTH = 40
     ANALYZER_DISPLAY_WIDTH = 200
 
+    _ANALYZER_PEN = QPen(Qt.green)
+    _SIGNAL_VERTICAL_SCALE = 10
+    _SIGNAL_HORIZONTAL_SCALE = 2
+
     def __init__(self, app_model, component, xpos, ypos):
         super().__init__(app_model, component, xpos, ypos)
         self.width = self.SIGNAL_NAME_WIDTH + self.ANALYZER_DISPLAY_WIDTH + 2 * self.RECT_TO_BORDER
@@ -37,8 +41,7 @@ class LogicAnalyzerObject(ImageObject):
             5,
         )
 
-        pen = QPen()
-        pen.setColor(Qt.green)
+        pen = self._ANALYZER_PEN
         pen.setWidth(2)
         painter.setPen(pen)
         signal_data_dict = self.component.signal_data()
@@ -48,7 +51,7 @@ class LogicAnalyzerObject(ImageObject):
             path = QPainterPath(
                 QPoint(
                     self.object_pos.x() + self.SIGNAL_NAME_WIDTH,
-                    port_pos.y() - signal_data[0] * 10,
+                    port_pos.y() - signal_data[0] * self._SIGNAL_VERTICAL_SCALE,
                 )
             )
             last_level = signal_data[0]
@@ -57,21 +60,27 @@ class LogicAnalyzerObject(ImageObject):
                     continue
                 path.lineTo(
                     QPoint(
-                        self.object_pos.x() + self.SIGNAL_NAME_WIDTH + (idx + 1) * 2,
-                        port_pos.y() - last_level * 10,
+                        self.object_pos.x()
+                        + self.SIGNAL_NAME_WIDTH
+                        + (idx + 1) * self._SIGNAL_HORIZONTAL_SCALE,
+                        port_pos.y() - last_level * self._SIGNAL_VERTICAL_SCALE,
                     )
                 )
                 path.lineTo(
                     QPoint(
-                        self.object_pos.x() + self.SIGNAL_NAME_WIDTH + (idx + 1) * 2,
-                        port_pos.y() - level * 10,
+                        self.object_pos.x()
+                        + self.SIGNAL_NAME_WIDTH
+                        + (idx + 1) * self._SIGNAL_HORIZONTAL_SCALE,
+                        port_pos.y() - level * self._SIGNAL_VERTICAL_SCALE,
                     )
                 )
                 last_level = level
             path.lineTo(
                 QPoint(
-                    self.object_pos.x() + self.SIGNAL_NAME_WIDTH + len(signal_data) * 2,
-                    port_pos.y() - last_level * 10,
+                    self.object_pos.x()
+                    + self.SIGNAL_NAME_WIDTH
+                    + len(signal_data) * self._SIGNAL_HORIZONTAL_SCALE,
+                    port_pos.y() - last_level * self._SIGNAL_VERTICAL_SCALE,
                 )
             )
             painter.drawPath(path)

{digsim_logic_simulator-0.11.0 → digsim_logic_simulator-0.13.0}/src/digsim/app/gui_objects/_seven_segment_object.py

@@ -47,6 +47,10 @@ class SevenSegmentObject(ComponentObject):
     DIGIT_WIDTH = 54
     DIGIT_HEIGHT = 80
 
+    DOT_OFFSET_X = 40
+    DOT_OFFSET_Y = 60
+    DOT_RADIUS = 3
+
     def __init__(self, app_model, component, xpos, ypos, port_distance=10):
         super().__init__(app_model, component, xpos, ypos, port_distance=port_distance)
         self.setup_size()
@@ -89,7 +93,6 @@ class SevenSegmentObject(ComponentObject):
         """Paint the digit background"""
         painter.setBrush(Qt.SolidPattern)
         painter.setPen(Qt.black)
-        painter.setBrush(Qt.black)
         painter.drawRoundedRect(xpos, ypos, cls.DIGIT_WIDTH * digits, cls.DIGIT_HEIGHT, 4, 4)
 
     @classmethod
@@ -114,11 +117,15 @@ class SevenSegmentObject(ComponentObject):
             path.closeSubpath()
             painter.drawPath(path)
 
+        DOT_OFFSET_X = 40
+        DOT_OFFSET_Y = 60
+        DOT_RADIUS = 3
+
         if "." in active_segments:
             painter.setPen(Qt.red)
             painter.setBrush(Qt.red)
         else:
             painter.setPen(Qt.darkRed)
             painter.setBrush(Qt.darkRed)
-        dotPoint = QPoint(40, 60) + start_point
-        painter.drawEllipse(dotPoint, 3, 3)
+        dotPoint = QPoint(DOT_OFFSET_X, DOT_OFFSET_Y) + start_point
+        painter.drawEllipse(dotPoint, DOT_RADIUS, DOT_RADIUS)

{digsim_logic_simulator-0.11.0 → digsim_logic_simulator-0.13.0}/src/digsim/app/gui_objects/_shortcut_objects.py

@@ -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_logic_simulator-0.11.0 → digsim_logic_simulator-0.13.0}/src/digsim/app/model/_model.py

@@ -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_logic_simulator-0.11.0 → digsim_logic_simulator-0.13.0}/src/digsim/app/model/_model_components.py

@@ -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_logic_simulator-0.11.0 → digsim_logic_simulator-0.13.0}/src/digsim/app/model/_model_new_wire.py

@@ -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")