Replace deprecated icon files with new SVG icons for selection tools

PierreRaybaut · PierreRaybaut · commit eea52b1bdb39 · 2025-04-05T11:37:38.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,10 @@ In this release, test coverage is 80%.
   * 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:
diff --git a/plotpy/data/icons/rectangular_select.png b/plotpy/data/icons/rectangular_select.png
diff --git a/plotpy/data/icons/select.svg b/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>
diff --git a/plotpy/data/icons/select_area.svg b/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>
diff --git a/plotpy/data/icons/selection.png b/plotpy/data/icons/selection.png
diff --git a/plotpy/tools/plot.py b/plotpy/tools/plot.py
@@ -224,7 +224,7 @@ def setup_context_menu(self, menu, plot):
 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__(
diff --git a/plotpy/tools/selection.py b/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:
