Create labelme.widgets

labelme/app.py

@@ -14,10 +14,7 @@ from qtpy import QtWidgets
 
 from labelme import __appname__
 from labelme import __version__
-from labelme.canvas import Canvas
-from labelme.colorDialog import ColorDialog
 from labelme.config import get_config
-from labelme.labelDialog import LabelDialog
 from labelme.labelFile import LabelFile
 from labelme.labelFile import LabelFileError
 from labelme.lib import addActions
@@ -30,8 +27,11 @@ from labelme import QT5
 from labelme.shape import DEFAULT_FILL_COLOR
 from labelme.shape import DEFAULT_LINE_COLOR
 from labelme.shape import Shape
-from labelme.toolBar import ToolBar
-from labelme.zoomWidget import ZoomWidget
+from labelme.widgets import Canvas
+from labelme.widgets import ColorDialog
+from labelme.widgets import LabelDialog
+from labelme.widgets import ToolBar
+from labelme.widgets import ZoomWidget
 
 
 # FIXME

labelme/widgets/__init__.py

@@ -0,0 +1,7 @@
+# flake8: noqa
+
+from .canvas import Canvas
+from .color_dialog import ColorDialog
+from .label_dialog import LabelDialog
+from .tool_bar import ToolBar
+from .zoom_widget import ZoomWidget

tests/test_labelDialog.py → tests/widgets_tests/test_label_dialog.py

@@ -1,7 +1,8 @@
 from qtpy import QtCore
 from qtpy import QtWidgets
 
-from labelme import labelDialog
+from labelme.widgets import LabelDialog
+from labelme.widgets import LabelQLineEdit
 
 
 def test_LabelQLineEdit(qtbot):
@@ -11,7 +12,7 @@ def test_LabelQLineEdit(qtbot):
         'dog',
         'person',
     ])
-    widget = labelDialog.LabelQLineEdit()
+    widget = LabelQLineEdit()
     widget.setListWidget(list_widget)
     qtbot.addWidget(widget)
 
@@ -34,7 +35,7 @@ def test_LabelQLineEdit(qtbot):
 
 def test_LabelDialog_addLabelHistory(qtbot):
     labels = ['cat', 'dog', 'person']
-    widget = labelDialog.LabelDialog(labels=labels, sort_labels=True)
+    widget = LabelDialog(labels=labels, sort_labels=True)
     qtbot.addWidget(widget)
 
     widget.addLabelHistory('bicycle')
@@ -47,7 +48,7 @@ def test_LabelDialog_addLabelHistory(qtbot):
 
 def test_LabelDialog_popUp(qtbot):
     labels = ['cat', 'dog', 'person']
-    widget = labelDialog.LabelDialog(labels=labels, sort_labels=True)
+    widget = LabelDialog(labels=labels, sort_labels=True)
     qtbot.addWidget(widget)
 
     # popUp(text='cat')