Move widgets from app to labelme.widgets

labelme/app.py

@@ -30,7 +30,9 @@ from labelme.utils import newIcon
 from labelme.utils import struct
 from labelme.widgets import Canvas
 from labelme.widgets import ColorDialog
+from labelme.widgets import EscapableQListWidget
 from labelme.widgets import LabelDialog
+from labelme.widgets import LabelQListWidget
 from labelme.widgets import ToolBar
 from labelme.widgets import ZoomWidget
 
@@ -67,57 +69,6 @@ class WindowMixin(object):
         return toolbar
 
 
-class EscapableQListWidget(QtWidgets.QListWidget):
-
-    def keyPressEvent(self, event):
-        if event.key() == Qt.Key_Escape:
-            self.clearSelection()
-
-
-class LabelQListWidget(QtWidgets.QListWidget):
-
-    def __init__(self, *args, **kwargs):
-        super(LabelQListWidget, self).__init__(*args, **kwargs)
-        self.canvas = None
-        self.itemsToShapes = []
-
-    def get_shape_from_item(self, item):
-        for index, (item_, shape) in enumerate(self.itemsToShapes):
-            if item_ is item:
-                return shape
-
-    def get_item_from_shape(self, shape):
-        for index, (item, shape_) in enumerate(self.itemsToShapes):
-            if shape_ is shape:
-                return item
-
-    def clear(self):
-        super(LabelQListWidget, self).clear()
-        self.itemsToShapes = []
-
-    def setParent(self, parent):
-        self.parent = parent
-
-    def dropEvent(self, event):
-        shapes = self.shapes
-        super(LabelQListWidget, self).dropEvent(event)
-        if self.shapes == shapes:
-            return
-        if self.canvas is None:
-            raise RuntimeError('self.canvas must be set beforehand.')
-        self.parent.setDirty()
-        self.canvas.loadShapes(shapes)
-
-    @property
-    def shapes(self):
-        shapes = []
-        for i in range(self.count()):
-            item = self.item(i)
-            shape = self.get_shape_from_item(item)
-            shapes.append(shape)
-        return shapes
-
-
 class MainWindow(QtWidgets.QMainWindow, WindowMixin):
     FIT_WINDOW, FIT_WIDTH, MANUAL_ZOOM = 0, 1, 2
 

labelme/widgets/__init__.py

@@ -4,9 +4,13 @@ from .canvas import Canvas
 
 from .color_dialog import ColorDialog
 
+from .escapable_qlist_widget import EscapableQListWidget
+
 from .label_dialog import LabelDialog
 from .label_dialog import LabelQLineEdit
 
+from .label_qlist_widget import LabelQListWidget
+
 from .tool_bar import ToolBar
 
 from .zoom_widget import ZoomWidget

labelme/widgets/escapable_qlist_widget.py

@@ -0,0 +1,9 @@
+from qtpy.QtCore import Qt
+from qtpy import QtWidgets
+
+
+class EscapableQListWidget(QtWidgets.QListWidget):
+
+    def keyPressEvent(self, event):
+        if event.key() == Qt.Key_Escape:
+            self.clearSelection()

labelme/widgets/label_qlist_widget.py

@@ -0,0 +1,45 @@
+from qtpy import QtWidgets
+
+
+class LabelQListWidget(QtWidgets.QListWidget):
+
+    def __init__(self, *args, **kwargs):
+        super(LabelQListWidget, self).__init__(*args, **kwargs)
+        self.canvas = None
+        self.itemsToShapes = []
+
+    def get_shape_from_item(self, item):
+        for index, (item_, shape) in enumerate(self.itemsToShapes):
+            if item_ is item:
+                return shape
+
+    def get_item_from_shape(self, shape):
+        for index, (item, shape_) in enumerate(self.itemsToShapes):
+            if shape_ is shape:
+                return item
+
+    def clear(self):
+        super(LabelQListWidget, self).clear()
+        self.itemsToShapes = []
+
+    def setParent(self, parent):
+        self.parent = parent
+
+    def dropEvent(self, event):
+        shapes = self.shapes
+        super(LabelQListWidget, self).dropEvent(event)
+        if self.shapes == shapes:
+            return
+        if self.canvas is None:
+            raise RuntimeError('self.canvas must be set beforehand.')
+        self.parent.setDirty()
+        self.canvas.loadShapes(shapes)
+
+    @property
+    def shapes(self):
+        shapes = []
+        for i in range(self.count()):
+            item = self.item(i)
+            shape = self.get_shape_from_item(item)
+            shapes.append(shape)
+        return shapes