Moved colormap widgets in subpackage

PierreRaybaut · PierreRaybaut · commit 1c3d1cebe7fd · 2024-02-01T16:57:55.000+01:00
diff --git a/plotpy/colormaps/colormap.py b/plotpy/colormaps/colormap.py
@@ -48,7 +48,7 @@
     DEFAULT_COLORMAPS_PATH,
     save_colormaps,
 )
-from plotpy.widgets.colormap_widget import (
+from plotpy.widgets.colormap.widget import (
     CustomQwtLinearColormap,  # Reuse matplotlib data
 )
 
diff --git a/plotpy/items/image/base.py b/plotpy/items/image/base.py
@@ -58,7 +58,7 @@
 
     from plotpy.interfaces import IItemType
     from plotpy.styles.base import ItemParameters
-    from plotpy.widgets.colormap_widget import CustomQwtLinearColormap
+    from plotpy.widgets.colormap.widget import CustomQwtLinearColormap
 
 
 class BaseImageItem(QwtPlotItem):
diff --git a/plotpy/mathutils/colormaps.py b/plotpy/mathutils/colormaps.py
@@ -18,7 +18,7 @@
 from qwt import QwtInterval, toQImage
 
 from plotpy.config import CONF
-from plotpy.widgets.colormap_widget import CustomQwtLinearColormap
+from plotpy.widgets.colormap.widget import CustomQwtLinearColormap
 
 # from guidata.dataset.datatypes import NoDefault
 FULLRANGE = QwtInterval(0.0, 1.0)
diff --git a/plotpy/tests/features/test_colormap_editor.py b/plotpy/tests/features/test_colormap_editor.py
@@ -18,8 +18,8 @@
 import qtpy.QtGui as QG
 from guidata.qthelpers import qt_app_context
 
-from plotpy.widgets.colormap_editor import ColorMapEditor
-from plotpy.widgets.colormap_widget import CustomQwtLinearColormap
+from plotpy.widgets.colormap.editor import ColorMapEditor
+from plotpy.widgets.colormap.widget import CustomQwtLinearColormap
 
 
 def test_colormap_manager() -> None:
diff --git a/plotpy/tests/features/test_colormap_manager.py b/plotpy/tests/features/test_colormap_manager.py
@@ -17,8 +17,8 @@
 from guidata.qthelpers import qt_app_context
 
 from plotpy.mathutils.colormaps import ALL_COLORMAPS
-from plotpy.widgets.colormap_manager import ColorMapManager
-from plotpy.widgets.colormap_widget import CustomQwtLinearColormap
+from plotpy.widgets.colormap.manager import ColorMapManager
+from plotpy.widgets.colormap.widget import CustomQwtLinearColormap
 
 
 def test_colormap_manager() -> None:
diff --git a/plotpy/tools/image.py b/plotpy/tools/image.py
@@ -51,8 +51,8 @@
 )
 from plotpy.tools.misc import OpenFileTool
 from plotpy.tools.shape import CircleTool, RectangleTool, RectangularShapeTool
-from plotpy.widgets.colormap_manager import ColorMapManager
-from plotpy.widgets.colormap_widget import CustomQwtLinearColormap
+from plotpy.widgets.colormap.manager import ColorMapManager
+from plotpy.widgets.colormap.widget import CustomQwtLinearColormap
 from plotpy.widgets.imagefile import exec_image_save_dialog
 
 if TYPE_CHECKING:  # pragma: no cover
diff --git a/plotpy/widgets/colormap/__init__.py b/plotpy/widgets/colormap/__init__.py
@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-
diff --git a/plotpy/widgets/colormap/_slider.py b/plotpy/widgets/colormap/_slider.py
diff --git a/plotpy/widgets/colormap/editor.py b/plotpy/widgets/colormap/editor.py
@@ -19,7 +19,7 @@
 from guidata.dataset.qtwidgets import DataSetEditGroupBox
 
 from plotpy.config import _
-from plotpy.widgets.colormap_widget import ColorMapWidget, CustomQwtLinearColormap
+from plotpy.widgets.colormap.widget import ColorMapWidget, CustomQwtLinearColormap
 
 
 class ColorMapEditor(QW.QWidget):
diff --git a/plotpy/widgets/colormap/manager.py b/plotpy/widgets/colormap/manager.py
@@ -27,8 +27,8 @@
     build_icon_from_cmap,
     save_colormaps,
 )
-from plotpy.widgets.colormap_editor import ColorMapEditor
-from plotpy.widgets.colormap_widget import CustomQwtLinearColormap
+from plotpy.widgets.colormap.editor import ColorMapEditor
+from plotpy.widgets.colormap.widget import CustomQwtLinearColormap
 
 
 class ColorMapNameEdit(QW.QDialog):
diff --git a/plotpy/widgets/colormap/widget.py b/plotpy/widgets/colormap/widget.py
@@ -21,7 +21,7 @@
 from qwt.color_map import ColorStop
 
 from plotpy.config import _
-from plotpy.widgets._colormap_slider import QColorMapSlider
+from plotpy.widgets.colormap._slider import QColorMapSlider
 
 ColorTypeT = TypeVar("ColorTypeT", bound=Union[QG.QColor, int])
 QColorInitTypes = Union[

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`DEFAULT_COLORMAPS_PATH,`
`49`	`49`	`save_colormaps,`
`50`	`50`	`)`
`51`		`-from plotpy.widgets.colormap_widget import (`
	`51`	`+from plotpy.widgets.colormap.widget import (`
`52`	`52`	`CustomQwtLinearColormap, # Reuse matplotlib data`
`53`	`53`	`)`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@`
`27`	`27`	`build_icon_from_cmap,`
`28`	`28`	`save_colormaps,`
`29`	`29`	`)`
`30`		`-from plotpy.widgets.colormap_editor import ColorMapEditor`
`31`		`-from plotpy.widgets.colormap_widget import CustomQwtLinearColormap`
	`30`	`+from plotpy.widgets.colormap.editor import ColorMapEditor`
	`31`	`+from plotpy.widgets.colormap.widget import CustomQwtLinearColormap`
`32`	`32`
`33`	`33`
`34`	`34`	`class ColorMapNameEdit(QW.QDialog):`