Skip to content

Commit a6ef9f6

Browse files
committed
Merge branch 'main' into develop
# Conflicts: # CHANGELOG.md # cdl/__init__.py # doc/locale/fr/LC_MESSAGES/contributing/changelog.po
2 parents 6ffde07 + c1579ab commit a6ef9f6

File tree

16 files changed

+923
-596
lines changed

16 files changed

+923
-596
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ doc/extras_require-doc.txt
1414
*.bak
1515
/tutorialnotes*.md
1616
doc/locale/pot/_sphinx_design_static/
17+
doc/contributing/changelog.md
1718

1819
# Visual Studio Code
1920
.venv

CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@ See DataLab [roadmap page](https://datalab-platform.com/en/contributing/roadmap.
3131
* `set_current` argument allows to specify if the signal or image should be set as current after being added (default is `True`)
3232
* This closes [Issue #151](https://github.com/DataLab-Platform/DataLab/issues/151) - Public API: add a keyword `group_id` to `add_signal` and `add_image`
3333

34+
## DataLab Version 0.19.2 ##
35+
36+
🛠️ Bug fixes:
37+
38+
* Fixed [Issue #169](https://github.com/DataLab-Platform/DataLab/issues/169) - Signal / Fourier analysis: magnitude spectrum feature does not work as expected with logarithmic scale enabled
39+
* Fixed [Issue #168](https://github.com/DataLab-Platform/DataLab/issues/168) - Average profile visualization: empty profile is displayed when the target rectangular area is outside the image area (this has been fixed upstream, in PlotPy v2.7.4, and so requires the latest version of PlotPy)
40+
3441
## DataLab Version 0.19.1 ##
3542

3643
🛠️ Bug fixes:

cdl/algorithms/signal.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ def magnitude_spectrum(
119119
x1, y1 = fft1d(x, y)
120120
if log_scale:
121121
y_mag = 20 * np.log10(np.abs(y1))
122-
y_mag = np.abs(y1)
122+
else:
123+
y_mag = np.abs(y1)
123124
return x1, y_mag
124125

125126

doc/conf.py

+45
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
# pylint: skip-file
44

55
import os
6+
import os.path as osp
7+
import shutil
68
import sys
79

810
sys.path.insert(0, os.path.abspath(".."))
@@ -11,6 +13,49 @@
1113

1214
os.environ["CDL_DOC"] = "1"
1315

16+
17+
# -- Copy CHANGELOG.md to doc/contributing folder ------------------------
18+
#
19+
# Note: An alternative to this could be to create a 'contributing/changelog.rst' file
20+
# containing the following:
21+
#
22+
# .. include:: ../../CHANGELOG.md
23+
# :parser: myst_parser.sphinx_
24+
#
25+
# But, due to the on-the-fly parsing of the markdown file, this alternative approach
26+
# is not compatible with the internationalization process of the documentation (see
27+
# https://github.com/DataLab-Platform/DataLab/issues/108). That is why we copy the
28+
# CHANGELOG.md file to the doc/contributing folder and remove it after the build.
29+
30+
31+
def copy_changelog(app):
32+
"""Copy CHANGELOG.md to doc/contributing folder."""
33+
docpath = osp.abspath(osp.dirname(__file__))
34+
dest_fname = osp.join(docpath, "contributing", "changelog.md")
35+
if osp.exists(dest_fname):
36+
os.remove(dest_fname)
37+
shutil.copyfile(osp.join(docpath, "..", "CHANGELOG.md"), dest_fname)
38+
app.env.temp_changelog_path = dest_fname
39+
40+
41+
def cleanup_changelog(app, exception):
42+
"""Remove CHANGELOG.md from doc/contributing folder."""
43+
try:
44+
path = getattr(app.env, "temp_changelog_path", None)
45+
if path and osp.exists(path):
46+
os.remove(path)
47+
except Exception as exc:
48+
print(f"Warning: failed to remove {path}: {exc}")
49+
finally:
50+
del app.env.temp_changelog_path
51+
52+
53+
def setup(app):
54+
"""Setup function for Sphinx."""
55+
app.connect("builder-inited", copy_changelog)
56+
app.connect("build-finished", cleanup_changelog)
57+
58+
1459
# -- Project information -----------------------------------------------------
1560

1661
project = "DataLab"

doc/contributing/changelog.rst

-2
This file was deleted.

doc/contributing/roadmap.md

+218
Large diffs are not rendered by default.

doc/contributing/roadmap.rst

-188
This file was deleted.

doc/images/shots/i_beautiful.png

-350 Bytes
Loading

doc/images/shots/s_app_at_startup.png

-44 Bytes
Loading

doc/images/shots/s_beautiful.png

-293 Bytes
Loading

doc/locale/fr/LC_MESSAGES/contributing/changelog.po

+21-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: DataLab \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2025-04-13 19:50+0200\n"
10+
"POT-Creation-Date: 2025-04-19 14:24+0200\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313
"Language: fr\n"
@@ -102,12 +102,21 @@ msgstr "L'argument `set_current` permet de spécifier si le signal ou l'image do
102102
msgid "This closes [Issue #151](https://github.com/DataLab-Platform/DataLab/issues/151) - Public API: add a keyword `group_id` to `add_signal` and `add_image`"
103103
msgstr "Ceci corrige l'[Issue #151](https://github.com/DataLab-Platform/DataLab/issues/151) - API publique : ajouter un mot-clé `group_id` à `add_signal` et `add_image`"
104104

105-
msgid "DataLab Version 0.19.1"
106-
msgstr "DataLab Version 0.19.1"
105+
msgid "DataLab Version 0.19.2"
106+
msgstr "DataLab Version 0.19.2"
107107

108108
msgid "🛠️ Bug fixes:"
109109
msgstr "🛠️ Corrections de bugs :"
110110

111+
msgid "Fixed [Issue #169](https://github.com/DataLab-Platform/DataLab/issues/169) - Signal / Fourier analysis: magnitude spectrum feature does not work as expected with logarithmic scale enabled"
112+
msgstr "Correction de l'[Issue #169](https://github.com/DataLab-Platform/DataLab/issues/169) - Analyse de signal / Fourier : la fonction de spectre de magnitude ne fonctionne pas comme prévu avec l'échelle logarithmique activée"
113+
114+
msgid "Fixed [Issue #168](https://github.com/DataLab-Platform/DataLab/issues/168) - Average profile visualization: empty profile is displayed when the target rectangular area is outside the image area (this has been fixed upstream, in PlotPy v2.7.4, and so requires the latest version of PlotPy)"
115+
msgstr "Correction de l'[Issue #168](https://github.com/DataLab-Platform/DataLab/issues/168) - Visualisation du profil moyen : le profil vide est affiché lorsque la zone rectangulaire cible est en dehors de la zone de l'image (ceci a été corrigé en amont, dans PlotPy v2.7.4, et nécessite donc la dernière version de PlotPy)"
116+
117+
msgid "DataLab Version 0.19.1"
118+
msgstr "DataLab Version 0.19.1"
119+
111120
msgid "Pairwise operation mode:"
112121
msgstr "Mode d'opération pairwise :"
113122

@@ -156,6 +165,9 @@ msgstr "Correction de l'[Issue #165](https://github.com/DataLab-Platform/DataLab
156165
msgid "DataLab Version 0.19.0"
157166
msgstr "DataLab Version 0.19.0"
158167

168+
msgid "💥 New features and enhancements:"
169+
msgstr "💥 Nouvelles fonctionnalités et améliorations :"
170+
159171
msgid "Image operation features (\"Operations\" menu):"
160172
msgstr "Fonctionnalités d'opération sur les images (menu \"Opérations\") :"
161173

@@ -165,6 +177,9 @@ msgstr "Renommage du sous-menu \"Rotation\" en \"Symétrie ou rotation\""
165177
msgid "New \"Flip diagonally\" feature"
166178
msgstr "Nouvelle fonctionnalité \"Symétrie diagonale\""
167179

180+
msgid "Signal processing features (\"Processing\" menu):"
181+
msgstr "Fonctionnalités de traitement du signal (menu \"Traitement\") :"
182+
168183
msgid "New \"Convert to Cartesian coordinates\" feature"
169184
msgstr "Nouvelle fonctionnalité \"Convertir en coordonnées cartésiennes\""
170185

@@ -204,6 +219,9 @@ msgstr "Ajout de la méthode `compute_inverse` pour les processeurs d'image et d
204219
msgid "This closes [Issue #143](https://github.com/DataLab-Platform/DataLab/issues/143) - New feature: `1/x` for signals and images"
205220
msgstr "Ceci corrige l'[Issue #143](https://github.com/DataLab-Platform/DataLab/issues/143) - Nouvelle fonctionnalité : `1/x` pour les signaux et les images"
206221

222+
msgid "Public API (local or remote):"
223+
msgstr "API publique (locale ou distante) :"
224+
207225
msgid "Add `add_group` method with `title` and `select` arguments to create a new group in a data panel (e.g. Signal or Image panel) and eventually select it after creation:"
208226
msgstr "Ajout de la méthode `add_group` avec les arguments `title` et `select` pour créer un nouveau groupe dans un panneau de données (par exemple, panneau Signal ou Image) et éventuellement le sélectionner après sa création :"
209227

0 commit comments

Comments
 (0)