Add thumbnail preview functionality to proof panel and model

zxlive/commands.py

@@ -8,7 +8,6 @@
 
 from PySide6.QtCore import QModelIndex
 from PySide6.QtGui import QUndoCommand
-from PySide6.QtWidgets import QListView
 from pyzx.graph.diff import GraphDiff
 from pyzx.symbolic import Poly
 from pyzx.utils import EdgeType, VertexType, get_w_partner, vertex_is_w, get_w_io, get_z_box_label, set_z_box_label
@@ -445,7 +444,7 @@ class AddRewriteStep(UpdateGraph):
     The rewrite is inserted after the currently selected step. In particular, it
     replaces all rewrites that were previously after the current selection.
     """
-    step_view: QListView
+    step_view: ProofStepView
     name: str
     diff: Optional[GraphDiff] = None
 

zxlive/graphview.py

@@ -64,6 +64,14 @@ def __init__(self, start: QPointF, shift: bool = False) -> None:
 
 GRID_SCALE = SCALE / 2
 
+# Maps arrow keys to (qubit_delta, row_delta) offsets for vertex movement.
+_ARROW_OFFSETS: dict[int, tuple[int, int]] = {
+    Qt.Key.Key_Up:    (-1,  0),
+    Qt.Key.Key_Down:  ( 1,  0),
+    Qt.Key.Key_Left:  ( 0, -1),
+    Qt.Key.Key_Right: ( 0,  1),
+}
+
 
 class GraphView(QGraphicsView):
     """QtWidget containing a graph
@@ -74,6 +82,7 @@ class GraphView(QGraphicsView):
 
     wand_trace_finished = Signal(object)
     merge_triggered = Signal()
+    keyboard_vertices_moved = Signal()
     draw_background_lines = True
 
     def __init__(self, graph_scene: GraphScene) -> None:
@@ -152,31 +161,31 @@ def mousePressEvent(self, e: QMouseEvent) -> None:
 
     def keyPressEvent(self, e: QKeyEvent) -> None:
         """Logic for moving selected vertices with arrow keys and merging selected vertices with Ctrl+M"""
-        if Qt.KeyboardModifier.ControlModifier & e.modifiers():
-            g = self.graph_scene.g
-            if Qt.KeyboardModifier.ShiftModifier & e.modifiers():
-                distance = 1 / get_settings_value("snap-granularity", int)
-            else:
-                distance = 0.5
-            if e.key() == Qt.Key.Key_M:
-                # Merge vertices at the same position
-                self.merge_triggered.emit()
-                return
-            for v in self.graph_scene.selected_vertices:
-                vitem = self.graph_scene.vertex_map[v]
-                x = g.row(v)
-                y = g.qubit(v)
-                if e.key() == Qt.Key.Key_Up:
-                    g.set_position(v, y - distance, x)
-                elif e.key() == Qt.Key.Key_Down:
-                    g.set_position(v, y + distance, x)
-                elif e.key() == Qt.Key.Key_Left:
-                    g.set_position(v, y, x - distance)
-                elif e.key() == Qt.Key.Key_Right:
-                    g.set_position(v, y, x + distance)
-                vitem.set_pos_from_graph()
-        else:
+        if not (Qt.KeyboardModifier.ControlModifier & e.modifiers()):
             super().keyPressEvent(e)
+            return
+
+        if e.key() == Qt.Key.Key_M:
+            self.merge_triggered.emit()
+            return
+
+        offsets = _ARROW_OFFSETS.get(e.key())
+        if offsets is None:
+            return
+
+        g = self.graph_scene.g
+        if Qt.KeyboardModifier.ShiftModifier & e.modifiers():
+            distance = 1 / get_settings_value("snap-granularity", int)
+        else:
+            distance = 0.5
+
+        dy, dx = offsets
+        selected = list(self.graph_scene.selected_vertices)
+        for v in selected:
+            g.set_position(v, g.qubit(v) + dy * distance, g.row(v) + dx * distance)
+            self.graph_scene.vertex_map[v].set_pos_from_graph()
+        if selected:
+            self.keyboard_vertices_moved.emit()
 
     # TODO: Fix code complexity
     # noqa: complexipy

zxlive/mainwindow.py

@@ -224,11 +224,17 @@ def native_shortcut(key: QKeySequence.StandardKey) -> str:
         self.fit_view_action = self._new_action(
             "Fit view", self.fit_view, QKeySequence("C"),
             "Fits the view to the diagram")
+        self.show_thumbnails_action = self._new_action(
+            "Show thumbnails", self.toggle_thumbnails, QKeySequence("t"),
+            "Toggle proof step diagram previews", checkable=True)
+        self.show_thumbnails_action.setChecked(get_settings_value("proof/show-thumbnails", bool))
 
         view_menu = menu.addMenu("&View")
         view_menu.addAction(self.zoom_in_action)
         view_menu.addAction(self.zoom_out_action)
         view_menu.addAction(self.fit_view_action)
+        view_menu.addSeparator()
+        view_menu.addAction(self.show_thumbnails_action)
 
         new_rewrite_from_file = self._new_action(
             "New rewrite from file", lambda: create_new_rewrite(self),
@@ -290,6 +296,9 @@ def _reset_menus(self, has_active_tab: bool) -> None:
         # Export to tikz and gif are enabled only if there is a proof in the active tab.
         self.export_tikz_proof.setEnabled(has_active_tab and isinstance(self.active_panel, ProofPanel))
         self.export_gif_proof.setEnabled(has_active_tab and isinstance(self.active_panel, ProofPanel))
+        self.show_thumbnails_action.setEnabled(has_active_tab and isinstance(self.active_panel, ProofPanel))
+        if has_active_tab and isinstance(self.active_panel, ProofPanel):
+            self.show_thumbnails_action.setChecked(self.active_panel.step_view.thumbnails_visible)
 
         # Paste is enabled only if there is something in the clipboard.
         self.paste_action.setEnabled(has_active_tab and self._has_pasteable_clipboard_data())
@@ -306,10 +315,13 @@ def _new_action(
             self, name: str, trigger: Callable,
             shortcut: QKeySequence | QKeySequence.StandardKey | None,
             tooltip: str, icon_file: Optional[str] = None,
-            alt_shortcut: Optional[QKeySequence | QKeySequence.StandardKey] = None
+            alt_shortcut: Optional[QKeySequence | QKeySequence.StandardKey] = None,
+            checkable: bool = False
             ) -> QAction:
         assert not alt_shortcut or shortcut
         action = QAction(name, self)
+        if checkable:
+            action.setCheckable(True)
         if icon_file:
             action.setIcon(QIcon(get_data(f"icons/{icon_file}")))
         action.setToolTip(tooltip)
@@ -514,8 +526,11 @@ def update_tab_name(self, clean: bool) -> None:
     def tab_changed(self, i: int) -> None:
         if isinstance(self.active_panel, ProofPanel):
             self.proof_as_rewrite_action.setEnabled(True)
+            self.show_thumbnails_action.setEnabled(True)
+            self.show_thumbnails_action.setChecked(self.active_panel.step_view.thumbnails_visible)
         else:
             self.proof_as_rewrite_action.setEnabled(False)
+            self.show_thumbnails_action.setEnabled(False)
         self._undo_changed()
         self._redo_changed()
         if self.active_panel:
@@ -763,6 +778,14 @@ def _new_panel(self, panel: BasePanel, name: str) -> None:
         panel.undo_stack.canRedoChanged.connect(self._redo_changed)
         panel.play_sound_signal.connect(self.play_sound)
         panel.undo_stack.indexChanged.connect(self._auto_save_if_needed)
+        if isinstance(panel, ProofPanel):
+            panel.step_view.thumbnails_toggled.connect(self._on_proof_thumbnails_toggled)
+
+    def _on_proof_thumbnails_toggled(self, checked: bool) -> None:
+        # Check if the signal came from the currently active panel
+        if hasattr(self, 'active_panel') and isinstance(self.active_panel, ProofPanel):
+            if self.sender() is self.active_panel.step_view:
+                self.show_thumbnails_action.setChecked(checked)
 
     def _auto_save_if_needed(self) -> None:
         panel = self.active_panel
@@ -984,6 +1007,13 @@ def update_font(self) -> None:
             w = cast(BasePanel, self.tab_widget.widget(i))
             w.update_font()
 
+    def toggle_thumbnails(self) -> None:
+        """Toggle the show thumbnails setting from the View menu."""
+        checked = self.show_thumbnails_action.isChecked()
+        # update current proof panel
+        if isinstance(self.active_panel, ProofPanel):
+            self.active_panel.step_view.thumbnails_visible = checked
+
     def toggle_auto_save(self) -> None:
         """Toggle the auto-save setting from the File menu."""
         from .common import set_settings_value