Add typing, renaming, convenience methods/properties

b_asic/GUI/arrow.py

+from typing import TYPE_CHECKING, Optional, cast
+
 from qtpy.QtCore import QPointF
 from qtpy.QtGui import QPainterPath, QPen
 from qtpy.QtWidgets import QGraphicsPathItem, QMenu
@@ -5,35 +7,49 @@ from qtpy.QtWidgets import QGraphicsPathItem, QMenu
 from b_asic.GUI._preferences import GRID, LINECOLOR, PORTHEIGHT, PORTWIDTH
 from b_asic.signal import Signal
 
+if TYPE_CHECKING:
+    from b_asic.GUI.drag_button import DragButton
+    from b_asic.GUI.main_window import MainWindow
+    from b_asic.GUI.port_button import PortButton
+    from b_asic.port import InputPort, OutputPort
+
 
 class Arrow(QGraphicsPathItem):
-    """Arrow/connection in signal flow graph GUI."""
+    """
+    Arrow/connection in signal flow graph GUI.
 
-    def __init__(self, source, destination, window, signal=None, parent=None):
-        """
-        Parameters
-        ----------
-        source
-            Source operation.
-        destination
-            Destination operation.
-        window
-            Window containing signal flow graph.
-        signal : Signal, optional
-            Let arrow represent *signal*.
-        parent : optional
-            Parent.
-        """
+    Parameters
+    ----------
+    source_port_button : :class:`~b_asic.GUI.port_button.PortButton`
+        Source port button.
+    destination_port_button : :class:`~b_asic.GUI.port_button.PortButton`
+        Destination port button.
+    window : :class:`~b_asic.GUI.main_window.MainWindow`
+        Window containing signal flow graph.
+    signal : Signal, optional
+        Let arrow represent *signal*.
+    parent : optional
+        Parent.
+    """
+
+    def __init__(
+        self,
+        source_port_button: "PortButton",
+        destination_port_button: "PortButton",
+        window: "MainWindow",
+        signal: Optional[Signal] = None,
+        parent=None,
+    ):
         super().__init__(parent)
-        self.source = source
+        self._source_port_button = source_port_button
         if signal is None:
-            signal = Signal(source.port, destination.port)
+            signal = Signal(source_port_button.port, destination_port_button.port)
         self.signal = signal
-        self.destination = destination
+        self._destination_port_button = destination_port_button
         self._window = window
-        self.moveLine()
-        self.source.moved.connect(self.moveLine)
-        self.destination.moved.connect(self.moveLine)
+        self.update_arrow()
+        self._source_port_button.moved.connect(self.update_arrow)
+        self._destination_port_button.moved.connect(self.update_arrow)
 
     def contextMenuEvent(self, event):
         """Open right-click menu."""
@@ -41,6 +57,54 @@ class Arrow(QGraphicsPathItem):
         menu.addAction("Delete", self.remove)
         menu.exec_(self.cursor().pos())
 
+    @property
+    def source_operation_button(self) -> "DragButton":
+        """The source DragButton."""
+        return self._source_port_button._operation_button
+
+    @property
+    def destination_operation_button(self) -> "DragButton":
+        """The destination DragButton."""
+        return self._destination_port_button._operation_button
+
+    @property
+    def source_operation(self) -> "Operation":
+        """The source Operation."""
+        return self._source_port_button.operation
+
+    @property
+    def destination_operation(self) -> "Operation":
+        """The destination Operation."""
+        return self._destination_port_button.operation
+
+    @property
+    def source_port_button(self) -> "PortButton":
+        """The source PortButton."""
+        return self._source_port_button
+
+    @property
+    def destination_port_button(self) -> "PortButton":
+        """The destination PortButton."""
+        return self._destination_port_button
+
+    @property
+    def source_port(self) -> "OutputPort":
+        """The source OutputPort."""
+        return cast("OutputPort", self._source_port_button.port)
+
+    @property
+    def desination_port(self) -> "InputPort":
+        """The destination InputPort."""
+        return cast("InputPort", self._destination_port_button.port)
+
+    def set_source_operation(self, source: "Operation"):
+        """Set operation of the source DragButton"""
+        self._source_port_button._operation_button.operation = source
+
+    def set_destination_operation(self, destination: "Operation"):
+        """Set operation of the destination DragButton"""
+        self._destination_port_button._operation_button.operation = destination
+
     def remove(self):
         """Remove line and connections to signals etc."""
         self.signal.remove_destination()
@@ -49,8 +113,8 @@ class Arrow(QGraphicsPathItem):
         if self in self._window._arrows:
             self._window._arrows.remove(self)
 
-        if self in self._window._signal_ports:
-            for port1, port2 in self._window._signal_ports[self]:
+        if self in self._window._arrow_ports:
+            for port1, port2 in self._window._arrow_ports[self]:
                 for (
                     operation,
                     operation_ports,
@@ -73,30 +137,39 @@ class Arrow(QGraphicsPathItem):
                             is not self._window._operation_to_sfg[operation]
                         }
 
-        del self._window._signal_ports[self]
+        del self._window._arrow_ports[self]
 
-    def moveLine(self):
+    def update_arrow(self):
         """
-        Draw a line connecting ``self.source`` with ``self.destination``.
+        Update coordinates for arrow.
+
         Used as callback when moving operations.
         """
         ORTHOGONAL = True
         OFFSET = 2 * PORTWIDTH
         self.setPen(QPen(LINECOLOR, 3))
-        source_flipped = self.source.operation.is_flipped()
-        destination_flipped = self.destination.operation.is_flipped()
+        source_flipped = self.source_operation_button.is_flipped()
+        destination_flipped = self.destination_operation_button.is_flipped()
         x0 = (
-            self.source.operation.x()
-            + self.source.x()
+            self.source_operation_button.x()
+            + self.source_port_button.x()
             + (PORTWIDTH if not source_flipped else 0)
         )
-        y0 = self.source.operation.y() + self.source.y() + PORTHEIGHT / 2
+        y0 = (
+            self.source_operation_button.y()
+            + self.source_port_button.y()
+            + PORTHEIGHT / 2
+        )
         x1 = (
-            self.destination.operation.x()
-            + self.destination.x()
+            self.destination_operation_button.x()
+            + self.destination_port_button.x()
             + (0 if not destination_flipped else PORTWIDTH)
         )
-        y1 = self.destination.operation.y() + self.destination.y() + PORTHEIGHT / 2
+        y1 = (
+            self.destination_operation_button.y()
+            + self._destination_port_button.y()
+            + PORTHEIGHT / 2
+        )
         xmid = (x0 + x1) / 2
         ymid = (y0 + y1) / 2
         both_flipped = source_flipped and destination_flipped

b_asic/GUI/drag_button.py

@@ -5,7 +5,7 @@ Contains a GUI class for drag buttons.
 """
 
 import os.path
-from typing import List
+from typing import TYPE_CHECKING, List
 
 from qtpy.QtCore import QSize, Qt, Signal
 from qtpy.QtGui import QIcon
@@ -18,6 +18,9 @@ from b_asic.gui_utils.decorators import decorate_class, handle_error
 from b_asic.operation import Operation
 from b_asic.port import InputPort
 
+if TYPE_CHECKING:
+    from b_asic.GUI.main_window import MainWindow
+
 
 @decorate_class(handle_error)
 class DragButton(QPushButton):
@@ -29,8 +32,11 @@ class DragButton(QPushButton):
     Parameters
     ----------
     operation : :class:`~b_asic.operation.Operation`
-    is_show_name : bool
-    window
+        The operation that the drag button corresponds to.
+    show_name : bool
+        Whether to show the name.
+    window : MainWindow
+        Parent MainWindow.
     parent
     """
 
@@ -40,16 +46,15 @@ class DragButton(QPushButton):
     def __init__(
         self,
         operation: Operation,
-        is_show_name: bool,
+        show_name: bool,
         window,
         parent=None,
     ):
         self.name = operation.graph_id
-        self.ports: List[PortButton] = []
-        self.is_show_name = is_show_name
+        self._ports: List[PortButton] = []
+        self.show_name = show_name
         self._window = window
         self.operation = operation
-        self.clicked = 0
         self.pressed = False
         self._m_press = False
         self._m_drag = False
@@ -94,6 +99,10 @@ class DragButton(QPushButton):
 
         super().mousePressEvent(event)
 
+    @property
+    def port_list(self) -> List[PortButton]:
+        return self._ports
+
     def mouseMoveEvent(self, event):
         if event.buttons() == Qt.MouseButton.LeftButton and self._m_press:
             self._m_drag = True
@@ -133,7 +142,7 @@ class DragButton(QPushButton):
 
     def _flip(self, event=None):
         self._flipped = not self._flipped
-        for pb in self.ports:
+        for pb in self._ports:
             if isinstance(pb.port, InputPort):
                 newx = MINBUTTONSIZE - PORTWIDTH if self._flipped else 0
             else:
@@ -188,10 +197,10 @@ class DragButton(QPushButton):
         self._window._scene.removeItem(self._window._drag_operation_scenes[self])
 
         _signals = []
-        for signal, ports in self._window._signal_ports.items():
+        for signal, ports in self._window._arrow_ports.items():
             if any(
                 map(
-                    lambda port: set(port).intersection(set(self.ports)),
+                    lambda port: set(port).intersection(set(self._ports)),
                     ports,
                 )
             ):
@@ -251,11 +260,11 @@ class DragButton(QPushButton):
             port.setFixedSize(PORTWIDTH, PORTHEIGHT)
             port.move(0, dist)
             port.show()
-            self.ports.append(port)
+            self._ports.append(port)
 
         for i, dist in enumerate(output_ports_dist):
             port = PortButton(">", self, op.output(i))
             port.setFixedSize(PORTWIDTH, PORTHEIGHT)
             port.move(MINBUTTONSIZE - PORTWIDTH, dist)
             port.show()
-            self.ports.append(port)
+            self._ports.append(port)

b_asic/GUI/main_window.py

@@ -9,7 +9,7 @@ import logging
 import os
 import sys
 from collections import deque
-from typing import Dict, List, Optional, Tuple, cast
+from typing import TYPE_CHECKING, Dict, List, Optional, Sequence, Tuple, cast
 
 from qtpy.QtCore import QCoreApplication, QFileInfo, QSettings, QSize, Qt, QThread
 from qtpy.QtGui import QCursor, QIcon, QKeySequence, QPainter
@@ -52,6 +52,9 @@ from b_asic.signal_flow_graph import SFG
 from b_asic.simulation import Simulation
 from b_asic.special_operations import Input, Output
 
+if TYPE_CHECKING:
+    from qtpy.QtWidgets import QGraphicsProxyWidget
+
 logging.basicConfig(level=logging.INFO)
 
 QCoreApplication.setOrganizationName("Linköping University")
@@ -68,24 +71,22 @@ class MainWindow(QMainWindow):
         self._ui.setupUi(self)
         self.setWindowIcon(QIcon("small_logo.png"))
         self._scene = QGraphicsScene(self)
-        self._operations_from_name = {}
+        self._operations_from_name: Dict[str, Operation] = {}
         self._zoom = 1
-        self._sfg_name_i = 0
-        self._drag_operation_scenes = {}
+        self._drag_operation_scenes: Dict[DragButton, "QGraphicsProxyWidget"] = {}
         self._drag_buttons: Dict[Operation, DragButton] = {}
         self._arrows: List[Arrow] = []
         self._mouse_pressed = False
         self._mouse_dragging = False
         self._starting_port = None
-        self._pressed_operations = []
-        self._ports = {}
-        self._signal_ports = {}
+        self._pressed_operations: List[DragButton] = []
+        self._arrow_ports: Dict[Arrow, List[Tuple[PortButton, PortButton]]] = {}
         self._operation_to_sfg: Dict[DragButton, SFG] = {}
-        self._pressed_ports = []
-        self._sfg_dict = {}
+        self._pressed_ports: List[PortButton] = []
+        self._sfg_dict: Dict[str, SFG] = {}
         self._window = self
         self._logger = logging.getLogger(__name__)
-        self._plot: Dict[Simulation, PlotWindow] = dict()
+        self._plot: Dict[Simulation, PlotWindow] = {}
 
         # Create Graphics View
         self._graphics_view = QGraphicsView(self._scene, self)
@@ -102,7 +103,7 @@ class MainWindow(QMainWindow):
 
         # Add operations
         self._max_recent_files = 4
-        self._recent_files = []
+        self._recent_files: List[str] = []
         self._recent_files_paths = deque(maxlen=self._max_recent_files)
 
         self.add_operations_from_namespace(
@@ -112,14 +113,16 @@ class MainWindow(QMainWindow):
             b_asic.special_operations, self._ui.special_operations_list
         )
 
-        self._shortcut_core = QShortcut(QKeySequence("Ctrl+R"), self._ui.operation_box)
-        self._shortcut_core.activated.connect(
+        self._shortcut_refresh_operations = QShortcut(
+            QKeySequence("Ctrl+R"), self._ui.operation_box
+        )
+        self._shortcut_refresh_operations.activated.connect(
             self._refresh_operations_list_from_namespace
         )
         self._scene.selectionChanged.connect(self._select_operations)
 
         self.move_button_index = 0
-        self.is_show_names = True
+        self._show_names = True
 
         self._check_show_names = QAction("Show operation names")
         self._check_show_names.triggered.connect(self.view_operation_names)
@@ -133,13 +136,13 @@ class MainWindow(QMainWindow):
         self._ui.aboutBASIC.triggered.connect(self.display_about_page)
         self._ui.keybindsBASIC.triggered.connect(self.display_keybindings_page)
         self._ui.core_operations_list.itemClicked.connect(
-            self.on_list_widget_item_clicked
+            self._on_list_widget_item_clicked
         )
         self._ui.special_operations_list.itemClicked.connect(
-            self.on_list_widget_item_clicked
+            self._on_list_widget_item_clicked
         )
         self._ui.custom_operations_list.itemClicked.connect(
-            self.on_list_widget_item_clicked
+            self._on_list_widget_item_clicked
         )
         self._ui.save_menu.triggered.connect(self.save_work)
         self._ui.load_menu.triggered.connect(self.load_work)
@@ -187,13 +190,13 @@ class MainWindow(QMainWindow):
 
     def view_operation_names(self) -> None:
         if self._check_show_names.isChecked():
-            self.is_show_names = True
+            self._show_names = True
         else:
-            self.is_show_names = False
+            self._show_names = False
 
         for operation in self._drag_operation_scenes:
-            operation.label.setOpacity(self.is_show_names)
-            operation.is_show_name = self.is_show_names
+            operation.label.setOpacity(self._show_names)
+            operation.show_name = self._show_names
 
     def _save_work(self) -> None:
         sfg = cast(SFG, self.sfg_widget.sfg)
@@ -265,7 +268,7 @@ class MainWindow(QMainWindow):
         self._load_sfg(sfg, positions)
         self._logger.info("Loaded SFG from path: " + str(module))
 
-    def _load_sfg(self, sfg, positions=None) -> None:
+    def _load_sfg(self, sfg: SFG, positions=None) -> None:
         if positions is None:
             positions = {}
 
@@ -276,29 +279,29 @@ class MainWindow(QMainWindow):
                 positions[op.graph_id][-1] if op.graph_id in positions else None,
             )
 
-        def connect_ports(ports):
+        def connect_ports(ports: Sequence[InputPort]):
             for port in ports:
                 for signal in port.signals:
-                    source = [
+                    sources = [
                         source
-                        for source in self._ports[
-                            self._drag_buttons[signal.source.operation]
-                        ]
+                        for source in self._drag_buttons[
+                            signal.source.operation
+                        ].port_list
                         if source.port is signal.source
                     ]
-                    destination = [
+                    destinations = [
                         destination
-                        for destination in self._ports[
-                            self._drag_buttons[signal.destination.operation]
-                        ]
+                        for destination in self._drag_buttons[
+                            signal.destination.operation
+                        ].port_list
                         if destination.port is signal.destination
                     ]
 
-                    if source and destination:
-                        self._connect_button(source[0], destination[0])
+                    if sources and destinations:
+                        self._connect_button(sources[0], destinations[0])
 
-            for port in self._pressed_ports:
-                port.select_port()
+            for pressed_port in self._pressed_ports:
+                pressed_port.select_port()
 
         for op in sfg.split():
             connect_ports(op.inputs)
@@ -312,13 +315,13 @@ class MainWindow(QMainWindow):
 
     def _create_recent_file_actions_and_menus(self):
         for i in range(self._max_recent_files):
-            recentFileAction = QAction(self._ui.recent_sfg)
-            recentFileAction.setVisible(False)
-            recentFileAction.triggered.connect(
-                lambda b=0, x=recentFileAction: self._open_recent_file(x)
+            recent_file_action = QAction(self._ui.recent_sfg)
+            recent_file_action.setVisible(False)
+            recent_file_action.triggered.connect(
+                lambda b=0, x=recent_file_action: self._open_recent_file(x)
             )
-            self._recent_files.append(recentFileAction)
-            self._ui.recent_sfg.addAction(recentFileAction)
+            self._recent_files.append(recent_file_action)
+            self._ui.recent_sfg.addAction(recent_file_action)
 
         self._update_recent_file_list()
 
@@ -370,8 +373,7 @@ class MainWindow(QMainWindow):
         self._drag_buttons.clear()
         self._drag_operation_scenes.clear()
         self._arrows.clear()
-        self._ports.clear()
-        self._signal_ports.clear()
+        self._arrow_ports.clear()
         self._sfg_dict.clear()
         self._scene.clear()
         self._logger.info("Workspace cleared.")
@@ -379,11 +381,11 @@ class MainWindow(QMainWindow):
     def create_sfg_from_toolbar(self) -> None:
         inputs = []
         outputs = []
-        for op in self._pressed_operations:
-            if isinstance(op.operation, Input):
-                inputs.append(op.operation)
-            elif isinstance(op.operation, Output):
-                outputs.append(op.operation)
+        for pressed_op in self._pressed_operations:
+            if isinstance(pressed_op.operation, Input):
+                inputs.append(pressed_op.operation)
+            elif isinstance(pressed_op.operation, Output):
+                outputs.append(pressed_op.operation)
 
         name, accepted = QInputDialog.getText(
             self, "Create SFG", "Name: ", QLineEdit.Normal
@@ -436,12 +438,12 @@ class MainWindow(QMainWindow):
                     return False
 
             try:
-                _signal_source_index = [
+                signal_source_index = [
                     source.operation.outputs.index(port)
                     for port in source.operation.outputs
                     if signal in port.signals
                 ]
-                _signal_2_source_index = [
+                signal_2_source_index = [
                     source2.operation.outputs.index(port)
                     for port in source2.operation.outputs
                     if signal_2 in port.signals
@@ -450,12 +452,12 @@ class MainWindow(QMainWindow):
                 return False  # Signal output connections not matching
 
             try:
-                _signal_destination_index = [
+                signal_destination_index = [
                     dest.operation.inputs.index(port)
                     for port in dest.operation.inputs
                     if signal in port.signals
                 ]
-                _signal_2_destination_index = [
+                signal_2_destination_index = [
                     dest2.operation.inputs.index(port)
                     for port in dest2.operation.inputs
                     if signal_2 in port.signals
@@ -464,37 +466,33 @@ class MainWindow(QMainWindow):
                 return False  # Signal input connections not matching
 
             return (
-                _signal_source_index == _signal_2_source_index
-                and _signal_destination_index == _signal_2_destination_index
+                signal_source_index == signal_2_source_index
+                and signal_destination_index == signal_2_destination_index
             )
 
         for _pressed_op in self._pressed_operations:
             for operation in sfg.operations:
                 for input_ in operation.inputs:
                     for signal in input_.signals:
-                        for line in self._signal_ports:
-                            if check_equality(line.signal, signal):
-                                line.source.operation.operation = (
-                                    signal.source.operation
-                                )
-                                line.destination.operation.operation = (
+                        for arrow in self._arrow_ports:
+                            if check_equality(arrow.signal, signal):
+                                arrow.set_source_operation(signal.source.operation)
+                                arrow.set_destination_operation(
                                     signal.destination.operation
                                 )
 
                 for output_ in operation.outputs:
                     for signal in output_.signals:
-                        for line in self._signal_ports:
-                            if check_equality(line.signal, signal):
-                                line.source.operation.operation = (
-                                    signal.source.operation
-                                )
-                                line.destination.operation.operation = (
+                        for arrow in self._arrow_ports:
+                            if check_equality(arrow.signal, signal):
+                                arrow.set_source_operation(signal.source.operation)
+                                arrow.set_destination_operation(
                                     signal.destination.operation
                                 )
 
-        for op in self._pressed_operations:
-            op.setToolTip(sfg.name)
-            self._operation_to_sfg[op] = sfg
+        for pressed_op in self._pressed_operations:
+            pressed_op.setToolTip(sfg.name)
+            self._operation_to_sfg[pressed_op] = sfg
 
         self._sfg_dict[sfg.name] = sfg
 
@@ -541,6 +539,10 @@ class MainWindow(QMainWindow):
 
         self.add_operations_from_namespace(namespace, self._ui.custom_operations_list)
 
+    def _update(self):
+        self._scene.update()
+        self._graphics_view.update()
+
     def add_operation(
         self,
         op: Operation,
@@ -581,7 +583,6 @@ class MainWindow(QMainWindow):
                 "border-color: black; border-width: 2px"
             )
             attr_button.add_ports()
-            self._ports[attr_button] = attr_button.ports
 
             icon_path = os.path.join(
                 os.path.dirname(__file__),
@@ -608,7 +609,7 @@ class MainWindow(QMainWindow):
                 )
             attr_button_scene.setFlag(QGraphicsItem.ItemIsSelectable, True)
             operation_label = QGraphicsTextItem(op.name, attr_button_scene)
-            if not self.is_show_names:
+            if not self._show_names:
                 operation_label.setOpacity(0)
             operation_label.setTransformOriginPoint(
                 operation_label.boundingRect().center()
@@ -651,7 +652,7 @@ class MainWindow(QMainWindow):
         )
         self._logger.info("Finished refreshing operation list.")
 
-    def on_list_widget_item_clicked(self, item) -> None:
+    def _on_list_widget_item_clicked(self, item) -> None:
         self._create_operation_item(item)
 
     def keyPressEvent(self, event) -> None:
@@ -714,8 +715,8 @@ class MainWindow(QMainWindow):
         self._logger.info(
             "Connecting: %s -> %s."
             % (
-                source.operation.operation.type_name(),
-                destination.operation.operation.type_name(),
+                source.operation.type_name(),
+                destination.operation.type_name(),
             )
         )
         try:
@@ -723,18 +724,18 @@ class MainWindow(QMainWindow):
         except StopIteration:
             arrow = Arrow(source, destination, self)
 
-        if arrow not in self._signal_ports:
-            self._signal_ports[arrow] = []
+        if arrow not in self._arrow_ports:
+            self._arrow_ports[arrow] = []
 
-        self._signal_ports[arrow].append((source, destination))
+        self._arrow_ports[arrow].append((source, destination))
         self._scene.addItem(arrow)
         self._arrows.append(arrow)
 
         self.update()
 
     def paintEvent(self, event) -> None:
-        for signal in self._signal_ports.keys():
-            signal.moveLine()
+        for arrow in self._arrow_ports:
+            arrow.update_arrow()
 
     def _select_operations(self) -> None:
         selected = [button.widget() for button in self._scene.selectedItems()]

b_asic/GUI/port_button.py

@@ -9,6 +9,7 @@ from qtpy.QtWidgets import QMenu, QPushButton
 
 if TYPE_CHECKING:
     from b_asic.GUI.drag_button import DragButton
+    from b_asic.operation import Operation
     from b_asic.port import Port
 
 
@@ -19,20 +20,19 @@ class PortButton(QPushButton):
     Parameters
     ----------
     name : str
-    operation : :class:`~b_asic.GUI.drag_button.DragButton`
+    operation_button : :class:`~b_asic.GUI.drag_button.DragButton`
     port : :class:`~b_asic.port.Port`
     """
 
     connectionRequested = Signal(QPushButton)
     moved = Signal()
 
-    def __init__(self, name: str, operation: "DragButton", port: "Port"):
-        super().__init__(name, parent=operation)
+    def __init__(self, name: str, operation_button: "DragButton", port: "Port"):
+        super().__init__(name, parent=operation_button)
         self.pressed = False
-        self._window = operation._window
+        self._window = operation_button._window
         self.port = port
-        self.operation = operation
-        self.clicked = 0
+        self._operation_button = operation_button
         self._m_drag = False
         self._m_press = False
         self.setAcceptDrops(True)
@@ -41,6 +41,11 @@ class PortButton(QPushButton):
         self.setStyleSheet("background-color: white")
         self.connectionRequested.connect(self._window._connect_callback)
 
+    @property
+    def operation(self) -> "Operation":
+        """Operation associated with PortButton."""
+        return self._operation_button.operation
+
     def contextMenuEvent(self, event):
         menu = QMenu()
         menu.addAction("Connect", lambda: self.connectionRequested.emit(self))

b_asic/GUI/properties_window.py

@@ -52,7 +52,7 @@ class PropertiesWindow(QDialog):
 
         self._show_name_layout = QHBoxLayout()
         self._check_show_name = QCheckBox("Show name?")
-        self._check_show_name.setChecked(self.operation.is_show_name)
+        self._check_show_name.setChecked(self.operation.show_name)
         self._check_show_name.setLayoutDirection(Qt.RightToLeft)
         self._check_show_name.setStyleSheet("spacing: 170px")
         self._show_name_layout.addWidget(self._check_show_name)
@@ -155,10 +155,10 @@ class PropertiesWindow(QDialog):
 
         if self._check_show_name.isChecked():
             self.operation.label.setOpacity(1)
-            self.operation.is_show_name = True
+            self.operation.show_name = True
         else:
             self.operation.label.setOpacity(0)
-            self.operation.is_show_name = False
+            self.operation.show_name = False
 
         self.operation.operation.set_latency_offsets(
             {

b_asic/utils.py

@@ -9,7 +9,7 @@ def interleave(*args) -> List[Num]:
     """
     Interleave a number of arrays.
 
-    For the input ``interleave([1, 2], [3, 4])``, return ``[1, 2, 3, 4]``.
+    For the input ``interleave([1, 2], [3, 4])``, return ``[1, 3, 2, 4]``.
 
     Parameters
     ----------

test/test_gui.py

@@ -224,7 +224,7 @@ def test_add_operation_and_create_sfg(qtbot, monkeypatch):
     assert not widget._arrows
 
     # Click on first port
-    in1_port = widget._ports[widget._drag_buttons[in1]][0]
+    in1_port = widget._drag_buttons[in1].port_list[0]
     qtbot.mouseClick(
         in1_port,
         QtCore.Qt.MouseButton.LeftButton,
@@ -232,7 +232,7 @@ def test_add_operation_and_create_sfg(qtbot, monkeypatch):
     assert len(widget._pressed_ports) == 1
 
     # Click on second port
-    sqrt_in_port = widget._ports[widget._drag_buttons[sqrt]][0]
+    sqrt_in_port = widget._drag_buttons[sqrt].port_list[0]
     qtbot.mouseClick(
         sqrt_in_port,
         QtCore.Qt.MouseButton.LeftButton,
@@ -248,13 +248,13 @@ def test_add_operation_and_create_sfg(qtbot, monkeypatch):
     assert len(widget._arrows) == 1
 
     # Click on first port
-    sqrt_out_port = widget._ports[widget._drag_buttons[sqrt]][1]
+    sqrt_out_port = widget._drag_buttons[sqrt].port_list[1]
     qtbot.mouseClick(
         sqrt_out_port,
         QtCore.Qt.MouseButton.LeftButton,
     )
     # Click on second port
-    out1_port = widget._ports[widget._drag_buttons[out1]][0]
+    out1_port = widget._drag_buttons[out1].port_list[0]
     qtbot.mouseClick(
         out1_port,
         QtCore.Qt.MouseButton.LeftButton,