Skip to content

Commit 5841609

Browse files
PierreRaybautPierreRaybaut
committed
fix(config): define marker line and text colors for consistency in plot settings
(cherry picked from commit 91fbc20) # Conflicts: # doc/locale/fr/LC_MESSAGES/release_notes/release_1.00.po
1 parent 7d153a0 commit 5841609

File tree

3 files changed

+51
-27
lines changed

3 files changed

+51
-27
lines changed

‎datalab/config.py‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,8 @@ def reset():
487487

488488
ROI_LINE_COLOR = "#5555ff"
489489
ROI_SEL_LINE_COLOR = "#9393ff"
490+
MARKER_LINE_COLOR = "#A11818"
491+
MARKER_TEXT_COLOR = "#440909"
490492

491493
PLOTPY_DEFAULTS = {
492494
"plot": {
@@ -522,39 +524,39 @@ def reset():
522524
"marker/cross/text/background_color": "#ffffff",
523525
"marker/cross/text/background_alpha": 0.7,
524526
"marker/cross/line/style": "DashLine",
525-
"marker/cross/line/color": "#A11818",
527+
"marker/cross/line/color": MARKER_LINE_COLOR,
526528
"marker/cross/line/width": 1.0,
527529
"marker/cross/markerstyle": "Cross",
528530
"marker/cross/spacing": 7,
529531
# Cursor line and symbol style
530532
"marker/cursor/line/style": "SolidLine",
531-
"marker/cursor/line/color": "#A11818",
533+
"marker/cursor/line/color": MARKER_LINE_COLOR,
532534
"marker/cursor/line/width": 1.0,
533535
"marker/cursor/symbol/marker": "NoSymbol",
534536
"marker/cursor/symbol/size": 11,
535537
"marker/cursor/symbol/edgecolor": MAIN_BG_COLOR,
536538
"marker/cursor/symbol/facecolor": "#ff9393",
537539
"marker/cursor/symbol/alpha": 1.0,
538540
"marker/cursor/sel_line/style": "SolidLine",
539-
"marker/cursor/sel_line/color": "#A11818",
541+
"marker/cursor/sel_line/color": MARKER_LINE_COLOR,
540542
"marker/cursor/sel_line/width": 2.0,
541543
"marker/cursor/sel_symbol/marker": "NoSymbol",
542544
"marker/cursor/sel_symbol/size": 11,
543545
"marker/cursor/sel_symbol/edgecolor": MAIN_BG_COLOR,
544-
"marker/cursor/sel_symbol/facecolor": "#A11818",
546+
"marker/cursor/sel_symbol/facecolor": MARKER_LINE_COLOR,
545547
"marker/cursor/sel_symbol/alpha": 0.8,
546548
"marker/cursor/text/font/size": 9,
547549
"marker/cursor/text/font/family": "default",
548550
"marker/cursor/text/font/bold": False,
549551
"marker/cursor/text/font/italic": False,
550-
"marker/cursor/text/textcolor": "#440909",
552+
"marker/cursor/text/textcolor": MARKER_TEXT_COLOR,
551553
"marker/cursor/text/background_color": "#ffffff",
552554
"marker/cursor/text/background_alpha": 0.7,
553555
"marker/cursor/sel_text/font/size": 9,
554556
"marker/cursor/sel_text/font/family": "default",
555557
"marker/cursor/sel_text/font/bold": False,
556558
"marker/cursor/sel_text/font/italic": False,
557-
"marker/cursor/sel_text/textcolor": "#440909",
559+
"marker/cursor/sel_text/textcolor": MARKER_TEXT_COLOR,
558560
"marker/cursor/sel_text/background_color": "#ffffff",
559561
"marker/cursor/sel_text/background_alpha": 0.7,
560562
# Default annotation text style for segments:
@@ -604,15 +606,15 @@ def reset():
604606
# Annotated shape style for result shapes:
605607
# Signals:
606608
"s/annotation/line/style": "SolidLine",
607-
"s/annotation/line/color": MAIN_FG_COLOR,
608-
"s/annotation/line/width": 1,
609-
"s/annotation/fill/style": "SolidPattern",
609+
"s/annotation/line/color": "#00aa00",
610+
"s/annotation/line/width": 2,
611+
"s/annotation/fill/style": "NoBrush",
610612
"s/annotation/fill/color": MAIN_BG_COLOR,
611613
"s/annotation/fill/alpha": 0.1,
612614
"s/annotation/symbol/marker": "XCross",
613615
"s/annotation/symbol/size": 7,
614-
"s/annotation/symbol/edgecolor": MAIN_FG_COLOR,
615-
"s/annotation/symbol/facecolor": MAIN_FG_COLOR,
616+
"s/annotation/symbol/edgecolor": "#00aa00",
617+
"s/annotation/symbol/facecolor": "#00aa00",
616618
"s/annotation/symbol/alpha": 1.0,
617619
"s/annotation/sel_line/style": "DashLine",
618620
"s/annotation/sel_line/color": "#00ff00",
@@ -651,65 +653,65 @@ def reset():
651653
# Marker styles for results:
652654
# Signals:
653655
"s/marker/cursor/line/style": "DashLine",
654-
"s/marker/cursor/line/color": "#ffff00",
656+
"s/marker/cursor/line/color": MARKER_LINE_COLOR,
655657
"s/marker/cursor/line/width": 1.0,
656658
"s/marker/cursor/symbol/marker": "Ellipse",
657659
"s/marker/cursor/symbol/size": 11,
658660
"s/marker/cursor/symbol/edgecolor": MAIN_BG_COLOR,
659-
"s/marker/cursor/symbol/facecolor": "#ffff00",
661+
"s/marker/cursor/symbol/facecolor": MARKER_LINE_COLOR,
660662
"s/marker/cursor/symbol/alpha": 0.7,
661663
"s/marker/cursor/sel_line/style": "DashLine",
662-
"s/marker/cursor/sel_line/color": "#ffff00",
664+
"s/marker/cursor/sel_line/color": MARKER_LINE_COLOR,
663665
"s/marker/cursor/sel_line/width": 2.0,
664666
"s/marker/cursor/sel_symbol/marker": "Ellipse",
665667
"s/marker/cursor/sel_symbol/size": 11,
666-
"s/marker/cursor/sel_symbol/edgecolor": "#ffff00",
667-
"s/marker/cursor/sel_symbol/facecolor": "#ffff00",
668+
"s/marker/cursor/sel_symbol/edgecolor": MARKER_LINE_COLOR,
669+
"s/marker/cursor/sel_symbol/facecolor": MARKER_LINE_COLOR,
668670
"s/marker/cursor/sel_symbol/alpha": 0.7,
669671
"s/marker/cursor/text/font/size": 9,
670672
"s/marker/cursor/text/font/family": "default",
671673
"s/marker/cursor/text/font/bold": False,
672674
"s/marker/cursor/text/font/italic": False,
673-
"s/marker/cursor/text/textcolor": "#440909",
675+
"s/marker/cursor/text/textcolor": MARKER_TEXT_COLOR,
674676
"s/marker/cursor/text/background_color": "#ffffff",
675677
"s/marker/cursor/text/background_alpha": 0.7,
676678
"s/marker/cursor/sel_text/font/size": 9,
677679
"s/marker/cursor/sel_text/font/family": "default",
678680
"s/marker/cursor/sel_text/font/bold": False,
679681
"s/marker/cursor/sel_text/font/italic": False,
680-
"s/marker/cursor/sel_text/textcolor": "#440909",
682+
"s/marker/cursor/sel_text/textcolor": MARKER_TEXT_COLOR,
681683
"s/marker/cursor/sel_text/background_color": "#ffffff",
682684
"s/marker/cursor/sel_text/background_alpha": 0.7,
683685
"s/marker/cursor/markerstyle": "Cross",
684686
# Images:
685687
"i/marker/cursor/line/style": "DashLine",
686-
"i/marker/cursor/line/color": "#ffff00",
688+
"i/marker/cursor/line/color": MARKER_LINE_COLOR,
687689
"i/marker/cursor/line/width": 1.0,
688690
"i/marker/cursor/symbol/marker": "Diamond",
689691
"i/marker/cursor/symbol/size": 11,
690-
"i/marker/cursor/symbol/edgecolor": "#ffff00",
691-
"i/marker/cursor/symbol/facecolor": "#ffff00",
692+
"i/marker/cursor/symbol/edgecolor": MARKER_LINE_COLOR,
693+
"i/marker/cursor/symbol/facecolor": MARKER_LINE_COLOR,
692694
"i/marker/cursor/symbol/alpha": 0.7,
693695
"i/marker/cursor/sel_line/style": "DashLine",
694-
"i/marker/cursor/sel_line/color": "#ffff00",
696+
"i/marker/cursor/sel_line/color": MARKER_LINE_COLOR,
695697
"i/marker/cursor/sel_line/width": 2.0,
696698
"i/marker/cursor/sel_symbol/marker": "Diamond",
697699
"i/marker/cursor/sel_symbol/size": 11,
698-
"i/marker/cursor/sel_symbol/edgecolor": "#ffff00",
699-
"i/marker/cursor/sel_symbol/facecolor": "#ffff00",
700+
"i/marker/cursor/sel_symbol/edgecolor": MARKER_LINE_COLOR,
701+
"i/marker/cursor/sel_symbol/facecolor": MARKER_LINE_COLOR,
700702
"i/marker/cursor/sel_symbol/alpha": 0.7,
701703
"i/marker/cursor/text/font/size": 9,
702704
"i/marker/cursor/text/font/family": "default",
703705
"i/marker/cursor/text/font/bold": False,
704706
"i/marker/cursor/text/font/italic": False,
705-
"i/marker/cursor/text/textcolor": "#440909",
707+
"i/marker/cursor/text/textcolor": MARKER_TEXT_COLOR,
706708
"i/marker/cursor/text/background_color": "#ffffff",
707709
"i/marker/cursor/text/background_alpha": 0.7,
708710
"i/marker/cursor/sel_text/font/size": 9,
709711
"i/marker/cursor/sel_text/font/family": "default",
710712
"i/marker/cursor/sel_text/font/bold": False,
711713
"i/marker/cursor/sel_text/font/italic": False,
712-
"i/marker/cursor/sel_text/textcolor": "#440909",
714+
"i/marker/cursor/sel_text/textcolor": MARKER_TEXT_COLOR,
713715
"i/marker/cursor/sel_text/background_color": "#ffffff",
714716
"i/marker/cursor/sel_text/background_alpha": 0.7,
715717
"i/marker/cursor/markerstyle": "Cross",

‎doc/locale/fr/LC_MESSAGES/release_notes/release_1.00.po‎

Lines changed: 16 additions & 1 deletion
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-12-13 14:17+0100\n"
10+
"POT-Creation-Date: 2025-12-13 16:32+0100\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313
"Language: fr\n"
@@ -200,6 +200,21 @@ msgstr "Correction du suffixe en double dans le titre de l'image résultante lor
200200
msgid "This fix is provided by Sigima 1.0.4"
201201
msgstr "Ce correctif est fourni par Sigima 1.0.4"
202202

203+
msgid "**Result visualization - Analysis result segments hard to see:**"
204+
msgstr "**Visualisation des résultats - Segments de résultats d'analyse difficiles à voir :**"
205+
206+
msgid "Fixed analysis result markers (FWHM, pulse features, etc.) being difficult or impossible to see on signal plots"
207+
msgstr "Correction des marqueurs de résultats d'analyse (FWHM, caractéristiques des impulsions, etc.) difficiles ou impossibles à voir sur les graphiques de signaux"
208+
209+
msgid "These measurement indicators were appearing black on white backgrounds or white on dark backgrounds, making them blend into the plot"
210+
msgstr "Ces indicateurs de mesure apparaissaient en noir sur des fonds blancs ou en blanc sur des fonds sombres, les faisant se fondre dans le graphique"
211+
212+
msgid "They now display in bright green with thicker lines, making them clearly visible in all color themes"
213+
msgstr "Ils s'affichent désormais en vert vif avec des lignes plus épaisses, les rendant clairement visibles dans tous les thèmes de couleur"
214+
215+
msgid "Also removed the filled area that was obscuring the underlying signal data - markers now show only the boundary lines indicating the measured region"
216+
msgstr "Suppression également de la zone remplie qui obscurcissait les données de signal sous-jacentes - les marqueurs affichent désormais uniquement les lignes de délimitation indiquant la région mesurée"
217+
203218
msgid "DataLab Version 1.0.2 (2025-12-03)"
204219
msgstr "DataLab Version 1.0.2 (03/12/2025)"
205220

‎doc/release_notes/release_1.00.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,13 @@
8787
* Fixed duplicate suffix in result image title when extracting radial profile from an image (e.g., `radial_profile(i019)|center=(192.500, 192.500)|center=(192.500, 192.500)` instead of `radial_profile(i019)|center=(192.500, 192.500)`)
8888
* This fix is provided by Sigima 1.0.4
8989

90+
**Result visualization - Analysis result segments hard to see:**
91+
92+
* Fixed analysis result markers (FWHM, pulse features, etc.) being difficult or impossible to see on signal plots
93+
* These measurement indicators were appearing black on white backgrounds or white on dark backgrounds, making them blend into the plot
94+
* They now display in bright green with thicker lines, making them clearly visible in all color themes
95+
* Also removed the filled area that was obscuring the underlying signal data - markers now show only the boundary lines indicating the measured region
96+
9097
## DataLab Version 1.0.2 (2025-12-03) ##
9198

9299
### 🛠️ Bug Fixes since version 1.0.1 ###

0 commit comments

Comments
 (0)