Browse Source

Fix bug when switching modes

The state of the buttons was not changed properly
Michael Pitidis 13 years ago
parent
commit
92ddbcce0f
2 changed files with 5 additions and 3 deletions
  1. 3 2
      labelDialog.py
  2. 2 1
      labelme.py

+ 3 - 2
labelDialog.py

@@ -34,10 +34,11 @@ class LabelDialog(QDialog):
     def postProcess(self):
     def postProcess(self):
         self.edit.setText(self.edit.text().trimmed())
         self.edit.setText(self.edit.text().trimmed())
 
 
-    def popUp(self, text=''):
+    def popUp(self, text='', move=True):
         self.edit.setText(text)
         self.edit.setText(text)
         self.edit.setSelection(0, len(text))
         self.edit.setSelection(0, len(text))
         self.edit.setFocus(Qt.PopupFocusReason)
         self.edit.setFocus(Qt.PopupFocusReason)
-        self.move(QCursor.pos())
+        if move:
+            self.move(QCursor.pos())
         return self.edit.text() if self.exec_() else None
         return self.edit.text() if self.exec_() else None
 
 

+ 2 - 1
labelme.py

@@ -347,11 +347,12 @@ class MainWindow(QMainWindow, WindowMixin):
 
 
     def toggleAdvancedMode(self, value=True):
     def toggleAdvancedMode(self, value=True):
         self._beginner = not value
         self._beginner = not value
+        self.canvas.setEditing(True)
         self.populateModeActions()
         self.populateModeActions()
         self.editButton.setVisible(not value)
         self.editButton.setVisible(not value)
         if value:
         if value:
             self.actions.createMode.setEnabled(True)
             self.actions.createMode.setEnabled(True)
-            self.actions.editMode.setEnabled(True)
+            self.actions.editMode.setEnabled(False)
             self.dock.setFeatures(self.dock.features() | self.dockFeatures)
             self.dock.setFeatures(self.dock.features() | self.dockFeatures)
         else:
         else:
             self.dock.setFeatures(self.dock.features() ^ self.dockFeatures)
             self.dock.setFeatures(self.dock.features() ^ self.dockFeatures)