Position the label dialog under the cursor

canvas.py

@@ -19,7 +19,7 @@ CURSOR_GRAB    = Qt.OpenHandCursor
 class Canvas(QWidget):
     zoomRequest = pyqtSignal(int)
     scrollRequest = pyqtSignal(int, int)
-    newShape = pyqtSignal(QPoint)
+    newShape = pyqtSignal()
     selectionChanged = pyqtSignal(bool)
     shapeMoved = pyqtSignal()
     drawingPolygon = pyqtSignal(bool)
@@ -393,7 +393,7 @@ class Canvas(QWidget):
         self.shapes.append(self.current)
         self.current = None
         self.setHiding(False)
-        self.newShape.emit(self.mapToGlobal(toPoint(self.line[1])))
+        self.newShape.emit()
         self.update()
 
     def closeEnough(self, p1, p2):
@@ -519,10 +519,3 @@ class Canvas(QWidget):
         self.pixmap = None
         self.update()
 
-
-def toPoint(pointf):
-    return QPoint(int(pointf.x()), int(pointf.y()))
-
-def pp(p):
-    return '%.2f, %.2f' % (p.x(), p.y())
-

labelDialog.py

@@ -4,6 +4,9 @@ from PyQt4.QtCore import *
 
 from lib import newIcon, labelValidator
 
+# TODO:
+# - Calculate optimal position so as not to go out of screen area.
+
 BB = QDialogButtonBox
 
 class LabelDialog(QDialog):
@@ -31,11 +34,10 @@ class LabelDialog(QDialog):
     def postProcess(self):
         self.edit.setText(self.edit.text().trimmed())
 
-    def popUp(self, text='', position=None):
+    def popUp(self, text=''):
         self.edit.setText(text)
         self.edit.setSelection(0, len(text))
         self.edit.setFocus(Qt.PopupFocusReason)
-        if position is not None:
-            self.move(position)
+        self.move(QCursor.pos())
         return self.edit.text() if self.exec_() else None
 

labelme.py

@@ -555,12 +555,12 @@ class MainWindow(QMainWindow, WindowMixin):
             self.canvas.setShapeVisible(shape, item.checkState() == Qt.Checked)
 
     ## Callback functions:
-    def newShape(self, position):
+    def newShape(self):
         """Pop-up and give focus to the label editor.
 
         position MUST be in global coordinates.
         """
-        text = self.labelDialog.popUp(position=position)
+        text = self.labelDialog.popUp()
         if text is not None:
             self.addLabel(self.canvas.setLastLabel(text))
             if self.beginner(): # Switch to edit mode.