PlotPy 2.7.0__tar.gz → 2.7.2__tar.gz

{plotpy-2.7.0 → plotpy-2.7.2}/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog #
 
+## Version 2.7.2 ##
+
+🛠️ Bug fixes:
+
+* [Issue #32](https://github.com/PlotPyStack/PlotPy/issues/32) - Plot item list panel's parameters dialog box is empty for non-selectable items
+* [Issue #30](https://github.com/PlotPyStack/PlotPy/issues/30) - `handle_final_shape_cb` argument doesn't work on `MultilineTool`, `PolygonTool`, `AnnotatedPolygonTool`
+
+## Version 2.7.1 ##
+
+🛠️ Bug fixes:
+
+* Fixed update `canvasRect` type to `QRectF` for intersection checks in `CircleSVGShape`, following [this bug fix](https://github.com/PlotPyStack/PythonQwt/commit/d0b5e26d8f78a9a65939503553f1bc1b56826e4e) in `PythonQwt` V0.14.4
+* Fixed regression with respect to `guiqwt` regarding plot items instantiation:
+  * `guiqwt` was allowing to instantiate plot items without needing to create a `QApplication` instance (no GUI event loop was required)
+  * This was not the case with `plotpy`, so that it was not possible -for example- to serialize/deserialize plot items to JSON without creating a `QApplication` instance
+  * This has been fixed by removing the `QIcon` instantiation from the plot items constructors (call to `QwtPlotItem.setIcon` method). Note that -in the meantime- `QwtPlotItem.setIcon` and `QwtPlotItem.icon` methods have also been removed in PythonQwt V0.14.3. Code relying on this feature should thus be updated to use the new `get_icon_name` method instead, i.e. `get_icon(item.get_icon_name())` instead of `item.icon()`.
+* [Issue #26](https://github.com/PlotPyStack/PlotPy/issues/26) - Item list panel should not allow to select a non-selectable item
+
 ## Version 2.7.0 ##
 
 Supported versions of Python have been updated (drop support for Python 3.8, add support for Python 3.13):

{plotpy-2.7.0/PlotPy.egg-info → plotpy-2.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: PlotPy
-Version: 2.7.0
+Version: 2.7.2
 Summary: Curve and image plotting tools for Python/Qt applications
 Author-email: Codra <p.raybaut@codra.fr>
 License: BSD 3-Clause License

{plotpy-2.7.0 → plotpy-2.7.2/PlotPy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: PlotPy
-Version: 2.7.0
+Version: 2.7.2
 Summary: Curve and image plotting tools for Python/Qt applications
 Author-email: Codra <p.raybaut@codra.fr>
 License: BSD 3-Clause License

{plotpy-2.7.0 → plotpy-2.7.2}/doc/dev/v1_to_v2.rst

@@ -85,3 +85,20 @@ functions are:
              :py:meth:`.PlotBuilder.trimage`, :py:meth:`.PlotBuilder.rgbimage`, and
              :py:meth:`.PlotBuilder.quadgrid`. If you were using it, you should
              replace it by the new ``alpha_function`` parameter.
+
+Plot item icon handling
+^^^^^^^^^^^^^^^^^^^^^^^
+
+The `guiqwt` library was allowing to instantiate plot items without needing to create
+a `QApplication` instance (no GUI event loop was required). This was not the case with
+`plotpy` V1, so that it was not possible -for example- to serialize/deserialize plot
+items to JSON without creating a `QApplication` instance.
+
+With `plotpy` V2, this has been fixed by removing the `QIcon` instantiation from the
+plot items constructors (call to `QwtPlotItem.setIcon` method).
+
+Note that -in the meantime- `QwtPlotItem.setIcon` and `QwtPlotItem.icon` methods have
+also been removed in PythonQwt V0.14.3.
+
+Code relying on this feature should thus be updated to use the new `get_icon_name`
+method instead, i.e. `get_icon(item.get_icon_name())` instead of `item.icon()`.

{plotpy-2.7.0 → plotpy-2.7.2}/plotpy/__init__.py

@@ -20,7 +20,7 @@ External resources:
 .. _GitHub: https://github.com/PierreRaybaut/plotpy
 """
 
-__version__ = "2.7.0"
+__version__ = "2.7.2"
 __VERSION__ = tuple([int(number) for number in __version__.split(".")])
 
 # --- Important note: DATAPATH and LOCALEPATH are used by guidata.configtools

{plotpy-2.7.0 → plotpy-2.7.2}/plotpy/interfaces/items.py

@@ -249,6 +249,23 @@ class IBasePlotItem:
     _can_move = True
     _can_resize = True
     _can_rotate = True
+    _icon_name = ""  # Icon name (e.g. "point.png")
+
+    def get_icon_name(self) -> str:
+        """Return the icon name
+
+        Returns:
+            Icon name
+        """
+        return self._icon_name
+
+    def set_icon_name(self, icon_name: str) -> None:
+        """Set the icon name
+
+        Args:
+            icon_name: Icon name
+        """
+        self._icon_name = icon_name
 
     def set_selectable(self, state: bool) -> None:
         """Set item selectable state

{plotpy-2.7.0 → plotpy-2.7.2}/plotpy/items/annotation.py

@@ -17,7 +17,6 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Callable
 
 import numpy as np
-from guidata.configtools import get_icon
 from guidata.dataset import update_dataset
 from guidata.utils.misc import assert_interfaces_valid
 
@@ -60,6 +59,7 @@ class AnnotatedShape(AbstractShape):
     """
 
     __implements__ = (IBasePlotItem, ISerializableType)
+    _icon_name = "annotation.png"
     SHAPE_CLASS: type[AbstractShape] = RectangleShape  # to be overridden
     LABEL_ANCHOR: str = ""
 
@@ -88,7 +88,6 @@ class AnnotatedShape(AbstractShape):
         else:
             self.annotationparam = annotationparam
             self.annotationparam.update_item(self)
-        self.setIcon(get_icon("annotation.png"))
 
     def types(self) -> tuple[type[IItemType], ...]:
         """Returns a group or category for this item.
@@ -485,6 +484,7 @@ class AnnotatedPoint(AnnotatedShape):
     *annotationparam* (see :py:class:`.styles.AnnotationParam`)
     """
 
+    _icon_name = "point_shape.png"
     SHAPE_CLASS = PointShape
     LABEL_ANCHOR = "TL"
 
@@ -498,7 +498,6 @@ class AnnotatedPoint(AnnotatedShape):
         super().__init__(annotationparam, info_callback)
         self.shape: PointShape
         self.set_pos(x, y)
-        self.setIcon(get_icon("point_shape.png"))
 
     # ----Public API-------------------------------------------------------------
     def set_pos(self, x, y):
@@ -547,6 +546,7 @@ class AnnotatedSegment(AnnotatedShape):
     (see :py:class:`.styles.AnnotationParam`)
     """
 
+    _icon_name = "segment.png"
     SHAPE_CLASS = SegmentShape
     LABEL_ANCHOR = "C"
 
@@ -562,7 +562,6 @@ class AnnotatedSegment(AnnotatedShape):
         super().__init__(annotationparam, info_callback)
         self.shape: SegmentShape
         self.set_rect(x1, y1, x2, y2)
-        self.setIcon(get_icon("segment.png"))
 
     # ----Public API-------------------------------------------------------------
     def set_rect(self, x1, y1, x2, y2):
@@ -619,6 +618,7 @@ class AnnotatedPolygon(AnnotatedShape):
         annotationparam: Annotation parameters
     """
 
+    _icon_name = "polygon.png"
     SHAPE_CLASS = PolygonShape
     LABEL_ANCHOR = "C"
 
@@ -635,7 +635,6 @@ class AnnotatedPolygon(AnnotatedShape):
             self.set_points(points)
         if closed is not None:
             self.set_closed(closed)
-        self.setIcon(get_icon("polygon.png"))
 
     # ----Public API-------------------------------------------------------------
     def set_points(self, points: list[tuple[float, float]] | np.ndarray | None) -> None:
@@ -775,6 +774,7 @@ class AnnotatedRectangle(AnnotatedShape):
     (see :py:class:`.styles.AnnotationParam`)
     """
 
+    _icon_name = "rectangle.png"
     SHAPE_CLASS = RectangleShape
     LABEL_ANCHOR = "TL"
 
@@ -790,7 +790,6 @@ class AnnotatedRectangle(AnnotatedShape):
         super().__init__(annotationparam, info_callback)
         self.shape: RectangleShape
         self.set_rect(x1, y1, x2, y2)
-        self.setIcon(get_icon("rectangle.png"))
 
     # ----Public API-------------------------------------------------------------
     def set_rect(self, x1, y1, x2, y2):
@@ -842,6 +841,7 @@ class AnnotatedObliqueRectangle(AnnotatedRectangle):
     (see :py:class:`.styles.AnnotationParam`)
     """
 
+    _icon_name = "oblique_rectangle.png"
     SHAPE_CLASS = ObliqueRectangleShape
     LABEL_ANCHOR = "C"
 
@@ -851,7 +851,6 @@ class AnnotatedObliqueRectangle(AnnotatedRectangle):
         AnnotatedShape.__init__(self, annotationparam)
         self.shape: ObliqueRectangleShape
         self.set_rect(x0, y0, x1, y1, x2, y2, x3, y3)
-        self.setIcon(get_icon("oblique_rectangle.png"))
 
     # ----Public API-------------------------------------------------------------
     def get_tr_angle(self):
@@ -940,6 +939,7 @@ class AnnotatedEllipse(AnnotatedShape):
     (see :py:class:`.styles.AnnotationParam`)
     """
 
+    _icon_name = "ellipse_shape.png"
     SHAPE_CLASS = EllipseShape
     LABEL_ANCHOR = "C"
 
@@ -955,7 +955,6 @@ class AnnotatedEllipse(AnnotatedShape):
         super().__init__(annotationparam, info_callback)
         self.shape: EllipseShape
         self.set_xdiameter(x1, y1, x2, y2)
-        self.setIcon(get_icon("ellipse_shape.png"))
         self.switch_to_ellipse()
 
     # ----Public API-------------------------------------------------------------

{plotpy-2.7.0 → plotpy-2.7.2}/plotpy/items/contour.py

@@ -24,7 +24,6 @@ from __future__ import annotations
 
 import guidata.dataset as gds
 import numpy as np
-from guidata.configtools import get_icon
 from guidata.utils.misc import assert_interfaces_valid
 from skimage import measure
 
@@ -110,10 +109,10 @@ class ContourItem(PolygonShape):
     _can_resize = False
     _can_rotate = False
     _can_move = False
+    _icon_name = "contour.png"
 
     def __init__(self, points=None, shapeparam=None):
         super().__init__(points, closed=True, shapeparam=shapeparam)
-        self.setIcon(get_icon("contour.png"))
 
 
 assert_interfaces_valid(ContourItem)

{plotpy-2.7.0 → plotpy-2.7.2}/plotpy/items/curve/base.py

@@ -6,7 +6,6 @@ import sys
 from typing import TYPE_CHECKING
 
 import numpy as np
-from guidata.configtools import get_icon
 from guidata.dataset import update_dataset
 from guidata.utils.misc import assert_interfaces_valid
 from qtpy import QtCore as QC
@@ -111,6 +110,7 @@ class CurveItem(QwtPlotCurve):
 
     _readonly = False
     _private = False
+    _icon_name = "curve.png"
 
     def __init__(self, curveparam: CurveParam | None = None) -> None:
         super().__init__()
@@ -123,7 +123,6 @@ class CurveItem(QwtPlotCurve):
         self._x = None
         self._y = None
         self.update_params()
-        self.setIcon(get_icon("curve.png"))
 
     def _get_visible_axis_min(self, axis_id: int, axis_data: np.ndarray) -> float:
         """Return axis minimum excluding zero and negative values when
@@ -172,6 +171,22 @@ class CurveItem(QwtPlotCurve):
         """
         return (ICurveItemType, ITrackableItemType, ISerializableType)
 
+    def get_icon_name(self) -> str:
+        """Return the icon name
+
+        Returns:
+            Icon name
+        """
+        return self._icon_name
+
+    def set_icon_name(self, icon_name: str) -> None:
+        """Set the icon name
+
+        Args:
+            icon_name: Icon name
+        """
+        self._icon_name = icon_name
+
     def set_selectable(self, state: bool) -> None:
         """Set item selectable state
 

{plotpy-2.7.0 → plotpy-2.7.2}/plotpy/items/curve/errorbar.py

@@ -6,7 +6,6 @@ import warnings
 from typing import TYPE_CHECKING
 
 import numpy as np
-from guidata.configtools import get_icon
 from guidata.dataset import update_dataset
 from guidata.utils.misc import assert_interfaces_valid
 from qtpy import QtCore as QC
@@ -56,6 +55,8 @@ class ErrorBarCurveItem(CurveItem):
         errorbarparam: Error-bar parameters
     """
 
+    _icon_name = "errorbar.png"
+
     def __init__(
         self,
         curveparam: CurveParam | None = None,
@@ -73,7 +74,6 @@ class ErrorBarCurveItem(CurveItem):
         self._dx = None
         self._dy = None
         self.__minmaxarrays: dict[bool, tuple[float, float, float, float]] = {}
-        self.setIcon(get_icon("errorbar.png"))
 
     def serialize(
         self,

{plotpy-2.7.0 → plotpy-2.7.2}/plotpy/items/grid.py

@@ -10,7 +10,6 @@ from __future__ import annotations
 import sys
 from typing import TYPE_CHECKING
 
-from guidata.configtools import get_icon
 from guidata.utils.misc import assert_interfaces_valid
 from qwt import QwtPlot, QwtPlotGrid
 
@@ -36,6 +35,7 @@ class GridItem(QwtPlotGrid):
 
     _readonly = True
     _private = False
+    _icon_name = "grid.png"
 
     def __init__(self, gridparam: GridParam | None = None) -> None:
         super().__init__()
@@ -47,7 +47,6 @@ class GridItem(QwtPlotGrid):
         self.immutable = True  # set to false to allow moving points around
         self.update_params()  # won't work completely because it's not yet
         # attached to plot (actually, only canvas background won't be updated)
-        self.setIcon(get_icon("grid.png"))
 
     def types(self) -> tuple[type[IItemType], ...]:
         """Returns a group or category for this item.
@@ -95,6 +94,22 @@ class GridItem(QwtPlotGrid):
         """
         return self._private
 
+    def get_icon_name(self) -> str:
+        """Return the icon name
+
+        Returns:
+            Icon name
+        """
+        return self._icon_name
+
+    def set_icon_name(self, icon_name: str) -> None:
+        """Set the icon name
+
+        Args:
+            icon_name: Icon name
+        """
+        self._icon_name = icon_name
+
     def set_selectable(self, state: bool) -> None:
         """Set item selectable state
 

{plotpy-2.7.0 → plotpy-2.7.2}/plotpy/items/histogram.py

@@ -12,7 +12,6 @@ import weakref
 from typing import TYPE_CHECKING
 
 import numpy as np
-from guidata.configtools import get_icon
 from guidata.dataset import update_dataset
 from guidata.utils.misc import assert_interfaces_valid
 from qwt import QwtPlotCurve
@@ -67,6 +66,7 @@ class HistogramItem(CurveItem):
     """
 
     __implements__ = (IBasePlotItem,)
+    _icon_name = "histogram.png"
 
     def __init__(
         self,
@@ -92,7 +92,6 @@ class HistogramItem(CurveItem):
             self.histparam = histparam
         CurveItem.__init__(self, curveparam)
         self.setCurveAttribute(QwtPlotCurve.Inverted)
-        self.setIcon(get_icon("histogram.png"))
 
     def set_hist_source(self, src: BaseImageItem) -> None:
         """Set histogram source

{plotpy-2.7.0 → plotpy-2.7.2}/plotpy/items/image/base.py

@@ -10,7 +10,6 @@ import os.path as osp
 from typing import TYPE_CHECKING, Any
 
 import numpy as np
-from guidata.configtools import get_icon
 from guidata.dataset import update_dataset
 from guidata.utils.misc import assert_interfaces_valid
 from qtpy import QtCore as QC
@@ -82,6 +81,7 @@ class BaseImageItem(QwtPlotItem):
     _can_rotate = False
     _readonly = False
     _private = False
+    _icon_name = "image.png"
 
     def __init__(
         self, data: np.ndarray | None = None, param: Any | None = None
@@ -134,7 +134,6 @@ class BaseImageItem(QwtPlotItem):
         if data is not None:
             self.set_data(data)
         self.param.update_item(self)
-        self.setIcon(get_icon("image.png"))
 
     # ---- Public API ----------------------------------------------------------
     def get_default_param(self) -> Any:
@@ -777,6 +776,22 @@ class BaseImageItem(QwtPlotItem):
         """
         return self.data is None or self.data.size == 0
 
+    def get_icon_name(self) -> str:
+        """Return the icon name
+
+        Returns:
+            Icon name
+        """
+        return self._icon_name
+
+    def set_icon_name(self, icon_name: str) -> None:
+        """Set the icon name
+
+        Args:
+            icon_name: Icon name
+        """
+        self._icon_name = icon_name
+
     def set_selectable(self, state: bool) -> None:
         """Set item selectable state
 

{plotpy-2.7.0 → plotpy-2.7.2}/plotpy/items/image/filter.py

@@ -7,7 +7,6 @@ from collections.abc import Callable
 from typing import TYPE_CHECKING
 
 import numpy as np
-from guidata.configtools import get_icon
 from guidata.dataset import update_dataset
 from guidata.utils.misc import assert_interfaces_valid
 from qtpy import QtCore as QC
@@ -75,6 +74,7 @@ class ImageFilterItem(BaseImageItem):
     _can_select = True
     _can_resize = True
     _can_move = True
+    _icon_name = "funct.png"
 
     def __init__(
         self, image: RawImageItem | None, filter: Callable, param: ImageFilterParam
@@ -92,7 +92,6 @@ class ImageFilterItem(BaseImageItem):
 
         self.imagefilterparam = param
         self.imagefilterparam.update_imagefilter(self)
-        self.setIcon(get_icon("funct.png"))
 
     # ---- Public API -----------------------------------------------------------
     def set_image(self, image: RawImageItem | None) -> None:

{plotpy-2.7.0 → plotpy-2.7.2}/plotpy/items/image/misc.py

@@ -6,7 +6,6 @@ import sys
 from typing import TYPE_CHECKING
 
 import numpy as np
-from guidata.configtools import get_icon
 from guidata.dataset import update_dataset
 from guidata.utils.misc import assert_interfaces_valid
 from qtpy import QtCore as QC
@@ -206,6 +205,7 @@ class Histogram2DItem(BaseImageItem):
     """
 
     __implements__ = (IBasePlotItem, IBaseImageItem, IHistDataSource, IVoiImageItemType)
+    _icon_name = "histogram2d.png"
 
     def __init__(
         self,
@@ -234,7 +234,6 @@ class Histogram2DItem(BaseImageItem):
 
         self.set_lut_range([0, 10.0])
         self.set_data(X, Y, Z)
-        self.setIcon(get_icon("histogram2d.png"))
 
     # ---- BaseImageItem API ---------------------------------------------------
     def get_default_param(self) -> Histogram2DParam:

{plotpy-2.7.0 → plotpy-2.7.2}/plotpy/items/label.py

@@ -16,7 +16,6 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Any
 
 import numpy as np
-from guidata.configtools import get_icon
 from guidata.dataset import update_dataset
 from guidata.utils.misc import assert_interfaces_valid
 from qtpy import QtCore as QC
@@ -207,6 +206,22 @@ class AbstractLabelItem(QwtPlotItem):
             y0 = yMap.transform(self.G[1])
             return x0, y0
 
+    def get_icon_name(self) -> str:
+        """Return the icon name
+
+        Returns:
+            Icon name
+        """
+        return self._icon_name
+
+    def set_icon_name(self, icon_name: str) -> None:
+        """Set the icon name
+
+        Args:
+            icon_name: Icon name
+        """
+        self._icon_name = icon_name
+
     def set_selectable(self, state: bool) -> None:
         """Set item selectable state
 
@@ -497,6 +512,7 @@ class LabelItem(AbstractLabelItem):
     """
 
     __implements__ = (IBasePlotItem, ISerializableType)
+    _icon_name = "label.png"
 
     def __init__(
         self, text: str | None = None, labelparam: LabelParam | None = None
@@ -505,7 +521,6 @@ class LabelItem(AbstractLabelItem):
         self.text = QG.QTextDocument()
         self.marker: qwt.symbol.QwtSymbol | None = None
         super().__init__(labelparam)
-        self.setIcon(get_icon("label.png"))
 
     def __reduce__(self) -> tuple[type, tuple]:
         """Return a tuple containing the constructor and its arguments"""
@@ -645,6 +660,7 @@ class LegendBoxItem(AbstractLabelItem):
     """
 
     __implements__ = (IBasePlotItem, ISerializableType)
+    _icon_name = "legend.png"
 
     def __init__(self, labelparam: LabelParam = None) -> None:
         self.font = None
@@ -652,7 +668,6 @@ class LegendBoxItem(AbstractLabelItem):
         super().__init__(labelparam)
         # saves the last computed sizes
         self.sizes = 0.0, 0.0, 0.0, 0.0
-        self.setIcon(get_icon("legend.png"))
 
     def types(self) -> tuple[type[IItemType], ...]:
         """Returns a group or category for this item.

{plotpy-2.7.0 → plotpy-2.7.2}/plotpy/items/polygonmap.py

@@ -11,7 +11,6 @@ from sys import maxsize
 from typing import TYPE_CHECKING
 
 import numpy as np
-from guidata.configtools import get_icon
 from guidata.dataset import update_dataset
 from guidata.utils.misc import assert_interfaces_valid
 from qtpy import QtCore as QC
@@ -64,6 +63,7 @@ class PolygonMapItem(QwtPlotItem):
     _can_resize = False
     _can_move = False
     _can_rotate = False
+    _icon_name = "polygonmap.png"
 
     def __init__(self, param: PolygonMapParam | None = None) -> None:
         super().__init__()
@@ -78,7 +78,6 @@ class PolygonMapItem(QwtPlotItem):
         #                 (polygon k points are _pts[_n[k-1]:_n[k]])
         self._c = None  # Color of polygon Nx2 [border,background] as RGBA uint32
         self.update_params()
-        self.setIcon(get_icon("polygonmap.png"))
 
     def types(self) -> tuple[type[IItemType], ...]:
         """Returns a group or category for this item.
@@ -125,6 +124,22 @@ class PolygonMapItem(QwtPlotItem):
         """
         return self._can_move
 
+    def get_icon_name(self) -> str:
+        """Return the icon name
+
+        Returns:
+            Icon name
+        """
+        return self._icon_name
+
+    def set_icon_name(self, icon_name: str) -> None:
+        """Set the icon name
+
+        Args:
+            icon_name: Icon name
+        """
+        self._icon_name = icon_name
+
     def set_selectable(self, state: bool) -> None:
         """Set item selectable state
 

{plotpy-2.7.0 → plotpy-2.7.2}/plotpy/items/shape/axis.py

@@ -6,7 +6,6 @@ import math
 from typing import TYPE_CHECKING
 
 import numpy as np
-from guidata.configtools import get_icon
 from guidata.dataset import update_dataset
 from guidata.utils.misc import assert_interfaces_valid
 from qtpy import QtCore as QC
@@ -38,6 +37,7 @@ class Axes(PolygonShape):
     """
 
     CLOSED: bool = True
+    _icon_name = "gtaxes.png"
 
     def __init__(
         self,
@@ -60,7 +60,6 @@ class Axes(PolygonShape):
         else:
             self.axesparam = axesparam
         self.axesparam.update_param(self)
-        self.setIcon(get_icon("gtaxes.png"))
 
     def __reduce__(self) -> tuple:
         """Reduce object to picklable state"""

{plotpy-2.7.0 → plotpy-2.7.2}/plotpy/items/shape/base.py

@@ -38,6 +38,22 @@ class AbstractShape(QwtPlotItem):
         self.selected = False
 
     # ------IBasePlotItem API----------------------------------------------------
+    def get_icon_name(self) -> str:
+        """Return the icon name
+
+        Returns:
+            Icon name
+        """
+        return self._icon_name
+
+    def set_icon_name(self, icon_name: str) -> None:
+        """Set the icon name
+
+        Args:
+            icon_name: Icon name
+        """
+        self._icon_name = icon_name
+
     def set_selectable(self, state: bool) -> None:
         """Set item selectable state
 

{plotpy-2.7.0 → plotpy-2.7.2}/plotpy/items/shape/ellipse.py

@@ -7,7 +7,6 @@ import sys
 from typing import TYPE_CHECKING
 
 import numpy as np
-from guidata.configtools import get_icon
 from guidata.utils.misc import assert_interfaces_valid
 from qtpy import QtCore as QC
 from qtpy import QtGui as QG
@@ -36,6 +35,7 @@ class EllipseShape(PolygonShape):
     """
 
     CLOSED = True
+    _icon_name = "circle.png"
 
     def __init__(
         self,
@@ -48,17 +48,16 @@ class EllipseShape(PolygonShape):
         super().__init__(shapeparam=shapeparam)
         self.is_ellipse = False
         self.set_xdiameter(x1, y1, x2, y2)
-        self.setIcon(get_icon("circle.png"))
 
     def switch_to_ellipse(self):
         """Switch to ellipse mode"""
         self.is_ellipse = True
-        self.setIcon(get_icon("ellipse_shape.png"))
+        self.set_icon_name("ellipse_shape.png")
 
     def switch_to_circle(self):
         """Switch to circle mode"""
         self.is_ellipse = False
-        self.setIcon(get_icon("circle.png"))
+        self.set_icon_name("circle.png")
 
     def set_xdiameter(self, x0: float, y0: float, x1: float, y1: float) -> None:
         """Set the coordinates of the ellipse's X-axis diameter