Merge pull request #65 from PlotPyStack/fix/issues-55-deltacursory

fix/55-deltacursory

Author: ThomasMalletCodra

plotpy/locale/fr/LC_MESSAGES/plotpy.po

@@ -355,15 +355,15 @@ msgstr "Police des valeurs"
 msgid "Scale"
 msgstr "Échelle"
 
+msgid "logarithmic"
+msgstr "logarithmique"
+
 msgid "linear"
 msgstr "linéaire"
 
 msgid "date/time"
 msgstr "date/heure"
 
-msgid "logarithmic"
-msgstr "logarithmique"
-
 msgid "Lower axis limit"
 msgstr "Borne inférieure de l'axe"
 
@@ -630,12 +630,12 @@ msgstr "Classes"
 msgid "Number of bins"
 msgstr "Nombre de classes"
 
-msgid "Minimum value"
-msgstr "Valeur minimale"
-
 msgid "Min"
 msgstr "Min"
 
+msgid "Minimum value"
+msgstr "Valeur minimale"
+
 msgid "Maximum value"
 msgstr "Valeur maximale"
 
@@ -1422,12 +1422,11 @@ msgid ""
 "<b>Keyboard/mouse shortcuts:</b><br><br>\n"
 "  - <u>single left-click</u>: item (curve, image, ...) selection<br>\n"
 "  - <u>single right-click</u>: context-menu relative to selected item<br>\n"
-"  - <u>shift</u>: on-active-curve (or image) cursor (+ <u>control</u> to maintain\n"
-"cursor visible)<br>\n"
-"  - <u>shift + control</u>: on-active-curve cursor (+ <u>control</u> to maintain\n"
-"cursor visible)<br>\n"
+"  - <u>shift</u>: on-active-curve (or image) cursor<br>\n"
+"  - <u>shift + control</u>: on-active-curve cursor (maintained visible)<br>\n"
 "  - <u>alt</u>: free cursor<br>\n"
 "  - <u>left-click + mouse move</u>: move item (when available)<br>\n"
+"  - <u>control + left-click + mouse move</u>: move label on markers and range selections<br>\n"
 "  - <u>middle-click + mouse move</u>: pan<br>\n"
 "  - <u>right-click + mouse move</u>: zoom"
 msgstr ""
@@ -1687,3 +1686,25 @@ msgstr "Rotation et rognage"
 msgid "Show cropping rectangle"
 msgstr "Afficher le rectangle de rognage"
 
+msgid ""
+"<b>Keyboard/mouse shortcuts:</b><br><br>\n"
+"  - <u>single left-click</u>: item (curve, image, ...) selection<br>\n"
+"  - <u>single right-click</u>: context-menu relative to selected item<br>\n"
+"  - <u>shift</u>: on-active-curve (or image) cursor (+ <u>control</u> to maintain\n"
+"cursor visible)<br>\n"
+"  - <u>shift + control</u>: on-active-curve cursor (+ <u>control</u> to maintain\n"
+"cursor visible)<br>\n"
+"  - <u>alt</u>: free cursor<br>\n"
+"  - <u>left-click + mouse move</u>: move item (when available)<br>\n"
+"  - <u>middle-click + mouse move</u>: pan<br>\n"
+"  - <u>right-click + mouse move</u>: zoom"
+msgstr ""
+"<b>Raccourcis clavier et souris :</b><br><br>\n"
+"  - <u>clique gauche</u> : sélection d'un objet (courbe, image, ...)<br>\n"
+"  - <u>clique droit</u> : menu contextuel relatif à l'objet sélectionné<br>\n"
+"  - <u>shift</u> : curseur sur la courbe (ou l'image) active (+ <u>control</u> pour maintenir le curseur visible)<br>\n"
+"  - <u>shift + control</u> : curseur sur la courbe (ou l'image) active (+ <u>control</u> pour maintenir le curseur visible)<br>\n"
+"  - <u>alt</u> : curseur libre<br>\n"
+"  - <u>clique gauche + déplacement souris</u> : déplacement de l'objet actif (si possible)<br>\n"
+"  - <u>clique du milieu + déplacement souris</u> : translation dans le plan ('pan')<br>\n"
+"  - <u>clique droit + déplacement souris</u> : agrandissement ('zoom')"

plotpy/tools/curve.py

@@ -142,13 +142,13 @@ class CurveStatsTool(BaseRangeCursorTool):
     TITLE = _("Signal statistics")
     ICON = "xrange.png"
     LABELFUNCS: tuple[tuple[str, Callable[..., Any]], ...] = (
-        ("%g < x < %g", lambda *args: (args[0].min(), args[0].max())),
-        ("%g < y < %g", lambda *args: (args[1].min(), args[1].max())),
-        ("∆x=%g", lambda *args: args[0].max() - args[0].min()),
-        ("∆y=%g", lambda *args: args[1].max() - args[1].min()),
-        ("<y>=%g", lambda *args: args[1].mean()),
-        ("σ(y)=%g", lambda *args: args[1].std()),
-        ("∑(y)=%g", lambda *args: np.sum(args[1])),
+        ("%g < x < %g", lambda *args: (np.nanmin(args[0]), np.nanmax(args[0]))),
+        ("%g < y < %g", lambda *args: (np.nanmin(args[1]), np.nanmax(args[1]))),
+        ("∆x=%g", lambda *args: np.nanmax(args[0]) - np.nanmin(args[0])),
+        ("∆y=%g", lambda *args: np.nanmax(args[1]) - np.nanmin(args[1])),
+        ("<y>=%g", lambda *args: np.nanmean(args[1])),
+        ("σ(y)=%g", lambda *args: np.nanstd(args[1])),
+        ("∑(y)=%g", lambda *args: np.nansum(args[1])),
         ("∫ydx=%g", lambda *args: spt.trapezoid(args[1], args[0])),
     )
     SHAPECLASS = XRangeSelection
@@ -212,8 +212,8 @@ class YRangeCursorTool(BaseRangeCursorTool):
     TITLE = _("Y-range")
     ICON = "yrange.png"
     LABELFUNCS: tuple[tuple[str, Callable[..., Any]], ...] = (
-        ("%g < y < %g", lambda ymin, ymax: (ymin, ymax)),
-        ("∆y=%g", lambda ymin, ymax: ymax - ymin),
+        ("%g < y < %g", lambda ymin, ymax: (min(ymin, ymax), max(ymin, ymax))),
+        ("∆y=%g", lambda ymin, ymax: abs(ymax - ymin)),
     )
     SHAPECLASS = YRangeSelection
 

scripts/reinstall_dev.py

@@ -3,7 +3,8 @@
 Reinstall multiple local libraries in editable mode for development.
 
 Workflow:
-  1) Try to uninstall all target libraries in one command (ignore errors if some are not installed).
+  1) Try to uninstall all target libraries in one command (ignore errors if some are
+  not installed).
   2) Reinstall each library in editable mode from a sibling folder: ../<library>.
 
 This script uses the same Python interpreter that runs it (sys.executable),