Prechádzať zdrojové kódy

Make right click select shapes as well

Michael Pitidis 13 rokov pred
rodič
commit
05a3bfe7ad
3 zmenil súbory, kde vykonal 6 pridanie a 7 odobranie
  1. 5 5
      canvas.py
  2. 1 1
      labelme.py
  3. 0 1
      shape.py

+ 5 - 5
canvas.py

@@ -109,11 +109,12 @@ class Canvas(QWidget):
                     self.repaint()
             else:
                 self.selectShape(pos)
-                self.repaint()
                 self.prevPoint = pos
-        #elif ev.button() == Qt.RightButton and not self.editing():
-        #    self.selectShape(pos)
-        #    self.prevPoint = pos
+                self.repaint()
+        elif ev.button() == Qt.RightButton and not self.editing():
+            self.selectShape(pos)
+            self.prevPoint = pos
+            self.repaint()
 
     def hideBackroundShapes(self, value):
         self.hideBackround = value
@@ -199,7 +200,6 @@ class Canvas(QWidget):
             self.repaint()
             return shape
 
-
     def paintEvent(self, event):
         if not self.pixmap:
             return super(Canvas, self).paintEvent(event)

+ 1 - 1
labelme.py

@@ -24,7 +24,7 @@ from labelFile import LabelFile
 __appname__ = 'labelme'
 
 # FIXME
-# - Select shapes with right click as well.
+# - Add copy/move menu when dragging with right click.
 # - [low] Label validation/postprocessing breaks with TAB.
 
 # TODO:

+ 0 - 1
shape.py

@@ -91,7 +91,6 @@ class Shape(object):
     def copy(self):
         shape = Shape("Copy of %s" % self.label )
         shape.points= [p for p in self.points]
-        #shape.label = 
         shape.fill = self.fill
         shape.selected = self.selected
         return shape