Switched to guidata v3.1

PierreRaybaut · PierreRaybaut · commit 40f730951087 · 2023-10-13T17:39:18.000+02:00
diff --git a/doc/features/styles/overview.rst b/doc/features/styles/overview.rst
@@ -3,7 +3,7 @@ Overview
 
 The `styles` module (see :ref:`styles`) provides the classes for configuring
 the plot items and the plot tools. Those classes are data sets
-(:py:class:`guidata.dataset.datatypes.DataSet`)
+(:py:class:`guidata.dataset.DataSet`)
 containing parameters that affect the visual appearance of the plot items and
 the plot tools behavior.
 
diff --git a/plotpy/items/annotations.py b/plotpy/items/annotations.py
@@ -18,7 +18,7 @@
 
 import numpy as np
 from guidata.configtools import get_icon
-from guidata.utils import update_dataset
+from guidata.dataset import update_dataset
 from guidata.utils.misc import assert_interfaces_valid
 
 from plotpy.config import CONF, _
diff --git a/plotpy/items/contour.py b/plotpy/items/contour.py
@@ -22,10 +22,9 @@
 
 from __future__ import annotations
 
+import guidata.dataset as gds
 import numpy as np
 from guidata.configtools import get_icon
-from guidata.dataset import dataitems as gdi
-from guidata.dataset import datatypes as gdt
 from guidata.utils.misc import assert_interfaces_valid
 
 from plotpy.config import _
@@ -34,11 +33,11 @@
 from plotpy.styles import ShapeParam
 
 
-class ContourLine(gdt.DataSet):
+class ContourLine(gds.DataSet):
     """A contour line"""
 
-    vertices = gdi.FloatArrayItem(_("Vertices"), help=_("Vertices of the line"))
-    level = gdi.FloatItem(_("Level"), help=_("Level of the line"))
+    vertices = gds.FloatArrayItem(_("Vertices"), help=_("Vertices of the line"))
+    level = gds.FloatItem(_("Level"), help=_("Level of the line"))
 
 
 def compute_contours(
diff --git a/plotpy/items/curve/base.py b/plotpy/items/curve/base.py
@@ -7,7 +7,7 @@
 
 import numpy as np
 from guidata.configtools import get_icon
-from guidata.utils import update_dataset
+from guidata.dataset import update_dataset
 from guidata.utils.misc import assert_interfaces_valid
 from qtpy import QtCore as QC
 from qwt import QwtPlotCurve
diff --git a/plotpy/items/curve/errorbar.py b/plotpy/items/curve/errorbar.py
@@ -7,7 +7,7 @@
 
 import numpy as np
 from guidata.configtools import get_icon
-from guidata.utils import update_dataset
+from guidata.dataset import update_dataset
 from guidata.utils.misc import assert_interfaces_valid
 from qtpy import QtCore as QC
 from qtpy import QtGui as QG
diff --git a/plotpy/items/histogram.py b/plotpy/items/histogram.py
@@ -13,7 +13,7 @@
 
 import numpy as np
 from guidata.configtools import get_icon
-from guidata.utils import update_dataset
+from guidata.dataset import update_dataset
 from guidata.utils.misc import assert_interfaces_valid
 from qwt import QwtPlotCurve
 
diff --git a/plotpy/items/image/base.py b/plotpy/items/image/base.py
@@ -11,7 +11,7 @@
 
 import numpy as np
 from guidata.configtools import get_icon
-from guidata.utils import update_dataset
+from guidata.dataset import update_dataset
 from guidata.utils.misc import assert_interfaces_valid
 from qtpy import QtCore as QC
 from qtpy import QtGui as QG
diff --git a/plotpy/items/image/filter.py b/plotpy/items/image/filter.py
@@ -7,7 +7,7 @@
 
 import numpy as np
 from guidata.configtools import get_icon
-from guidata.utils import update_dataset
+from guidata.dataset import update_dataset
 from guidata.utils.misc import assert_interfaces_valid
 from qtpy import QtCore as QC
 
diff --git a/plotpy/items/image/misc.py b/plotpy/items/image/misc.py
@@ -7,7 +7,7 @@
 
 import numpy as np
 from guidata.configtools import get_icon
-from guidata.dataset.datatypes import update_dataset
+from guidata.dataset import update_dataset
 from guidata.utils.misc import assert_interfaces_valid
 from qtpy import QtCore as QC
 
diff --git a/plotpy/items/label.py b/plotpy/items/label.py
@@ -17,7 +17,7 @@
 
 import numpy as np
 from guidata.configtools import get_icon
-from guidata.utils import update_dataset
+from guidata.dataset import update_dataset
 from guidata.utils.misc import assert_interfaces_valid
 from qtpy import QtCore as QC
 from qtpy import QtGui as QG
diff --git a/plotpy/items/polygon.py b/plotpy/items/polygon.py
@@ -12,7 +12,7 @@
 
 import numpy as np
 from guidata.configtools import get_icon
-from guidata.dataset.datatypes import update_dataset
+from guidata.dataset import update_dataset
 from guidata.utils.misc import assert_interfaces_valid
 from qtpy import QtCore as QC
 from qtpy import QtGui as QG
diff --git a/plotpy/items/shapes/axis.py b/plotpy/items/shapes/axis.py
@@ -7,7 +7,7 @@
 
 import numpy as np
 from guidata.configtools import get_icon
-from guidata.utils import update_dataset
+from guidata.dataset import update_dataset
 from guidata.utils.misc import assert_interfaces_valid
 from qtpy import QtCore as QC
 from qtpy import QtGui as QG
diff --git a/plotpy/items/shapes/marker.py b/plotpy/items/shapes/marker.py
@@ -6,7 +6,7 @@
 from typing import TYPE_CHECKING
 
 from guidata.configtools import get_icon
-from guidata.utils import update_dataset
+from guidata.dataset import update_dataset
 from guidata.utils.misc import assert_interfaces_valid
 from qtpy import QtCore as QC
 from qwt import QwtPlotMarker
diff --git a/plotpy/items/shapes/polygon.py b/plotpy/items/shapes/polygon.py
@@ -8,7 +8,7 @@
 
 import numpy as np
 from guidata.configtools import get_icon
-from guidata.utils import update_dataset
+from guidata.dataset import update_dataset
 from guidata.utils.misc import assert_interfaces_valid
 from qtpy import QtCore as QC
 from qtpy import QtGui as QG
diff --git a/plotpy/items/shapes/range.py b/plotpy/items/shapes/range.py
@@ -7,7 +7,7 @@
 
 import numpy as np
 from guidata.configtools import get_icon
-from guidata.utils import update_dataset
+from guidata.dataset import update_dataset
 from guidata.utils.misc import assert_interfaces_valid
 from qtpy import QtCore as QC
 from qtpy import QtGui as QG
diff --git a/plotpy/panels/contrastadjustment.py b/plotpy/panels/contrastadjustment.py
@@ -20,8 +20,7 @@
 from typing import TYPE_CHECKING
 
 from guidata.configtools import get_icon, get_image_layout
-from guidata.dataset.dataitems import FloatItem
-from guidata.dataset.datatypes import DataSet
+from guidata.dataset import DataSet, FloatItem
 from guidata.qthelpers import add_actions, create_action
 from guidata.utils.misc import assert_interfaces_valid
 from qtpy import QtCore as QC
diff --git a/plotpy/styles/axes.py b/plotpy/styles/axes.py
@@ -1,6 +1,14 @@
 # -*- coding: utf-8 -*-
-from guidata.dataset.dataitems import ChoiceItem, ColorItem, FloatItem, StringItem
-from guidata.dataset.datatypes import BeginGroup, DataSet, EndGroup, ObjectItem
+from guidata.dataset import (
+    BeginGroup,
+    ChoiceItem,
+    ColorItem,
+    DataSet,
+    EndGroup,
+    FloatItem,
+    ObjectItem,
+    StringItem,
+)
 from guidata.dataset.qtitemwidgets import DataSetWidget
 from guidata.dataset.qtwidgets import DataSetEditLayout
 from qwt import QwtPlot
diff --git a/plotpy/styles/base.py b/plotpy/styles/base.py
@@ -6,25 +6,23 @@
 from math import atan2, pi, sqrt
 from typing import TYPE_CHECKING
 
-from guidata.dataset.dataitems import (
+from guidata.dataset import (
+    BeginGroup,
     BoolItem,
     ButtonItem,
     ColorItem,
-    FloatItem,
-    ImageChoiceItem,
-    IntItem,
-    StringItem,
-)
-from guidata.dataset.datatypes import (
-    BeginGroup,
     DataSet,
     DataSetGroup,
     EndGroup,
+    FloatItem,
+    ImageChoiceItem,
+    IntItem,
     ObjectItem,
+    StringItem,
+    update_dataset,
 )
 from guidata.dataset.qtitemwidgets import DataSetWidget
 from guidata.dataset.qtwidgets import DataSetEditLayout
-from guidata.utils import update_dataset
 from qtpy import QtCore as QC
 from qtpy import QtGui as QG
 from qtpy import QtWidgets as QW
@@ -33,7 +31,7 @@
 from plotpy.config import _
 
 if TYPE_CHECKING:  # pragma: no cover
-    import guidata.dataset.datatypes
+    import guidata.dataset
 
     from plotpy.interfaces import IBasePlotItem
     from plotpy.plot import BasePlot
@@ -216,7 +214,7 @@ class ItemParameters:
 
     def __init__(self, multiselection: bool = False):
         self.multiselection = multiselection
-        self.paramdict: dict[str, guidata.dataset.datatypes.DataSet] = {}
+        self.paramdict: dict[str, guidata.dataset.DataSet] = {}
         self.items: set[IBasePlotItem] = set()
 
     @classmethod
@@ -234,7 +232,7 @@ def add(
         self,
         key: str,
         item: IBasePlotItem,
-        param: guidata.dataset.datatypes.DataSet,
+        param: guidata.dataset.DataSet,
     ) -> None:
         """
         Add parameters for a given item
@@ -258,7 +256,7 @@ def add(
                     return
         self.__add(key, item, param)
 
-    def get(self, key: str) -> guidata.dataset.datatypes.DataSet:
+    def get(self, key: str) -> guidata.dataset.DataSet:
         """
         Get parameters for a given item
 
diff --git a/plotpy/styles/curve.py b/plotpy/styles/curve.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-from guidata.dataset.dataitems import FloatItem, ImageChoiceItem, StringItem
-from guidata.dataset.datatypes import DataSet, GetAttrProp
+
+from guidata.dataset import DataSet, FloatItem, GetAttrProp, ImageChoiceItem, StringItem
 from qtpy import QtCore as QC
 from qtpy import QtGui as QG
 from qwt import QwtPlotCurve
diff --git a/plotpy/styles/errorbar.py b/plotpy/styles/errorbar.py
@@ -1,12 +1,6 @@
 # -*- coding: utf-8 -*-
-from guidata.dataset.dataitems import (
-    BoolItem,
-    ChoiceItem,
-    ColorItem,
-    FloatItem,
-    IntItem,
-)
-from guidata.dataset.datatypes import DataSet
+
+from guidata.dataset import BoolItem, ChoiceItem, ColorItem, DataSet, FloatItem, IntItem
 from qtpy import QtGui as QG
 
 from plotpy.config import _
diff --git a/plotpy/styles/histogram.py b/plotpy/styles/histogram.py
@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
-from guidata.dataset.dataitems import (
+
+from guidata.dataset import (
     BoolItem,
     ChoiceItem,
     ColorItem,
+    DataSet,
+    GetAttrProp,
     IntItem,
     StringItem,
 )
-from guidata.dataset.datatypes import DataSet, GetAttrProp
 
 from plotpy.config import _
 from plotpy.styles.base import ItemParameters
diff --git a/plotpy/styles/image.py b/plotpy/styles/image.py
@@ -3,16 +3,19 @@
 import enum
 
 import numpy as np
-from guidata.dataset.dataitems import (
+from guidata.dataset import (
+    BeginGroup,
     BoolItem,
     ChoiceItem,
     ColorItem,
+    DataSet,
+    EndGroup,
     FloatItem,
+    GetAttrProp,
     ImageChoiceItem,
     IntItem,
     StringItem,
 )
-from guidata.dataset.datatypes import BeginGroup, DataSet, EndGroup, GetAttrProp
 from qtpy import QtGui as QG
 
 from plotpy._scaler import INTERP_AA, INTERP_LINEAR, INTERP_NEAREST
diff --git a/plotpy/styles/label.py b/plotpy/styles/label.py
@@ -1,24 +1,23 @@
 # -*- coding: utf-8 -*-
-from guidata.dataset.dataitems import (
+
+from guidata.dataset import (
+    BeginGroup,
+    BeginTabGroup,
     BoolItem,
     ChoiceItem,
     ColorItem,
-    FloatItem,
-    IntItem,
-    StringItem,
-    TextItem,
-)
-from guidata.dataset.datatypes import (
-    BeginGroup,
-    BeginTabGroup,
     DataSet,
     EndGroup,
     EndTabGroup,
+    FloatItem,
     GetAttrProp,
+    IntItem,
     NotProp,
     Obj,
+    StringItem,
+    TextItem,
+    update_dataset,
 )
-from guidata.utils import update_dataset
 from qtpy import QtGui as QG
 
 from plotpy.config import _
diff --git a/plotpy/styles/shape.py b/plotpy/styles/shape.py
@@ -5,23 +5,21 @@
 from typing import TYPE_CHECKING
 
 import numpy as np
-from guidata.dataset.dataitems import (
+from guidata.dataset import (
+    BeginGroup,
+    BeginTabGroup,
     BoolItem,
     ColorItem,
+    DataSet,
+    EndGroup,
+    EndTabGroup,
     FloatArrayItem,
     FloatItem,
+    GetAttrProp,
     ImageChoiceItem,
     IntItem,
     StringItem,
 )
-from guidata.dataset.datatypes import (
-    BeginGroup,
-    BeginTabGroup,
-    DataSet,
-    EndGroup,
-    EndTabGroup,
-    GetAttrProp,
-)
 from qtpy import QtGui as QG
 from qwt import QwtPlotMarker
 
diff --git a/plotpy/tests/gui/test_dotarraydemo.py b/plotpy/tests/gui/test_dotarraydemo.py
diff --git a/plotpy/tests/gui/test_simple_dialog.py b/plotpy/tests/gui/test_simple_dialog.py
diff --git a/plotpy/tests/gui/test_simple_window.py b/plotpy/tests/gui/test_simple_window.py
diff --git a/plotpy/tools/image.py b/plotpy/tools/image.py
diff --git a/plotpy/tools/label.py b/plotpy/tools/label.py
diff --git a/plotpy/tools/misc.py b/plotpy/tools/misc.py
diff --git a/plotpy/widgets/fit.py b/plotpy/widgets/fit.py
