Updated imports to glue_qt

glue-viz · Aug 15, 2023 · 5b42fa9 · 5b42fa9
1 parent 9b657ec
commit 5b42fa9
Show file tree

Hide file tree

Showing 21 changed files with 25 additions and 25 deletions.
diff --git a/glue_vispy_viewers/common/tests/test_vispy_toolbar.py b/glue_vispy_viewers/common/tests/test_vispy_toolbar.py
@@ -5,7 +5,7 @@
 import pytest
 from mock import patch
 
-from glue.app.qt import GlueApplication
+from glue_qt.app import GlueApplication
 from glue.core import Data
 
 from ...scatter.scatter_viewer import VispyScatterViewer

diff --git a/glue_vispy_viewers/common/tests/test_vispy_viewer.py b/glue_vispy_viewers/common/tests/test_vispy_viewer.py
@@ -6,7 +6,7 @@
 from mock import patch
 
 from glue.core import Data, DataCollection
-from glue.app.qt import GlueApplication
+from glue_qt.app import GlueApplication
 
 from glue.core.tests.util import simple_session
 

diff --git a/glue_vispy_viewers/common/toolbar.py b/glue_vispy_viewers/common/toolbar.py
@@ -4,7 +4,7 @@
 """
 
 
-from glue.viewers.common.qt.toolbar import BasicToolbar
+from glue_qt.viewers.common.toolbar import BasicToolbar
 
 from .selection_tools import VispyMouseMode
 

diff --git a/glue_vispy_viewers/common/viewer_options.py b/glue_vispy_viewers/common/viewer_options.py
@@ -4,7 +4,7 @@
 
 from echo.qt import autoconnect_callbacks_to_qt
 
-from glue.utils.qt import load_ui
+from glue_qt.utils import load_ui
 
 __all__ = ["VispyOptionsWidget"]
 

diff --git a/glue_vispy_viewers/common/vispy_data_viewer.py b/glue_vispy_viewers/common/vispy_data_viewer.py
@@ -1,6 +1,6 @@
 import numpy as np
 
-from glue.viewers.common.qt.data_viewer_with_state import DataViewerWithState
+from glue_qt.viewers.common.data_viewer_with_state import DataViewerWithState
 from echo import delay_callback
 
 from qtpy import QtWidgets

diff --git a/glue_vispy_viewers/conftest.py b/glue_vispy_viewers/conftest.py
@@ -5,7 +5,7 @@
 if sys.platform.startswith('win'):
     import vispy.gloo.gl  # noqa
 
-from glue.utils.qt import get_qapp  # noqa
+from glue_qt.utils import get_qapp  # noqa
 
 try:
     import objgraph

diff --git a/glue_vispy_viewers/isosurface/layer_style_widget.py b/glue_vispy_viewers/isosurface/layer_style_widget.py
@@ -2,7 +2,7 @@
 
 from qtpy import QtWidgets
 
-from glue.utils.qt import load_ui
+from glue_qt.utils import load_ui
 from echo.qt import autoconnect_callbacks_to_qt
 
 
@@ -27,7 +27,7 @@ def __init__(self, layer_artist):
 
 # if __name__ == "__main__":
 #
-#     from glue.utils.qt import get_qapp
+#     from glue_qt.utils import get_qapp
 #     from echo import CallbackProperty
 #
 #     app = get_qapp()

diff --git a/glue_vispy_viewers/isosurface/layer_style_widget.ui b/glue_vispy_viewers/isosurface/layer_style_widget.ui
@@ -121,7 +121,7 @@
   <customwidget>
    <class>QColormapCombo</class>
    <extends>QComboBox</extends>
-   <header>glue.utils.qt.colors</header>
+   <header>glue_qt.utils.colors</header>
   </customwidget>
  </customwidgets>
  <resources/>

diff --git a/glue_vispy_viewers/isosurface/tests/test_isosurface_viewer.py b/glue_vispy_viewers/isosurface/tests/test_isosurface_viewer.py
@@ -3,7 +3,7 @@
 import numpy as np
 
 from glue.core import DataCollection, Data
-from glue.app.qt.application import GlueApplication
+from glue_qt.app.application import GlueApplication
 from glue.core.component import Component
 
 from ..isosurface_viewer import VispyIsosurfaceViewer

diff --git a/glue_vispy_viewers/scatter/layer_style_widget.py b/glue_vispy_viewers/scatter/layer_style_widget.py
@@ -2,7 +2,7 @@
 
 from qtpy import QtWidgets
 
-from glue.utils.qt import load_ui
+from glue_qt.utils import load_ui
 from echo.qt import autoconnect_callbacks_to_qt
 
 from glue_vispy_viewers.utils import fix_tab_widget_fontsize

diff --git a/glue_vispy_viewers/scatter/layer_style_widget.ui b/glue_vispy_viewers/scatter/layer_style_widget.ui
@@ -814,12 +814,12 @@
   <customwidget>
    <class>QColorBox</class>
    <extends>QLabel</extends>
-   <header>glue.utils.qt.colors</header>
+   <header>glue_qt.utils.colors</header>
   </customwidget>
   <customwidget>
    <class>QColormapCombo</class>
    <extends>QComboBox</extends>
-   <header>glue.utils.qt.colors</header>
+   <header>glue_qt.utils.colors</header>
   </customwidget>
  </customwidgets>
  <resources/>

diff --git a/glue_vispy_viewers/scatter/tests/test_scatter_viewer.py b/glue_vispy_viewers/scatter/tests/test_scatter_viewer.py
@@ -3,7 +3,7 @@
 import sys
 
 from glue.core import DataCollection, Data
-from glue.app.qt.application import GlueApplication
+from glue_qt.app.application import GlueApplication
 from glue.core.component import Component
 
 from matplotlib import cm

diff --git a/glue_vispy_viewers/tests/data/multiple_volumes_v1.glu b/glue_vispy_viewers/tests/data/multiple_volumes_v1.glu
@@ -533,7 +533,7 @@
     "label": "World 2"
   },
   "__main__": {
-    "_type": "glue.app.qt.application.GlueApplication",
+    "_type": "glue_qt.app.application.GlueApplication",
     "data": "DataCollection",
     "plugins": [
       "glue.viewers.profile.qt",

diff --git a/glue_vispy_viewers/tests/data/multiple_volumes_v2.glu b/glue_vispy_viewers/tests/data/multiple_volumes_v2.glu
@@ -643,7 +643,7 @@
     "label": "World 2"
   },
   "__main__": {
-    "_type": "glue.app.qt.application.GlueApplication",
+    "_type": "glue_qt.app.application.GlueApplication",
     "data": "DataCollection",
     "plugins": [
       "glue.plugins.coordinate_helpers",

diff --git a/glue_vispy_viewers/tests/data/scatter_volume_selection.glu b/glue_vispy_viewers/tests/data/scatter_volume_selection.glu
@@ -647,7 +647,7 @@
     "label": "World 2"
   },
   "__main__": {
-    "_type": "glue.app.qt.application.GlueApplication",
+    "_type": "glue_qt.app.application.GlueApplication",
     "data": "DataCollection",
     "plugins": [
       "glue.io.formats.fits",

diff --git a/glue_vispy_viewers/tests/data/scatter_volume_v0.glu b/glue_vispy_viewers/tests/data/scatter_volume_v0.glu
@@ -194,7 +194,7 @@
         "VispyVolumeViewer"
       ]
     ],
-    "_type": "glue.app.qt.application.GlueApplication",
+    "_type": "glue_qt.app.application.GlueApplication",
     "data": "DataCollection"
   },
   "CoordinateComponent_2": {
@@ -540,4 +540,4 @@
     "_type": "matplotlib.colors.LinearSegmentedColormap",
     "cmap": "hot"
   }
-}
+}
diff --git a/glue_vispy_viewers/tests/data/scatter_volume_v1.glu b/glue_vispy_viewers/tests/data/scatter_volume_v1.glu
@@ -553,7 +553,7 @@
     "label": "World 2"
   },
   "__main__": {
-    "_type": "glue.app.qt.application.GlueApplication",
+    "_type": "glue_qt.app.application.GlueApplication",
     "data": "DataCollection",
     "plugins": [
       "glue.core.data_exporters",

diff --git a/glue_vispy_viewers/utils.py b/glue_vispy_viewers/utils.py
@@ -37,12 +37,12 @@ def as_matrix_transform(transform):
 
 try:
 
-    from glue.utils.qt import fix_tab_widget_fontsize  # noqa
+    from glue_qt.utils import fix_tab_widget_fontsize  # noqa
 
 except ImportError:
 
     import platform
-    from glue.utils.qt import get_qapp
+    from glue_qt.utils import get_qapp
 
     def fix_tab_widget_fontsize(tab_widget):
         """

diff --git a/glue_vispy_viewers/volume/layer_style_widget.py b/glue_vispy_viewers/volume/layer_style_widget.py
@@ -4,7 +4,7 @@
 
 from qtpy import QtWidgets
 
-from glue.utils.qt import load_ui
+from glue_qt.utils import load_ui
 from echo.qt import autoconnect_callbacks_to_qt
 
 

diff --git a/glue_vispy_viewers/volume/layer_style_widget.ui b/glue_vispy_viewers/volume/layer_style_widget.ui
@@ -117,7 +117,7 @@
   <customwidget>
    <class>QColorBox</class>
    <extends>QLabel</extends>
-   <header>glue.utils.qt.colors</header>
+   <header>glue_qt.utils.colors</header>
   </customwidget>
  </customwidgets>
  <resources/>

diff --git a/glue_vispy_viewers/volume/tests/test_volume_viewer.py b/glue_vispy_viewers/volume/tests/test_volume_viewer.py
@@ -3,7 +3,7 @@
 import numpy as np
 
 from glue.core import DataCollection, Data
-from glue.app.qt.application import GlueApplication
+from glue_qt.app.application import GlueApplication
 from glue.core.component import Component
 from glue.core.link_helpers import LinkSame
 from glue.core.fixed_resolution_buffer import PIXEL_CACHE, ARRAY_CACHE
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
     """
-    from glue.viewers.common.qt.toolbar import BasicToolbar
+    from glue_qt.viewers.common.toolbar import BasicToolbar
     from .selection_tools import VispyMouseMode
@@ Expand Down @@