Added c2c plugin and key handling

Author: vshekar

main.py

@@ -23,14 +23,14 @@
 from qmicroscope.container import Container
 from qmicroscope.settings import Settings
 from qmicroscope.plugins.record_plugin import RecordPlugin
-
+from qmicroscope.plugins.c2c_plugin import C2CPlugin
 
 class Form(QMainWindow):
     def __init__(self, parent=None):
         super(Form, self).__init__(parent)
         # Create widgets
         self.setWindowTitle("NSLS-II Microscope Widget")
-        self.container = Container(self, plugins=[RecordPlugin])
+        self.container = Container(self, plugins=[RecordPlugin, C2CPlugin])
         self.container.count = 3
         self.container.size = [2, 2]
         self.microscope = self.container.microscope(0)

monitor.py

@@ -1,34 +1,35 @@
 import sys
 
-
 from qtpy.QtCore import QPoint, QSettings, QSize, Qt
-
 from qtpy.QtWidgets import (
+    QApplication,
     QCheckBox,
+    QFormLayout,
+    QHBoxLayout,
     QLineEdit,
+    QMainWindow,
     QPushButton,
-    QApplication,
-    QVBoxLayout,
-    QHBoxLayout,
-    QFormLayout,
     QSpinBox,
-    QMainWindow,
-    QWidget,
     QSplitter,
+    QVBoxLayout,
+    QWidget,
 )
-from qmicroscope.microscope import Microscope
+
 from qmicroscope.container import Container
-from qmicroscope.settings import Settings
+from qmicroscope.microscope import Microscope
 from qmicroscope.plugins import (
-    ZoomPlugin,
+    C2CPlugin,
+    CrossHairPlugin,
     GridPlugin,
+    MouseWheelCameraZoomPlugin,
     PresetPlugin,
-    ScalePlugin,
-    TogglePlugin,
-    CrossHairPlugin,
     RecordPlugin,
+    ScalePlugin,
     SquareGridPlugin,
+    TogglePlugin,
+    ZoomPlugin,
 )
+from qmicroscope.settings import Settings
 
 
 class Form(QMainWindow):
@@ -49,6 +50,8 @@ def __init__(self, parent=None):
             ScalePlugin,
             RecordPlugin,
             SquareGridPlugin,
+            MouseWheelCameraZoomPlugin,
+            C2CPlugin,
         ]
         self.main_microscope = Microscope(self, viewport=False, plugins=plugins)
         self.main_microscope.scale = [0, 500]

qmicroscope/microscope.py

@@ -1,19 +1,29 @@
 from collections.abc import Iterable
-from qtpy.QtCore import Signal, QByteArray, QPoint, QSize, QSettings, QEvent
-from qtpy.QtGui import QImage, QPainter, QContextMenuEvent, QMouseEvent, QPixmap, QKeyEvent
+from typing import Any, Dict, List, Optional
+
+from PyQt5 import QtGui
+from qtpy.QtCore import QByteArray, QEvent, QPoint, QSettings, QSize, Qt, Signal
+from qtpy.QtGui import (
+    QContextMenuEvent,
+    QImage,
+    QKeyEvent,
+    QMouseEvent,
+    QPainter,
+    QPixmap,
+)
 from qtpy.QtWidgets import (
-    QWidget,
-    QMenu,
     QAction,
-    QGraphicsView,
-    QGraphicsScene,
     QGraphicsPixmapItem,
+    QGraphicsScene,
+    QGraphicsView,
+    QMenu,
     QVBoxLayout,
+    QWidget,
 )
-from typing import List, Any, Dict, Optional
-from .widgets.downloader import VideoThread
-from .plugins.base_plugin import BasePlugin, SupportsBasePlugin
+
 from .plugin_settings import PluginSettingsDialog
+from .plugins.base_plugin import BasePlugin, SupportsBasePlugin
+from .widgets.downloader import VideoThread
 
 
 class Microscope(QWidget):
@@ -25,7 +35,7 @@ class Microscope(QWidget):
     mouse_wheel_signal: Signal = Signal(object)
     key_press_signal: Signal = Signal(object)
     key_release_signal: Signal = Signal(object)
-    
+
     def __init__(
         self,
         parent: Optional[QWidget] = None,
@@ -41,6 +51,7 @@ def __init__(
         self.pixmap = QGraphicsPixmapItem(None)
         self.scene = QGraphicsScene(self)
         self.view = QGraphicsView(self.scene)
+        self.view.setFocusPolicy(Qt.FocusPolicy.StrongFocus)
         self.view.setRenderHints(QPainter.Antialiasing | QPainter.SmoothPixmapTransform)
         self.scene.addItem(self.pixmap)
         self.layout = QVBoxLayout()
@@ -77,6 +88,7 @@ def __init__(
             self.key_release_signal.connect(plugin.key_release_event)
 
         self.view.viewport().installEventFilter(self)
+        self.view.installEventFilter(self)
 
     def updatedImageSize(self) -> None:
         if self.image.size() != self.minimumSize():
@@ -113,54 +125,38 @@ def eventFilter(self, obj, event):
                 self.mouse_move_event(event)
             if event.type() == QEvent.Wheel:
                 self.mouse_wheel_event(event)
+        if obj is self.view:
+            if event.type() == QEvent.Type.Enter:
+                self.view.setFocus()
+                print("Entered widget")
+            if event.type() == QEvent.Type.Leave:
+                self.view.clearFocus()
+                print("Leaving Widget")
             if event.type() == QEvent.KeyPress:
                 self.key_press_event(event)
             if event.type() == QEvent.KeyRelease:
                 self.key_release_event(event)
+
         return QWidget.eventFilter(self, obj, event)
 
     def key_press_event(self, event: QKeyEvent):
         self.key_press_signal.emit(event)
 
     def key_release_event(self, event: QKeyEvent):
-        self.key_release_event.emit(event)
+        self.key_release_signal.emit(event)
 
     def mouse_wheel_event(self, event):
-        self.mouse_wheel_signal.emit(event.angleDelta())        
-        """
-        # Zoom Factor
-        zoomInFactor = 1.05
-        zoomOutFactor = 1 / zoomInFactor
-
-        # Set Anchors
-        self.view.setTransformationAnchor(QGraphicsView.NoAnchor)
-        self.view.setResizeAnchor(QGraphicsView.NoAnchor)
-
-        # Save the scene pos
-        oldPos = self.view.mapToScene(event.pos())
-
-        # Zoom
-        if event.angleDelta().y() > 0:
-            zoomFactor = zoomInFactor
-        else:
-            zoomFactor = zoomOutFactor
-        self.view.scale(zoomFactor, zoomFactor)
-
-        # Get the new position
-        newPos = self.view.mapToScene(event.pos())
+        print(event.angleDelta())
+        self.mouse_wheel_signal.emit(event.angleDelta())
 
-        # Move scene to old position
-        delta = newPos - oldPos
-        self.view.translate(delta.x(), delta.y())
-        """
-        
     def mouse_press_event(self, a0: QMouseEvent):
         if self.viewport:
             self.clicked_url.emit(self.settings_group)
 
         self.mouse_press_signal.emit(a0)
 
     def mouse_move_event(self, a0: QMouseEvent):
+        self.setFocus()
         self.mouse_move_signal.emit(a0)
 
     def mouse_release_event(self, a0: QMouseEvent) -> None:
@@ -194,7 +190,9 @@ def addMenuItem(self, item):
             self.menu.addMenu(item)
 
     def _config_plugins(self):
-        plugin_settings_dialog = PluginSettingsDialog(parent=self, plugins=self.plugins.values())
+        plugin_settings_dialog = PluginSettingsDialog(
+            parent=self, plugins=self.plugins.values()
+        )
 
     def sizeHint(self) -> QSize:
         return QSize(400, 400)

qmicroscope/plugins/c2c_plugin.py

@@ -1,14 +1,19 @@
 import typing
-from qtpy.QtCore import QObject, Signal
+
+from qtpy.QtCore import QObject, QPoint, Qt, Signal
+from qtpy.QtGui import QKeyEvent
+
 from qmicroscope.plugins.base_plugin import BasePlugin
+
 if typing.TYPE_CHECKING:
     from qmicroscope.microscope import Microscope
 
+
 class ClickedSignal(QObject):
     clicked = Signal(object)
-    
+
+
 class C2CPlugin(BasePlugin):
-    
     def __init__(self, parent: "Optional[Microscope]" = None):
         """Initializes the C2CPlugin instance.
 
@@ -20,15 +25,24 @@ def __init__(self, parent: "Optional[Microscope]" = None):
         self.parent = parent
         self.c2c_active = False
         self.clicked_signal = ClickedSignal()
-        
 
     def mouse_press_event(self, event):
         if self.parent:
             self.parent: "Microscope"
             if self.c2c_active:
-                delta = event.pos() - self.parent.center 
+                delta = event.pos() - QPoint(
+                    int(self.parent.view.width() / 2),
+                    int(self.parent.view.height() / 2),
+                )
                 print(delta)
                 self.clicked_signal.clicked.emit(delta)
 
     def key_press_event(self, event):
-        print(event)
+        if event.key() == Qt.Key.Key_Control:
+            self.c2c_active = True
+            self.parent.setCursor(Qt.CursorShape.CrossCursor)
+
+    def key_release_event(self, event: QKeyEvent):
+        if event.key() == Qt.Key.Key_Control:
+            self.c2c_active = False
+            self.parent.unsetCursor()

qmicroscope/plugins/square_grid.py

@@ -1,21 +1,22 @@
-from typing import Optional, Dict, Any, TYPE_CHECKING
+from collections import defaultdict
+from typing import TYPE_CHECKING, Any, Dict, Optional
+
+from qtpy.QtCore import QObject, QPoint, QRect, QRectF, Qt, Signal
+from qtpy.QtGui import QColor, QMouseEvent, QPen
 from qtpy.QtWidgets import (
     QAction,
     QColorDialog,
-    QGraphicsScene,
-    QGroupBox,
     QFormLayout,
-    QSpinBox,
     QGraphicsRectItem,
+    QGraphicsScene,
     QGraphicsSceneMouseEvent,
+    QGroupBox,
+    QSpinBox,
 )
-from qtpy.QtCore import QPoint, Qt, QRect, QRectF, Signal, QObject
-from qtpy.QtGui import QColor, QPen
-from qmicroscope.widgets.rubberband import ResizableRubberBand
-from qmicroscope.widgets.color_button import ColorButton
+
 from qmicroscope.plugins.base_plugin import BasePlugin
-from qtpy.QtGui import QMouseEvent
-from collections import defaultdict
+from qmicroscope.widgets.color_button import ColorButton
+from qmicroscope.widgets.rubberband import ResizableRubberBand
 
 if TYPE_CHECKING:
     from qmicroscope.microscope import Microscope
@@ -342,7 +343,7 @@ def paintBoxes(self, scene: QGraphicsScene) -> None:
         num_cols = int(abs(x2 - x1) / self._cell_size)
         self._grid_cells: "list[list[CellGraphicsItem]]" = []
         center_x = (x2 - x1) / 2
-        center_y = (y2 / y1) / 2
+        center_y = (y2 - y1) / 2
 
         for c in range(num_cols):
             row = []