PlotPy 2.7.2__tar.gz → 2.7.3__tar.gz

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

@@ -1,5 +1,23 @@
 # Changelog #
 
+## Version 2.7.3 ##
+
+In this release, test coverage is 80%.
+
+🛠️ Bug fixes:
+
+* [Issue #40](https://github.com/PlotPyStack/PlotPy/issues/40) - Z-axis logarithmic scale (`ZAxisLogTool` tool) is not compatible with anti-aliasing interpolation
+* Fix intersection check for destination rectangle in `XYImageFilterItem`
+* [Issue #36](https://github.com/PlotPyStack/PlotPy/issues/36) - Image items are not properly scaling along Y-axis with logarithmic scale:
+  * Actually, image items do not support non-linear scales (this is an historical limitation)
+  * This is not documented at all, so we've added an explicit warning: a red colored message is displayed at the center of the image frame when any non-linear scale is applied to either X or Y axis
+  * When dealing with non-linear scales, PlotPy provides an alternative solution: the user may rely on `XYImageItem` (e.g. by using `make.xyimage`) as this item supports arbitrary X and Y pixel coordinates
+* [Issue #34](https://github.com/PlotPyStack/PlotPy/issues/34) - `ValueError` when trying to plot 2D histogram items with `PyQt6`
+
+Other changes:
+
+* Replace deprecated icon files with new SVG icons for selection tools
+
 ## Version 2.7.2 ##
 
 🛠️ Bug fixes:

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: PlotPy
-Version: 2.7.2
+Version: 2.7.3
 Summary: Curve and image plotting tools for Python/Qt applications
 Author-email: Codra <p.raybaut@codra.fr>
 License: BSD 3-Clause License
@@ -83,6 +83,7 @@ Requires-Dist: python-docs-theme; extra == "doc"
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-xvfb; extra == "test"
+Dynamic: license-file
 
 # PlotPy: Curve and image plotting tools for Python/Qt applications
 

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: PlotPy
-Version: 2.7.2
+Version: 2.7.3
 Summary: Curve and image plotting tools for Python/Qt applications
 Author-email: Codra <p.raybaut@codra.fr>
 License: BSD 3-Clause License
@@ -83,6 +83,7 @@ Requires-Dist: python-docs-theme; extra == "doc"
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-xvfb; extra == "test"
+Dynamic: license-file
 
 # PlotPy: Curve and image plotting tools for Python/Qt applications
 

{plotpy-2.7.2 → plotpy-2.7.3}/PlotPy.egg-info/SOURCES.txt

@@ -184,10 +184,10 @@ plotpy/data/icons/point_selection.png
 plotpy/data/icons/print.png
 plotpy/data/icons/python.png
 plotpy/data/icons/quickview.png
-plotpy/data/icons/rectangular_select.png
 plotpy/data/icons/refresh.png
 plotpy/data/icons/save_all.png
-plotpy/data/icons/selection.png
+plotpy/data/icons/select.svg
+plotpy/data/icons/select_area.svg
 plotpy/data/icons/settings.png
 plotpy/data/icons/shape.png
 plotpy/data/icons/snapshot.png
@@ -392,8 +392,8 @@ plotpy/tests/features/test_dicom_image.py
 plotpy/tests/features/test_fit.py
 plotpy/tests/features/test_image_coords.py
 plotpy/tests/features/test_image_data_update.py
-plotpy/tests/features/test_imagefilter.py
-plotpy/tests/features/test_imagesuperp.py
+plotpy/tests/features/test_image_filter.py
+plotpy/tests/features/test_image_superp.py
 plotpy/tests/features/test_loadsaveitems_hdf5.py
 plotpy/tests/features/test_loadsaveitems_json.py
 plotpy/tests/features/test_loadsaveitems_pickle.py

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

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

plotpy-2.7.3/plotpy/data/icons/select.svg

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+
+<svg
+   width="800px"
+   height="800px"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="selection.svg"
+   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="0.71329397"
+     inkscape:cx="270.57568"
+     inkscape:cy="428.29466"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1" />
+  <g
+     id="g1"
+     transform="matrix(0.88784428,0,0,0.88784428,0.95332363,0.89724577)">
+    <path
+       fill="#444444"
+       d="M 5,2.6 10.75,9 H 8.29 l 0.63,1.41 1.8,4 -0.91,0.34 -1.88,-4.3 -0.5,-1.11 -1,0.71 L 5,11.07 Z M 4,0 V 13 L 7,10.86 9.26,16 12.06,15 9.83,10 H 13 Z"
+       id="path1" />
+    <path
+       style="fill:#ffffff;stroke-width:1.19165;stroke-linecap:square;stroke-dashoffset:1.1932"
+       d="m 490.09419,734.12823 c -0.67954,-1.27167 -22.05472,-49.94327 -47.5004,-108.1591 C 396.26003,519.9646 373.2364,468.10145 371.93278,466.79782 c -0.38275,-0.38274 -27.76081,18.58526 -60.84013,42.15111 l -60.14422,42.847 -0.35938,-105.321 c -0.19767,-57.92657 -0.19767,-152.31589 0,-209.75406 l 0.35938,-104.43303 142.0959,158.16753 142.09589,158.16752 -60.4325,0.36537 c -33.23788,0.20097 -60.43252,0.88758 -60.43252,1.52581 0,0.63824 4.6488,11.51415 10.33066,24.16869 5.68185,12.65455 32.44633,72.21658 59.47659,132.36009 27.03027,60.1435 49.35142,110.20446 49.60256,111.24657 0.31025,1.28737 -6.40508,4.50021 -20.94934,10.02285 -18.97837,7.20633 -21.54607,7.86591 -22.64148,5.81596 z"
+       id="path2"
+       transform="scale(0.02)" />
+  </g>
+</svg>

plotpy-2.7.3/plotpy/data/icons/select_area.svg

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+
+<svg
+   width="800px"
+   height="800px"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg2"
+   sodipodi:docname="select_area.svg"
+   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="namedview2"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="true"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="0.71329397"
+     inkscape:cx="278.28639"
+     inkscape:cy="361.00123"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     style="fill:#ffffff;stroke-width:0.920918;stroke-linecap:square;stroke-dasharray:1.8096, 1.2064"
+     d="M 2.3167695,2.4490864 V 2.7494641 3.0516405 3.3592128 3.6595906 H 2.9211222 V 3.3592128 3.0516405 H 4.428407 4.7305834 V 2.4490864 H 4.428407 2.9211222 2.6189458 Z m 3.0163681,0 V 3.0516405 H 5.6353139 7.4447742 7.7469505 V 2.4490864 H 7.4447742 5.6353139 Z m 3.0163671,0 v 0.6025541 h 0.3021764 1.8094619 0.300378 V 2.4490864 H 10.461143 8.6516811 Z m 3.0163683,0 v 0.6025541 h 0.300378 1.366989 v 0.1420947 h 0.602554 V 2.8915589 2.4490864 h -1.969543 z m 1.667367,1.347203 v 0.3021763 1.809461 0.3021763 h 0.602554 V 5.9079267 4.0984657 3.7962894 Z M 2.3167695,4.2639433 V 4.5643209 6.3755806 6.6759583 H 2.9211222 V 6.3755806 4.5643209 4.2639433 Z M 13.03324,6.8126572 v 0.3021763 1.8094609 0.3003778 h 0.602554 V 8.9242944 7.1148335 6.8126572 Z M 2.3167695,7.2803111 V 7.5806888 9.3901502 9.6923266 H 2.9211222 V 9.3901502 7.5806888 7.2803111 Z m 0,3.0145679 v 0.302177 1.647581 h 0.7662327 0.3021764 v -0.604353 h -0.3021764 -0.16188 v -1.043228 -0.302177 z m 1.6709633,1.345405 v 0.604353 H 4.2899091 6.0993703 6.4015466 V 11.640284 H 6.0993703 4.2899091 Z"
+     id="path4-4"
+     sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
+  <path
+     style="fill:#ffffff;stroke-linecap:square;stroke-dasharray:1.965, 1.31;fill-opacity:0.60000002"
+     d="M 2.1589979,2.3552702 H 13.795154 V 12.337129 H 2.1589979 Z"
+     id="path3" />
+  <path
+     style="fill:#444444;stroke-linecap:square;stroke-dasharray:1.965, 1.31"
+     d="m 1.8307733,2.0285024 v 0.3261719 0.328125 0.3339843 0.326172 h 0.65625 V 3.0167836 2.6827993 H 4.123742 4.451867 V 2.0285024 H 4.123742 2.4870233 2.1588983 Z m 3.2753906,0 v 0.6542969 h 0.328125 1.9648437 0.328125 V 2.0285024 H 7.3991326 5.4342889 Z m 3.2753906,0 v 0.6542969 h 0.328125 1.9648435 0.326172 V 2.0285024 H 10.674523 8.7096795 Z m 3.2753905,0 v 0.6542969 h 0.326172 1.484375 v 0.1542968 h 0.654297 V 2.5089711 2.0285024 h -2.138672 z m 1.810547,1.4628907 v 0.3281249 1.9648438 0.328125 h 0.654297 V 5.7843618 3.819518 3.4913931 Z M 1.8307733,3.9992055 v 0.3261718 1.966797 0.3261719 h 0.65625 V 6.2921743 4.3253773 3.9992055 Z M 13.467492,6.7667837 v 0.328125 1.9648437 0.3261719 h 0.654297 V 9.0597524 7.0949087 6.7667837 Z M 1.8307733,7.2745962 v 0.3261719 1.9648442 0.328125 h 0.65625 V 9.5656123 7.6007681 7.2745962 Z m 0,3.2734368 v 0.328125 1.789063 h 0.8320312 0.328125 v -0.65625 H 2.6628045 2.4870233 v -1.132813 -0.328125 z m 1.8144531,1.460938 v 0.65625 h 0.328125 1.9648437 0.328125 v -0.65625 H 5.9381951 3.9733514 Z"
+     id="path4"
+     sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
+  <g
+     id="g2"
+     transform="matrix(0.70442294,0,0,0.70442294,4.554049,4.547731)">
+    <path
+       fill="#444444"
+       d="M 5,2.6 10.75,9 H 8.29 l 0.63,1.41 1.8,4 -0.91,0.34 -1.88,-4.3 -0.5,-1.11 -1,0.71 L 5,11.07 Z M 4,0 V 13 L 7,10.86 9.26,16 12.06,15 9.83,10 H 13 Z"
+       id="path1-0" />
+    <path
+       style="fill:#ffffff;stroke-width:1.19165;stroke-linecap:square;stroke-dashoffset:1.1932"
+       d="m 490.09419,734.12823 c -0.67954,-1.27167 -22.05472,-49.94327 -47.5004,-108.1591 C 396.26003,519.9646 373.2364,468.10145 371.93278,466.79782 c -0.38275,-0.38274 -27.76081,18.58526 -60.84013,42.15111 l -60.14422,42.847 -0.35938,-105.321 c -0.19767,-57.92657 -0.19767,-152.31589 0,-209.75406 l 0.35938,-104.43303 142.0959,158.16753 142.09589,158.16752 -60.4325,0.36537 c -33.23788,0.20097 -60.43252,0.88758 -60.43252,1.52581 0,0.63824 4.6488,11.51415 10.33066,24.16869 5.68185,12.65455 32.44633,72.21658 59.47659,132.36009 27.03027,60.1435 49.35142,110.20446 49.60256,111.24657 0.31025,1.28737 -6.40508,4.50021 -20.94934,10.02285 -18.97837,7.20633 -21.54607,7.86591 -22.64148,5.81596 z"
+       id="path2-9"
+       transform="scale(0.02)" />
+  </g>
+</svg>

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

@@ -14,7 +14,7 @@ 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
-from qwt import QwtPlotItem
+from qwt import QwtLinearScaleEngine, QwtPlotItem
 
 from plotpy import io
 from plotpy._scaler import (
@@ -55,6 +55,7 @@ if TYPE_CHECKING:
     from qtpy.QtGui import QColor, QPainter
 
     from plotpy.interfaces import IItemType
+    from plotpy.plot import BasePlot
     from plotpy.styles.base import ItemParameters
     from plotpy.widgets.colormap.widget import EditableColormap
 
@@ -582,6 +583,29 @@ class BaseImageItem(QwtPlotItem):
         """
         self.border_rect.draw(painter, xMap, yMap, canvasRect)
 
+    def warn_if_non_linear_scale(self, painter: QPainter, canvasRect: QRectF) -> bool:
+        """Warn if non-linear scale
+
+        Args:
+            painter: Painter
+            canvasRect: Canvas rectangle
+
+        Returns:
+            True if non-linear scale
+        """
+        plot: BasePlot = self.plot()
+        if not isinstance(
+            plot.axisScaleEngine(plot.X_BOTTOM), QwtLinearScaleEngine
+        ) or not isinstance(plot.axisScaleEngine(plot.Y_LEFT), QwtLinearScaleEngine):
+            painter.setPen(QC.Qt.red)
+            painter.drawText(
+                canvasRect,
+                QC.Qt.AlignCenter,
+                _("Non-linear scales are not supported for image items"),
+            )
+            return True
+        return False
+
     def draw_image(
         self,
         painter: QPainter,
@@ -601,6 +625,8 @@ class BaseImageItem(QwtPlotItem):
             xMap: X axis scale map
             yMap: Y axis scale map
         """
+        if self.warn_if_non_linear_scale(painter, canvasRect):
+            return
         dest = _scale_rect(
             self.data, src_rect, self._offscreen, dst_rect, self.lut, self.interpolate
         )

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

@@ -313,7 +313,7 @@ class XYImageFilterItem(ImageFilterItem):
         j0, j1 = int(yMap.transform(y0)), int(yMap.transform(y1))
 
         dstRect = QC.QRect(i0, j0, i1 - i0, j1 - j0)
-        if not dstRect.intersects(canvasRect):
+        if not dstRect.intersects(canvasRect.toAlignedRect()):
             return
 
         x, y, data = self.image.get_data(x0, y0, x1, y1)

{plotpy-2.7.2 → plotpy-2.7.3}/plotpy/items/image/image_items.py

@@ -11,6 +11,7 @@ from guidata.utils.misc import assert_interfaces_valid
 from qtpy import QtCore as QC
 
 from plotpy import io
+from plotpy._scaler import INTERP_AA
 from plotpy.config import _
 from plotpy.constants import LUTAlpha
 from plotpy.coords import canvas_to_axes, pixelround
@@ -241,9 +242,13 @@ class ImageItem(RawImageItem):
             if self._log_data is None:
                 self._log_data = np.array(np.log10(self.data.clip(1)), dtype=np.float64)
             self.set_lut_range(get_nan_range(self._log_data))
+            dtype = self._log_data.dtype
         else:
             self._log_data = None
             self.set_lut_range(self._lin_lut_range)
+            dtype = self.data.dtype
+        if self.interpolate[0] == INTERP_AA:
+            self.interpolate = (INTERP_AA, self.interpolate[1].astype(dtype))
         plot.update_colormap_axis(self)
 
     # ---- BaseImageItem API ---------------------------------------------------
@@ -376,6 +381,9 @@ class ImageItem(RawImageItem):
         """
         if self.data is None:
             return
+        if self.warn_if_non_linear_scale(painter, canvasRect):
+            return
+
         src2 = self._rescale_src_rect(src_rect)
         dst_rect = tuple([int(i) for i in dst_rect])
 
@@ -651,6 +659,8 @@ class XYImageItem(RawImageItem):
             xMap: X axis scale map
             yMap: Y axis scale map
         """
+        if self.warn_if_non_linear_scale(painter, canvasRect):
+            return
         xytr = self.x, self.y, src_rect
         dst_rect = tuple([int(i) for i in dst_rect])
         dest = _scale_xy(

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

@@ -39,7 +39,7 @@ except ImportError:
         file=sys.stderr,
     )
     print(
-        ("try running :" "python setup.py build_ext --inplace -c mingw32"),
+        ("try running: python setup.py build_ext --inplace"),
         file=sys.stderr,
     )
     raise
@@ -169,6 +169,8 @@ class QuadGridItem(RawImageItem):
             xMap: X axis scale map
             yMap: Y axis scale map
         """
+        if self.warn_if_non_linear_scale(painter, canvasRect):
+            return
         self._offscreen[...] = np.uint32(0)
         dest = _scale_quads(
             self.X,
@@ -294,6 +296,8 @@ class Histogram2DItem(BaseImageItem):
             xMap: X axis scale map
             yMap: Y axis scale map
         """
+        if self.warn_if_non_linear_scale(painter, canvasRect):
+            return
         computation = self.histparam.computation
         i1, j1, i2, j2 = src_rect
 
@@ -340,7 +344,7 @@ class Histogram2DItem(BaseImageItem):
             return BaseImageItem.draw_image(self, *args)
 
         if self.fill_canvas:
-            x1, y1, x2, y2 = canvasRect.getCoords()
+            x1, y1, x2, y2 = canvasRect.toAlignedRect().getCoords()
             drawfunc(painter, canvasRect, src_rect, (x1, y1, x2, y2), xMap, yMap)
         else:
             dst_rect = tuple([int(i) for i in dst_rect])

{plotpy-2.7.2 → plotpy-2.7.3}/plotpy/items/image/transform.py

@@ -257,6 +257,8 @@ class TrImageItem(RawImageItem):
             xMap: X axis scale map
             yMap: Y axis scale map
         """
+        if self.warn_if_non_linear_scale(painter, canvasRect):
+            return
         W = canvasRect.width()
         H = canvasRect.height()
         if W <= 1 or H <= 1:

{plotpy-2.7.2 → plotpy-2.7.3}/plotpy/plot/manager.py

@@ -13,49 +13,6 @@ from qtpy import QtWidgets as QW
 from plotpy.constants import ID_CONTRAST, ID_ITEMLIST, ID_XCS, ID_YCS
 from plotpy.interfaces import IPlotManager
 from plotpy.plot import BasePlot
-from plotpy.tools import (
-    AboutTool,
-    AnnotatedCircleTool,
-    AnnotatedEllipseTool,
-    AnnotatedObliqueRectangleTool,
-    AnnotatedPointTool,
-    AnnotatedRectangleTool,
-    AnnotatedSegmentTool,
-    AntiAliasingTool,
-    AspectRatioTool,
-    AverageCrossSectionTool,
-    AxisScaleTool,
-    BasePlotMenuTool,
-    ColormapTool,
-    ContrastPanelTool,
-    CopyToClipboardTool,
-    CrossSectionTool,
-    CurveStatsTool,
-    DeleteItemTool,
-    DisplayCoordsTool,
-    DoAutoscaleTool,
-    DownSamplingTool,
-    DummySeparatorTool,
-    EditItemDataTool,
-    ExportItemDataTool,
-    HelpTool,
-    ImageStatsTool,
-    ItemCenterTool,
-    ItemListPanelTool,
-    LabelTool,
-    PrintTool,
-    RectangularSelectionTool,
-    RectZoomTool,
-    ReverseColormapTool,
-    ReverseXAxisTool,
-    ReverseYAxisTool,
-    SaveAsTool,
-    SelectTool,
-    SnapshotTool,
-    XCSPanelTool,
-    YCSPanelTool,
-    ZAxisLogTool,
-)
 
 if TYPE_CHECKING:
     from typing import Callable
@@ -241,12 +198,16 @@ class PlotManager:
         Args:
             toolbar_id: toolbar's id (default to None)
         """
+        # This avoids circular imports (see Issue #39)
+        # pylint: disable=import-outside-toplevel
+        import plotpy.tools as tools
+
         if toolbar_id is None:
             for _id, toolbar in list(self.toolbars.items()):
                 if toolbar is self.get_default_toolbar():
                     toolbar_id = _id
                     break
-        self.add_tool(DummySeparatorTool, toolbar_id)
+        self.add_tool(tools.DummySeparatorTool, toolbar_id)
 
     def set_default_tool(self, tool: GuiTool) -> None:
         """
@@ -547,22 +508,26 @@ class PlotManager:
         Registering basic tools for standard plot dialog
         --> top of the context-menu
         """
-        t = self.add_tool(SelectTool)
+        # This avoids circular imports (see Issue #39)
+        # pylint: disable=import-outside-toplevel
+        import plotpy.tools as tools
+
+        t = self.add_tool(tools.SelectTool)
         self.set_default_tool(t)
-        self.add_tool(RectangularSelectionTool, intersect=False)
-        self.add_tool(RectZoomTool)
-        self.add_tool(DoAutoscaleTool)
-        self.add_tool(BasePlotMenuTool, "item")
-        self.add_tool(ExportItemDataTool)
-        self.add_tool(EditItemDataTool)
-        self.add_tool(ItemCenterTool)
-        self.add_tool(DeleteItemTool)
+        self.add_tool(tools.RectangularSelectionTool, intersect=False)
+        self.add_tool(tools.RectZoomTool)
+        self.add_tool(tools.DoAutoscaleTool)
+        self.add_tool(tools.BasePlotMenuTool, "item")
+        self.add_tool(tools.ExportItemDataTool)
+        self.add_tool(tools.EditItemDataTool)
+        self.add_tool(tools.ItemCenterTool)
+        self.add_tool(tools.DeleteItemTool)
         self.add_separator_tool()
-        self.add_tool(BasePlotMenuTool, "grid")
-        self.add_tool(BasePlotMenuTool, "axes")
-        self.add_tool(DisplayCoordsTool)
+        self.add_tool(tools.BasePlotMenuTool, "grid")
+        self.add_tool(tools.BasePlotMenuTool, "axes")
+        self.add_tool(tools.DisplayCoordsTool)
         if self.get_itemlist_panel():
-            self.add_tool(ItemListPanelTool)
+            self.add_tool(tools.ItemListPanelTool)
 
     def register_curve_tools(self) -> None:
         """
@@ -580,10 +545,14 @@ class PlotManager:
 
             :py:meth:`.plot.manager.PlotManager.register_all_tools`
         """
-        self.add_tool(CurveStatsTool)
-        self.add_tool(AntiAliasingTool)
-        self.add_tool(AxisScaleTool)
-        self.add_tool(DownSamplingTool)
+        # This avoids circular imports (see Issue #39)
+        # pylint: disable=import-outside-toplevel
+        import plotpy.tools as tools
+
+        self.add_tool(tools.CurveStatsTool)
+        self.add_tool(tools.AntiAliasingTool)
+        self.add_tool(tools.AxisScaleTool)
+        self.add_tool(tools.DownSamplingTool)
 
     def register_image_tools(self) -> None:
         """
@@ -601,21 +570,25 @@ class PlotManager:
 
             :py:meth:`.plot.manager.PlotManager.register_all_tools`
         """
-        self.add_tool(ColormapTool)
-        self.add_tool(ReverseColormapTool)
-        self.add_tool(ReverseXAxisTool)
-        self.add_tool(ReverseYAxisTool)
-        self.add_tool(ZAxisLogTool)
-        self.add_tool(AspectRatioTool)
+        # This avoids circular imports (see Issue #39)
+        # pylint: disable=import-outside-toplevel
+        import plotpy.tools as tools
+
+        self.add_tool(tools.ColormapTool)
+        self.add_tool(tools.ReverseColormapTool)
+        self.add_tool(tools.ReverseXAxisTool)
+        self.add_tool(tools.ReverseYAxisTool)
+        self.add_tool(tools.ZAxisLogTool)
+        self.add_tool(tools.AspectRatioTool)
         if self.get_contrast_panel():
-            self.add_tool(ContrastPanelTool)
-        self.add_tool(SnapshotTool)
-        self.add_tool(ImageStatsTool)
+            self.add_tool(tools.ContrastPanelTool)
+        self.add_tool(tools.SnapshotTool)
+        self.add_tool(tools.ImageStatsTool)
         if self.get_xcs_panel() and self.get_ycs_panel():
-            self.add_tool(XCSPanelTool)
-            self.add_tool(YCSPanelTool)
-            self.add_tool(CrossSectionTool)
-            self.add_tool(AverageCrossSectionTool)
+            self.add_tool(tools.XCSPanelTool)
+            self.add_tool(tools.YCSPanelTool)
+            self.add_tool(tools.CrossSectionTool)
+            self.add_tool(tools.AverageCrossSectionTool)
 
     def register_other_tools(self) -> None:
         """
@@ -633,11 +606,15 @@ class PlotManager:
 
             :py:meth:`.plot.manager.PlotManager.register_all_tools`
         """
-        self.add_tool(SaveAsTool)
-        self.add_tool(CopyToClipboardTool)
-        self.add_tool(PrintTool)
-        self.add_tool(HelpTool)
-        self.add_tool(AboutTool)
+        # This avoids circular imports (see Issue #39)
+        # pylint: disable=import-outside-toplevel
+        import plotpy.tools as tools
+
+        self.add_tool(tools.SaveAsTool)
+        self.add_tool(tools.CopyToClipboardTool)
+        self.add_tool(tools.PrintTool)
+        self.add_tool(tools.HelpTool)
+        self.add_tool(tools.AboutTool)
 
     def register_all_curve_tools(self) -> None:
         """
@@ -732,23 +709,31 @@ class PlotManager:
         """
         Register all annotation tools for the plot
         """
+        # This avoids circular imports (see Issue #39)
+        # pylint: disable=import-outside-toplevel
+        import plotpy.tools as tools
+
         self.add_separator_tool()
-        self.add_tool(AnnotatedPointTool)
-        self.add_tool(AnnotatedSegmentTool)
-        self.add_tool(AnnotatedRectangleTool)
-        self.add_tool(AnnotatedObliqueRectangleTool)
-        self.add_tool(AnnotatedCircleTool)
-        self.add_tool(AnnotatedEllipseTool)
-        self.add_tool(LabelTool)
+        self.add_tool(tools.AnnotatedPointTool)
+        self.add_tool(tools.AnnotatedSegmentTool)
+        self.add_tool(tools.AnnotatedRectangleTool)
+        self.add_tool(tools.AnnotatedObliqueRectangleTool)
+        self.add_tool(tools.AnnotatedCircleTool)
+        self.add_tool(tools.AnnotatedEllipseTool)
+        self.add_tool(tools.LabelTool)
 
     def register_curve_annotation_tools(self) -> None:
         """
         Register all curve friendly annotation tools for the plot
         """
+        # This avoids circular imports (see Issue #39)
+        # pylint: disable=import-outside-toplevel
+        import plotpy.tools as tools
+
         self.add_separator_tool()
-        self.add_tool(AnnotatedPointTool)
-        self.add_tool(AnnotatedSegmentTool)
-        self.add_tool(LabelTool)
+        self.add_tool(tools.AnnotatedPointTool)
+        self.add_tool(tools.AnnotatedSegmentTool)
+        self.add_tool(tools.LabelTool)
 
     def register_image_annotation_tools(self) -> None:
         """

{plotpy-2.7.2 → plotpy-2.7.3}/plotpy/tests/features/test_fit.py

@@ -21,8 +21,8 @@ def test_fit():
         a, b = params
         return np.cos(b * x) + a
 
-    a = FitParam("Offset", 1.0, 0.0, 2.0)
-    b = FitParam("Frequency", 2.0, 1.0, 10.0, logscale=True)
+    a = FitParam("Offset", 0.7, -1.0, 1.0)
+    b = FitParam("Frequency", 1.2, 0.3, 3.0, logscale=True)
     params = [a, b]
     values = guifit(x, y, fit, params, xlabel="Time (s)", ylabel="Power (a.u.)")
 

{plotpy-2.7.2 → plotpy-2.7.3}/plotpy/tests/items/test_mandelbrot.py

@@ -47,8 +47,9 @@ class MandelItem(RawImageItem):
 
     # ---- QwtPlotItem API ------------------------------------------------------
     def draw_image(self, painter, canvasRect, srcRect, dstRect, xMap, yMap):
-        x1, y1 = canvasRect.left(), canvasRect.top()
-        x2, y2 = canvasRect.right(), canvasRect.bottom()
+        if self.warn_if_non_linear_scale(painter, canvasRect):
+            return
+        x1, y1, x2, y2 = canvasRect.toAlignedRect().getCoords()
         i1, j1, i2, j2 = srcRect
 
         NX = x2 - x1
@@ -58,7 +59,7 @@ class MandelItem(RawImageItem):
         mandelbrot(i1, j1, i2, j2, self.data, self.IMAX)
 
         srcRect = (0, 0, NX, NY)
-        x1, y1, x2, y2 = canvasRect.getCoords()
+        x1, y1, x2, y2 = canvasRect.toAlignedRect().getCoords()
         RawImageItem.draw_image(
             self, painter, canvasRect, srcRect, (x1, y1, x2, y2), xMap, yMap
         )

{plotpy-2.7.2 → plotpy-2.7.3}/plotpy/tests/widgets/test_dotarraydemo.py

@@ -102,6 +102,8 @@ class DotArrayItem(RawImageItem):
 
     def draw_image(self, painter, canvasRect, srcRect, dstRect, xMap, yMap):
         """Draw image"""
+        if self.warn_if_non_linear_scale(painter, canvasRect):
+            return
         painter.setRenderHint(QG.QPainter.Antialiasing, True)
         param = self.param
         xcoords = vmap(xMap, np.arange(0, param.dim_h + 1, param.step_x))

{plotpy-2.7.2 → plotpy-2.7.3}/plotpy/tools/plot.py

@@ -224,7 +224,7 @@ class DummySeparatorTool(GuiTool):
 class RectangularSelectionTool(RectangularActionTool):
     SWITCH_TO_DEFAULT_TOOL = True
     TITLE = _("Rectangular selection tool")
-    ICON = "rectangular_select.png"
+    ICON = "select_area.svg"
 
     def __init__(self, manager, intersect=True, toolbar_id=DefaultToolbarID):
         super().__init__(

{plotpy-2.7.2 → plotpy-2.7.3}/plotpy/tools/selection.py

@@ -32,7 +32,7 @@ class SelectTool(InteractiveTool):
     """
 
     TITLE = _("Selection")
-    ICON = "selection.png"
+    ICON = "select.svg"
     CURSOR = QC.Qt.CursorShape.ArrowCursor
 
     def setup_filter(self, baseplot: BasePlot) -> int: