Skip to content

Commit 216d341

Browse files
committed
Merge branch 'develop' into fix/i18n
2 parents e2931c8 + 67fc00b commit 216d341

File tree

4 files changed

+29
-11
lines changed

4 files changed

+29
-11
lines changed

.vscode/tasks.json

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"group": {
1616
"kind": "build",
17-
"isDefault": false
17+
"isDefault": true
1818
},
1919
"presentation": {
2020
"clear": true,
@@ -37,7 +37,7 @@
3737
},
3838
"group": {
3939
"kind": "build",
40-
"isDefault": false
40+
"isDefault": true
4141
},
4242
"presentation": {
4343
"clear": true,
@@ -65,7 +65,7 @@
6565
},
6666
"group": {
6767
"kind": "build",
68-
"isDefault": false
68+
"isDefault": true
6969
},
7070
"presentation": {
7171
"clear": true,
@@ -172,7 +172,10 @@
172172
"dev,doc,test",
173173
],
174174
"options": {
175-
"cwd": "${workspaceFolder}"
175+
"cwd": "${workspaceFolder}",
176+
"statusbar": {
177+
"hide": true
178+
}
176179
},
177180
"group": {
178181
"kind": "build",
@@ -281,11 +284,14 @@
281284
"env": {
282285
"UNATTENDED": "1",
283286
"PYTHON": "${command:python.interpreterPath}",
287+
},
288+
"statusbar": {
289+
"hide": true
284290
}
285291
},
286292
"group": {
287293
"kind": "build",
288-
"isDefault": true
294+
"isDefault": false
289295
},
290296
"presentation": {
291297
"echo": true,
@@ -334,6 +340,9 @@
334340
"env": {
335341
"PYTHON": "${command:python.interpreterPath}",
336342
"UNATTENDED": "1",
343+
},
344+
"statusbar": {
345+
"hide": true
337346
}
338347
},
339348
"args": [
@@ -343,7 +352,7 @@
343352
"problemMatcher": [],
344353
"group": {
345354
"kind": "build",
346-
"isDefault": true
355+
"isDefault": false
347356
},
348357
"presentation": {
349358
"echo": true,
@@ -367,6 +376,9 @@
367376
"env": {
368377
"PYTHON": "${command:python.interpreterPath}",
369378
"UNATTENDED": "1",
379+
},
380+
"statusbar": {
381+
"hide": true
370382
}
371383
},
372384
"args": [
@@ -376,7 +388,7 @@
376388
"problemMatcher": [],
377389
"group": {
378390
"kind": "build",
379-
"isDefault": true
391+
"isDefault": false
380392
},
381393
"presentation": {
382394
"echo": true,
@@ -437,7 +449,7 @@
437449
},
438450
"group": {
439451
"kind": "build",
440-
"isDefault": false
452+
"isDefault": true
441453
},
442454
"presentation": {
443455
"echo": true,

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog #
22

3+
## Version 2.7.5 ##
4+
5+
🛠️ Bug fixes:
6+
7+
* [Issue #44](https://github.com/PlotPyStack/PlotPy/issues/44) - Incorrect calculation method for "∑(y)" in `CurveStatsTool`: replaced `spt.trapezoid` with `np.sum`, which is more consistent with the summation operation
8+
39
## Version 2.7.4 ##
410

511
In this release, test coverage is 80%.

plotpy/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
.. _GitHub: https://github.com/PierreRaybaut/plotpy
2121
"""
2222

23-
__version__ = "2.7.4"
23+
__version__ = "2.7.5"
2424
__VERSION__ = tuple([int(number) for number in __version__.split(".")])
2525

2626
# --- Important note: DATAPATH and LOCALEPATH are used by guidata.configtools

plotpy/tools/curve.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def __init__(
7474
("%g < y < %g", lambda *args: (args[1].min(), args[1].max())),
7575
("<y>=%g", lambda *args: args[1].mean()),
7676
("σ(y)=%g", lambda *args: args[1].std()),
77-
("∑(y)=%g", lambda *args: spt.trapezoid(args[1])),
77+
("∑(y)=%g", lambda *args: np.sum(args[1])),
7878
("∫ydx=%g", lambda *args: spt.trapezoid(args[1], args[0])),
7979
)
8080
self.labelfuncs = labelfuncs
@@ -96,7 +96,7 @@ def set_labelfuncs(
9696
("%g < y < %g", lambda *args: (args[1].min(), args[1].max())),
9797
("<y>=%g", lambda *args: args[1].mean()),
9898
("σ(y)=%g", lambda *args: args[1].std()),
99-
("∑(y)=%g", lambda *args: spt.trapezoid(args[1])),
99+
("∑(y)=%g", lambda *args: np.sum(args[1])),
100100
("∫ydx=%g", lambda *args: spt.trapezoid(args[1], args[0])),
101101
)
102102
"""

0 commit comments

Comments
 (0)