Merge pull request #125 from ROBOTIS-move/feature-fix-shortcut

Fix bug where rectangle and polygon were set inversely in the edit stage
ROBOTIS-move · Aug 28, 2024 · b3c1e8d · b3c1e8d
2 parents 7d347d9 + 7260ecc
commit b3c1e8d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/labelme/app.py b/labelme/app.py
@@ -1191,9 +1191,9 @@ def toggleDrawMode(self, edit=True, createMode="polygon"):
                 self.actions.createRectangleMode.setEnabled(True)
             else:
                 self.actions.createRectangleMode.setEnabled(
-                    self._classType is None or 'segmentation' in self._classType)
-                self.actions.createMode.setEnabled(
                     self._classType is None or 'detection' in self._classType)
+                self.actions.createMode.setEnabled(
+                    self._classType is None or 'segmentation' in self._classType)
             self.actions.createCircleMode.setEnabled(False)
             self.actions.createLineMode.setEnabled(False)
             self.actions.createPointMode.setEnabled(False)
@@ -1203,15 +1203,15 @@ def toggleDrawMode(self, edit=True, createMode="polygon"):
                 self.actions.createMode.setEnabled(True)
                 self.actions.createRectangleMode.setEnabled(True)
             else:
-                if createMode == "polygon":
+                if createMode == "rectangle":
                     self.actions.createMode.setEnabled(False)
                     self.actions.createRectangleMode.setEnabled(
                         self._classType is None or 'detection' in self._classType)
                     self.actions.createCircleMode.setEnabled(False)
                     self.actions.createLineMode.setEnabled(False)
                     self.actions.createPointMode.setEnabled(False)
                     self.actions.createLineStripMode.setEnabled(False)
-                elif createMode == "rectangle":
+                elif createMode == "polygon":
                     self.actions.createMode.setEnabled(
                         self._classType is None or 'segmentation' in self._classType
                     )

diff --git a/version.xml b/version.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <maintainer email="[email protected]">Pyo</maintainer>
   <maintainer email="[email protected]">SungHyeon Oh</maintainer>
   <license>GPLv3</license>