Renamed shapes->shape, annotations->annotation

Author: PierreRaybaut

doc/features/items/overview.rst

@@ -69,21 +69,21 @@ Annotations
 
 The following annotation items are available:
 
-* :py:class:`.annotations.AnnotatedPoint`
-* :py:class:`.annotations.AnnotatedSegment`
-* :py:class:`.annotations.AnnotatedRectangle`
-* :py:class:`.annotations.AnnotatedObliqueRectangle`
-* :py:class:`.annotations.AnnotatedEllipse`
-* :py:class:`.annotations.AnnotatedCircle`
+* :py:class:`.AnnotatedPoint`
+* :py:class:`.AnnotatedSegment`
+* :py:class:`.AnnotatedRectangle`
+* :py:class:`.AnnotatedObliqueRectangle`
+* :py:class:`.AnnotatedEllipse`
+* :py:class:`.AnnotatedCircle`
 
 Labels
 ^^^^^^
 
 The following label items are available:
 
-* :py:class:`.label.LabelItem`
-* :py:class:`.label.LegendBoxItem`
-* :py:class:`.label.SelectedLegendBoxItem`
-* :py:class:`.label.RangeComputation`
-* :py:class:`.label.RangeComputation2d`
-* :py:class:`.label.DataInfoLabel`
+* :py:class:`.LabelItem`
+* :py:class:`.LegendBoxItem`
+* :py:class:`.SelectedLegendBoxItem`
+* :py:class:`.RangeComputation`
+* :py:class:`.RangeComputation2d`
+* :py:class:`.DataInfoLabel`

plotpy/io.py

@@ -623,38 +623,18 @@ def register_serializable_items(modname, classnames):
 
 # Curves
 register_serializable_items(
-    "plotpy.items.curve.base",
-    ["CurveItem"],
-)
-register_serializable_items(
-    "plotpy.items.polygon",
-    ["PolygonMapItem"],
-)
-register_serializable_items(
-    "plotpy.items.curve.errorbar",
-    ["ErrorBarCurveItem"],
-)
-# Images
-register_serializable_items(
-    "plotpy.items.image.base",
-    ["RawImageItem"],
-)
-register_serializable_items(
-    "plotpy.items.image.image_items",
-    ["ImageItem", "XYImageItem", "RGBImageItem"],
-)
-register_serializable_items(
-    "plotpy.items.image.transform",
-    ["TrImageItem"],
-)
-register_serializable_items(
-    "plotpy.items.image.masked",
-    ["MaskedImageItem", "MaskedXYImageItem"],
-)
-# Shapes
-register_serializable_items(
-    "plotpy.items.shapes",
+    "plotpy.items",
     [
+        "CurveItem",
+        "PolygonMapItem",
+        "ErrorBarCurveItem",
+        "RawImageItem",
+        "ImageItem",
+        "XYImageItem",
+        "RGBImageItem",
+        "TrImageItem",
+        "MaskedImageItem",
+        "MaskedXYImageItem",
         "Marker",
         "PolygonShape",
         "PointShape",
@@ -663,25 +643,17 @@ def register_serializable_items(modname, classnames):
         "ObliqueRectangleShape",
         "EllipseShape",
         "Axes",
-    ],
-)
-# Annotations
-register_serializable_items(
-    "plotpy.items.annotations",
-    [
         "AnnotatedPoint",
         "AnnotatedSegment",
         "AnnotatedRectangle",
         "AnnotatedObliqueRectangle",
         "AnnotatedEllipse",
         "AnnotatedCircle",
+        "LabelItem",
+        "LegendBoxItem",
+        "SelectedLegendBoxItem",
     ],
 )
-# Labels
-register_serializable_items(
-    "plotpy.items.label",
-    ["LabelItem", "LegendBoxItem", "SelectedLegendBoxItem"],
-)
 
 
 def item_class_from_name(name: str) -> type[Any] | None:

plotpy/items/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # pylint: disable=unused-import
-from .annotations import (
+from .annotation import (
     AnnotatedCircle,
     AnnotatedEllipse,
     AnnotatedObliqueRectangle,
@@ -48,7 +48,7 @@
     SelectedLegendBoxItem,
 )
 from .polygon import PolygonMapItem
-from .shapes import (
+from .shape import (
     AbstractShape,
     Axes,
     CircleSVGShape,

plotpy/items/annotations.py plotpy/items/annotation.pyplotpy/items/annotations.py renamed to plotpy/items/annotation.py

@@ -9,7 +9,7 @@
 Annotations
 -----------
 
-The :mod:`annotations` module provides annotated shape plot items.
+The :mod:`annotation` module provides annotated shape plot items.
 """
 
 from __future__ import annotations
@@ -25,11 +25,11 @@
 from plotpy.coords import canvas_to_axes
 from plotpy.interfaces import IBasePlotItem, ISerializableType, IShapeItemType
 from plotpy.items.label import DataInfoLabel
-from plotpy.items.shapes.base import AbstractShape
-from plotpy.items.shapes.ellipse import EllipseShape
-from plotpy.items.shapes.point import PointShape
-from plotpy.items.shapes.rectangle import ObliqueRectangleShape, RectangleShape
-from plotpy.items.shapes.segment import SegmentShape
+from plotpy.items.shape.base import AbstractShape
+from plotpy.items.shape.ellipse import EllipseShape
+from plotpy.items.shape.point import PointShape
+from plotpy.items.shape.rectangle import ObliqueRectangleShape, RectangleShape
+from plotpy.items.shape.segment import SegmentShape
 from plotpy.mathutils.geometry import (
     compute_angle,
     compute_center,

plotpy/items/contour.py

@@ -29,7 +29,7 @@
 
 from plotpy.config import _
 from plotpy.contour2d import contour_2d_grid, contour_2d_ortho
-from plotpy.items.shapes.polygon import PolygonShape
+from plotpy.items.shape.polygon import PolygonShape
 from plotpy.styles import ShapeParam
 
 

plotpy/items/image/base.py

@@ -39,7 +39,7 @@
     ITrackableItemType,
     IVoiImageItemType,
 )
-from plotpy.items.shapes.rectangle import RectangleShape
+from plotpy.items.shape.rectangle import RectangleShape
 from plotpy.lutrange import lut_range_threshold
 from plotpy.mathutils.colormap import FULLRANGE, get_cmap, get_cmap_name
 from plotpy.styles.image import LUTAlpha, RawImageParam

plotpy/items/shape/__init__.py

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+
+# pylint: disable=W0611
+from .axis import Axes
+from .base import AbstractShape
+from .ellipse import EllipseShape
+from .marker import Marker
+from .point import PointShape
+from .polygon import PolygonShape
+from .range import XRangeSelection
+from .rectangle import ObliqueRectangleShape, RectangleShape
+from .segment import SegmentShape
+from .svg import CircleSVGShape, RectangleSVGShape, SquareSVGShape

plotpy/items/shapes/axis.py plotpy/items/shape/axis.pyplotpy/items/shapes/axis.py renamed to plotpy/items/shape/axis.py

@@ -13,7 +13,7 @@
 from qtpy import QtGui as QG
 
 from plotpy.config import CONF, _
-from plotpy.items.shapes.polygon import PolygonShape
+from plotpy.items.shape.polygon import PolygonShape
 from plotpy.styles.shape import AxesShapeParam
 
 if TYPE_CHECKING:  # pragma: no cover

plotpy/items/shapes/base.py plotpy/items/shape/base.pyplotpy/items/shapes/base.py renamed to plotpy/items/shape/base.py

@@ -13,7 +13,7 @@
 from qtpy import QtGui as QG
 from qwt import QwtSymbol
 
-from plotpy.items.shapes.polygon import PolygonShape
+from plotpy.items.shape.polygon import PolygonShape
 from plotpy.mathutils.geometry import compute_angle, compute_center
 
 if TYPE_CHECKING:  # pragma: no cover