Skip to content

Commit a9c5007

Browse files
committed
Merge branch 'main' into develop
# Conflicts: # doc/locale/fr/LC_MESSAGES/contributing/changelog.po # doc/locale/fr/LC_MESSAGES/features/signal/menu_processing.po
2 parents 50dbf66 + 0fce3ce commit a9c5007

File tree

6 files changed

+42
-6
lines changed

6 files changed

+42
-6
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ See DataLab [roadmap page](https://datalab-platform.com/en/contributing/roadmap.
4545

4646
🛠️ Bug fixes:
4747

48+
* Fixed [Issue #172](https://github.com/DataLab-Platform/DataLab/issues/172) - Image profiles: when moving/resizing image, profile plots are not refreshed (fixed in PlotPy v2.7.4)
49+
* Fixed [Issue #173](https://github.com/DataLab-Platform/DataLab/issues/173) - Phase spectrum: add unit (degree) and function reference (`numpy.angle`) to the documentation
50+
* Fixed [Issue #177](https://github.com/DataLab-Platform/DataLab/issues/177) - "Open from directory" feature: unexpected group name (a group named "." is created instead of the root folder name)
4851
* 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
4952
* 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)
5053

cdl/core/gui/panel/base.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -937,7 +937,10 @@ def load_from_directory(self, directory: str | None = None) -> list[TypeObj]:
937937
)
938938
if new_objs:
939939
objs += new_objs
940-
grp = self.add_group(osp.relpath(path, directory))
940+
grp_name = osp.relpath(path, directory)
941+
if grp_name == ".":
942+
grp_name = osp.basename(path)
943+
grp = self.add_group(grp_name)
941944
for obj in new_objs:
942945
self.add_object(obj, group_id=grp.uuid, set_current=False)
943946
return objs

doc/features/signal/menu_processing.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ The following functions are available:
190190
- Optionnal: use logarithmic scale (dB)
191191
- :math:`y_{1} = |FFT(y_{0})|` or :math:`20.log_{10}(|FFT(y_{0})|)` (dB)
192192
* - Phase spectrum
193-
-
193+
- Phase of the FFT expressed in degrees, using `numpy.angle <https://docs.scipy.org/doc/numpy/reference/generated/numpy.angle.html>`_ function
194194
- :math:`y_{1} = \angle FFT(y_{0})`
195195
* - Power spectral density (PSD)
196196
- Optionnal: use logarithmic scale (dB). PSD is estimated using Welch's method

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

+19-1
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-20 20:42+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"
@@ -138,6 +138,15 @@ msgstr "DataLab Version 0.19.2"
138138
msgid "🛠️ Bug fixes:"
139139
msgstr "🛠️ Corrections de bugs :"
140140

141+
msgid "Fixed [Issue #172](https://github.com/DataLab-Platform/DataLab/issues/172) - Image profiles: when moving/resizing image, profile plots are not refreshed (fixed in PlotPy v2.7.4)"
142+
msgstr "Correction de l'[Issue #172](https://github.com/DataLab-Platform/DataLab/issues/172) - Profils d'image : lors du déplacement/redimensionnement de l'image, les graphiques de profil ne sont pas actualisés (corrigé dans PlotPy v2.7.4)"
143+
144+
msgid "Fixed [Issue #173](https://github.com/DataLab-Platform/DataLab/issues/173) - Phase spectrum: add unit (degree) and function reference (`numpy.angle`) to the documentation"
145+
msgstr "Correction de l'[Issue #173](https://github.com/DataLab-Platform/DataLab/issues/173) - Spectre de phase : ajouter l'unité (degré) et la référence de fonction (`numpy.angle`) à la documentation"
146+
147+
msgid "Fixed [Issue #177](https://github.com/DataLab-Platform/DataLab/issues/177) - \"Open from directory\" feature: unexpected group name (a group named \".\" is created instead of the root folder name)"
148+
msgstr "Correction de l'[Issue #177](https://github.com/DataLab-Platform/DataLab/issues/177) - Fonctionnalité \"Ouvrir depuis le répertoire\" : nom de groupe inattendu (un groupe nommé \".\" est créé au lieu du nom du dossier racine)"
149+
141150
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"
142151
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"
143152

@@ -195,6 +204,9 @@ msgstr "Correction de l'[Issue #165](https://github.com/DataLab-Platform/DataLab
195204
msgid "DataLab Version 0.19.0"
196205
msgstr "DataLab Version 0.19.0"
197206

207+
msgid "💥 New features and enhancements:"
208+
msgstr "💥 Nouvelles fonctionnalités et améliorations :"
209+
198210
msgid "Image operation features (\"Operations\" menu):"
199211
msgstr "Fonctionnalités d'opération sur les images (menu \"Opérations\") :"
200212

@@ -204,6 +216,9 @@ msgstr "Renommage du sous-menu \"Rotation\" en \"Symétrie ou rotation\""
204216
msgid "New \"Flip diagonally\" feature"
205217
msgstr "Nouvelle fonctionnalité \"Symétrie diagonale\""
206218

219+
msgid "Signal processing features (\"Processing\" menu):"
220+
msgstr "Fonctionnalités de traitement du signal (menu \"Traitement\") :"
221+
207222
msgid "New \"Convert to Cartesian coordinates\" feature"
208223
msgstr "Nouvelle fonctionnalité \"Convertir en coordonnées cartésiennes\""
209224

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

261+
msgid "Public API (local or remote):"
262+
msgstr "API publique (locale ou distante) :"
263+
246264
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:"
247265
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 :"
248266

doc/locale/fr/LC_MESSAGES/features/signal/menu_processing.po

+14-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: DataLab \n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2025-04-20 20:28+0200\n"
11+
"POT-Creation-Date: 2025-03-20 16:17+0100\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language: fr\n"
@@ -17,7 +17,7 @@ msgstr ""
1717
"MIME-Version: 1.0\n"
1818
"Content-Type: text/plain; charset=utf-8\n"
1919
"Content-Transfer-Encoding: 8bit\n"
20-
"Generated-By: Babel 2.14.0\n"
20+
"Generated-By: Babel 2.17.0\n"
2121

2222
msgid "Processing Signals"
2323
msgstr "Traitement des signaux"
@@ -249,6 +249,9 @@ msgstr "Les fonctions suivantes sont disponibles :"
249249
msgid "Function"
250250
msgstr "Fonction"
251251

252+
msgid "Description"
253+
msgstr "Description"
254+
252255
msgid "FFT"
253256
msgstr "FFT"
254257

@@ -280,6 +283,9 @@ msgstr ":math:`y_{1} = |FFT(y_{0})|` ou :math:`20.log_{10}(|FFT(y_{0})|)` (dB)"
280283
msgid "Phase spectrum"
281284
msgstr "Spectre de phase"
282285

286+
msgid "Phase of the FFT expressed in degrees, using `numpy.angle <https://docs.scipy.org/doc/numpy/reference/generated/numpy.angle.html>`_ function"
287+
msgstr "Phase de la FFT exprimée en degrés, utilisant la fonction `numpy.angle <https://docs.scipy.org/doc/numpy/reference/generated/numpy.angle.html>`_"
288+
283289
#, python-brace-format
284290
msgid ":math:`y_{1} = \\angle FFT(y_{0})`"
285291
msgstr ""
@@ -574,6 +580,9 @@ msgstr "Elimination de tendance"
574580
msgid "Create a new signal which is the detrending of each selected signal. This features is based on SciPy's `scipy.signal.detrend <https://docs.scipy.org/doc/scipy/reference/generated/scipy.signal.detrend.html>`_ function."
575581
msgstr "Crée un signal à partir de l'élimination de tendance de chaque signal. Cette fonctionnalité est basée sur la fonction `scipy.signal.detrend <https://docs.scipy.org/doc/scipy/reference/generated/scipy.signal.detrend.html>`_ de SciPy."
576582

583+
msgid "The following parameters are available:"
584+
msgstr "Les paramètres suivants sont disponibles :"
585+
577586
msgid "Detrending method: 'linear' or 'constant'. See SciPy's `scipy.signal.detrend <https://docs.scipy.org/doc/scipy/reference/generated/scipy.signal.detrend.html>`_ function."
578587
msgstr "Méthode d'élimination de tendance : 'linéaire' ou 'constante'. Voir la fonction `scipy.signal.detrend <https://docs.scipy.org/doc/scipy/reference/generated/scipy.signal.detrend.html>`_ de SciPy."
579588

@@ -658,6 +667,9 @@ msgstr "Pas"
658667
msgid "Resampling step size"
659668
msgstr "Pas de rééchantillonnage"
660669

670+
msgid "Number of points"
671+
msgstr "Nombre de points"
672+
661673
msgid "Resampling number of points"
662674
msgstr "Nombre de points de rééchantillonnage"
663675

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ classifiers = [
4141
requires-python = ">=3.9, <4"
4242
dependencies = [
4343
"guidata >= 3.7",
44-
"PlotPy >= 2.7",
44+
"PlotPy >= 2.7.4",
4545
"SciPy >= 1.5, < 1.15.0",
4646
"scikit-image >= 0.18",
4747
"pandas >= 1.2",

0 commit comments

Comments
 (0)