Optimize crosshair

wkentaro · Aug 2, 2024 · 5bd4d67 · 5bd4d67
1 parent 6764611
commit 5bd4d67
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/labelme/shape.py b/labelme/shape.py
@@ -176,9 +176,6 @@ def paint(self, painter):
         if self.mask is None and not self.points:
             return
 
-        painter.save()
-        painter.scale(1 / self.scale, 1 / self.scale)
-
         color = self.select_line_color if self.selected else self.line_color
         pen = QtGui.QPen(color)
         # Try using integer sizes for smoother drawing(?)
@@ -284,8 +281,6 @@ def paint(self, painter):
             painter.drawPath(negative_vrtx_path)
             painter.fillPath(negative_vrtx_path, QtGui.QColor(255, 0, 0, 255))
 
-        painter.restore()
-
     def drawVertex(self, path, i):
         d = self.point_size
         shape = self.point_type

diff --git a/labelme/widgets/canvas.py b/labelme/widgets/canvas.py
@@ -697,6 +697,8 @@ def paintEvent(self, event):
 
         p.drawPixmap(0, 0, self.pixmap)
 
+        p.scale(1 / self.scale, 1 / self.scale)
+
         # draw crosshair
         if (
             self._crosshair[self._createMode]
@@ -707,14 +709,14 @@ def paintEvent(self, event):
             p.setPen(QtGui.QColor(0, 0, 0))
             p.drawLine(
                 0,
-                int(self.prevMovePoint.y()),
+                int(self.prevMovePoint.y() * self.scale),
                 self.width() - 1,
-                int(self.prevMovePoint.y()),
+                int(self.prevMovePoint.y() * self.scale),
             )
             p.drawLine(
-                int(self.prevMovePoint.x()),
+                int(self.prevMovePoint.x() * self.scale),
                 0,
-                int(self.prevMovePoint.x()),
+                int(self.prevMovePoint.x() * self.scale),
                 self.height() - 1,
             )