datalab-platform 1.0.1__tar.gz → 1.0.3__tar.gz

{datalab_platform-1.0.1 → datalab_platform-1.0.3}/MANIFEST.in

@@ -2,8 +2,8 @@ graft doc
 graft resources
 graft macros
 graft plugins
+graft datalab/locale
 include conftest.py
-include CHANGELOG.md
 include CONTRIBUTING.md
 include requirements.txt
 include *.desktop

{datalab_platform-1.0.1 → datalab_platform-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datalab-platform
-Version: 1.0.1
+Version: 1.0.3
 Summary: DataLab is a data processing and analysis software for scientific and industrial applications
 Author-email: Pierre Raybaut <p.raybaut@codra.fr>
 Maintainer-email: DataLab Platform Developers <p.raybaut@codra.fr>
@@ -32,9 +32,9 @@ Classifier: Topic :: Software Development :: Widget Sets
 Requires-Python: <4,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: guidata>=3.13.3
+Requires-Dist: guidata>=3.13.4
 Requires-Dist: PlotPy>=2.8.2
-Requires-Dist: Sigima>=1.0.2
+Requires-Dist: Sigima>=1.0.4
 Requires-Dist: NumPy>=1.22
 Requires-Dist: SciPy>=1.10.1
 Requires-Dist: scikit-image>=0.19.2

{datalab_platform-1.0.1 → datalab_platform-1.0.3}/datalab/__init__.py

@@ -24,7 +24,7 @@ except RuntimeError:
     # this module is imported more than once, e.g. when running tests)
     pass
 
-__version__ = "1.0.1"
+__version__ = "1.0.3"
 __docurl__ = __homeurl__ = "https://datalab-platform.com/"
 __supporturl__ = "https://github.com/DataLab-Platform/DataLab/issues/new/choose"
 

{datalab_platform-1.0.1 → datalab_platform-1.0.3}/datalab/adapters_metadata/common.py

@@ -88,7 +88,7 @@ class ResultData:
             if "roi_index" in df.columns:
                 i_roi = int(df.iloc[i_row_res]["roi_index"])
                 roititle = ""
-                if i_roi >= 0:
+                if i_roi >= 0 and obj.roi is not None:
                     roititle = obj.roi.get_single_roi_title(i_roi)
                     ylabel += f"|{roititle}"
             self.ylabels.append(ylabel)
@@ -365,7 +365,7 @@ def resultadapter_to_html(
             num_cols = max_display_cols
 
         # Calculate number of cells (rows × columns)
-        num_rows = len(adapter.result)
+        num_rows = len(df)
         num_cells = num_rows * num_cols
 
         # Check if truncation is needed BEFORE calling to_html()

{datalab_platform-1.0.1 → datalab_platform-1.0.3}/datalab/adapters_plotpy/converters.py

@@ -39,11 +39,13 @@ def plotitem_to_singleroi(
     | AnnotatedRectangle
     | AnnotatedCircle
     | AnnotatedPolygon,
+    obj: SignalObj | ImageObj | None = None,
 ) -> SegmentROI | RectangularROI | CircularROI | PolygonalROI:
     """Create a single ROI from the given PlotPy item to integrate with DataLab
 
     Args:
         plot_item: The PlotPy item for which to create a single ROI
+        obj: Optional signal or image object for coordinate rounding
 
     Returns:
         A single ROI instance
@@ -66,7 +68,7 @@ def plotitem_to_singleroi(
         adapter = PolygonalROIPlotPyAdapter
     else:
         raise TypeError(f"Unsupported PlotPy item type: {type(plot_item)}")
-    return adapter.from_plot_item(plot_item)
+    return adapter.from_plot_item(plot_item, obj)
 
 
 def singleroi_to_plotitem(

datalab_platform-1.0.3/datalab/adapters_plotpy/coordutils.py

@@ -0,0 +1,157 @@
+# Copyright (c) DataLab Platform Developers, BSD 3-Clause license, see LICENSE file.
+
+"""
+ROI Coordinate Utilities
+=========================
+
+This module provides utility functions for rounding ROI coordinates to appropriate
+precision based on the sampling characteristics of signals and images.
+
+These functions are used when converting interactive PlotPy shapes to ROI objects
+to ensure coordinates are displayed with reasonable precision.
+"""
+
+from __future__ import annotations
+
+import numpy as np
+from sigima.objects import ImageObj, ROI1DParam, ROI2DParam, SignalObj
+
+
+def round_signal_coords(
+    obj: SignalObj, coords: list[float], precision_factor: float = 0.1
+) -> list[float]:
+    """Round signal coordinates to appropriate precision based on sampling period.
+
+    Rounds to a fraction of the median sampling period to avoid excessive decimal
+    places while maintaining reasonable precision.
+
+    Args:
+        obj: signal object
+        coords: coordinates to round
+        precision_factor: fraction of sampling period to use as rounding precision.
+            Default is 0.1 (1/10th of sampling period).
+
+    Returns:
+        Rounded coordinates
+    """
+    if len(obj.x) < 2:
+        # Cannot compute sampling period, return coords as-is
+        return coords
+    # Compute median sampling period
+    sampling_period = float(np.median(np.diff(obj.x)))
+    if sampling_period == 0:
+        # Avoid division by zero for constant x arrays
+        return coords
+    # Round to specified fraction of sampling period
+    precision = sampling_period * precision_factor
+    # Determine number of decimal places
+    if precision > 0:
+        decimals = max(0, int(-np.floor(np.log10(precision))))
+        return [round(c, decimals) for c in coords]
+    return coords
+
+
+def round_image_coords(
+    obj: ImageObj, coords: list[float], precision_factor: float = 0.1
+) -> list[float]:
+    """Round image coordinates to appropriate precision based on pixel spacing.
+
+    Rounds to a fraction of the pixel spacing to avoid excessive decimal places
+    while maintaining reasonable precision. Uses separate precision for X and Y.
+
+    Args:
+        obj: image object
+        coords: flat list of coordinates [x0, y0, x1, y1, ...] to round
+        precision_factor: fraction of pixel spacing to use as rounding precision.
+            Default is 0.1 (1/10th of pixel spacing).
+
+    Returns:
+        Rounded coordinates
+
+    Raises:
+        ValueError: if coords does not contain an even number of elements
+    """
+    if len(coords) % 2 != 0:
+        raise ValueError("coords must contain an even number of elements (x, y pairs).")
+    if len(coords) == 0:
+        return coords
+
+    rounded = list(coords)
+    if obj.is_uniform_coords:
+        # Use dx, dy for uniform coordinates
+        precision_x = abs(obj.dx) * precision_factor
+        precision_y = abs(obj.dy) * precision_factor
+    else:
+        # Compute average spacing for non-uniform coordinates
+        if len(obj.xcoords) > 1:
+            avg_dx = float(np.mean(np.abs(np.diff(obj.xcoords))))
+            precision_x = avg_dx * precision_factor
+        else:
+            precision_x = 0
+        if len(obj.ycoords) > 1:
+            avg_dy = float(np.mean(np.abs(np.diff(obj.ycoords))))
+            precision_y = avg_dy * precision_factor
+        else:
+            precision_y = 0
+
+    # Round X coordinates (even indices)
+    if precision_x > 0:
+        decimals_x = max(0, int(-np.floor(np.log10(precision_x))))
+        for i in range(0, len(rounded), 2):
+            rounded[i] = round(rounded[i], decimals_x)
+
+    # Round Y coordinates (odd indices)
+    if precision_y > 0:
+        decimals_y = max(0, int(-np.floor(np.log10(precision_y))))
+        for i in range(1, len(rounded), 2):
+            rounded[i] = round(rounded[i], decimals_y)
+
+    return rounded
+
+
+def round_signal_roi_param(
+    obj: SignalObj, param: ROI1DParam, precision_factor: float = 0.1
+) -> None:
+    """Round signal ROI parameter coordinates in-place.
+
+    Args:
+        obj: signal object
+        param: ROI parameter to round (modified in-place)
+        precision_factor: fraction of sampling period to use as rounding precision
+    """
+    coords = round_signal_coords(obj, [param.xmin, param.xmax], precision_factor)
+    param.xmin, param.xmax = coords
+
+
+def round_image_roi_param(
+    obj: ImageObj, param: ROI2DParam, precision_factor: float = 0.1
+) -> None:
+    """Round image ROI parameter coordinates in-place.
+
+    Args:
+        obj: image object
+        param: ROI parameter to round (modified in-place)
+        precision_factor: fraction of pixel spacing to use as rounding precision
+    """
+    if param.geometry == "rectangle":
+        # Round x0, y0, dx, dy
+        x0, y0, x1, y1 = param.x0, param.y0, param.x0 + param.dx, param.y0 + param.dy
+        coords = round_image_coords(obj, [x0, y0, x1, y1], precision_factor)
+        param.x0, param.y0 = coords[0], coords[1]
+        # Round dx and dy to avoid floating-point errors in subtraction
+        dx_dy_rounded = round_image_coords(
+            obj, [coords[2] - coords[0], coords[3] - coords[1]], precision_factor
+        )
+        param.dx = dx_dy_rounded[0]
+        param.dy = dx_dy_rounded[1]
+    elif param.geometry == "circle":
+        # Round xc, yc, r
+        coords = round_image_coords(obj, [param.xc, param.yc], precision_factor)
+        param.xc, param.yc = coords
+        # Round radius using X precision
+        r_rounded = round_image_coords(obj, [param.r, 0], precision_factor)[0]
+        param.r = r_rounded
+    elif param.geometry == "polygon":
+        # Round polygon points
+        rounded = round_image_coords(obj, param.points.tolist(), precision_factor)
+        param.points = np.array(rounded)

{datalab_platform-1.0.1 → datalab_platform-1.0.3}/datalab/adapters_plotpy/roi/image.py

@@ -13,6 +13,7 @@ from plotpy.items import AnnotatedCircle, AnnotatedPolygon, AnnotatedRectangle
 from sigima.objects import CircularROI, ImageObj, ImageROI, PolygonalROI, RectangularROI
 from sigima.tools import coordinates
 
+from datalab.adapters_plotpy.coordutils import round_image_coords
 from datalab.adapters_plotpy.roi.base import (
     BaseROIPlotPyAdapter,
     BaseSingleROIPlotPyAdapter,
@@ -64,14 +65,21 @@ class PolygonalROIPlotPyAdapter(
         return item
 
     @classmethod
-    def from_plot_item(cls, item: AnnotatedPolygon) -> PolygonalROI:
+    def from_plot_item(
+        cls, item: AnnotatedPolygon, obj: ImageObj | None = None
+    ) -> PolygonalROI:
         """Create ROI from plot item
 
         Args:
             item: plot item
+            obj: image object for coordinate rounding (optional)
         """
+        coords = item.get_points().flatten().tolist()
+        # Round coordinates to appropriate precision
+        if obj is not None:
+            coords = round_image_coords(obj, coords)
         title = str(item.title().text())
-        return PolygonalROI(item.get_points().flatten(), False, title)
+        return PolygonalROI(coords, False, title)
 
 
 class RectangularROIPlotPyAdapter(
@@ -116,15 +124,22 @@ class RectangularROIPlotPyAdapter(
         return item
 
     @classmethod
-    def from_plot_item(cls, item: AnnotatedRectangle) -> RectangularROI:
+    def from_plot_item(
+        cls, item: AnnotatedRectangle, obj: ImageObj | None = None
+    ) -> RectangularROI:
         """Create ROI from plot item
 
         Args:
             item: plot item
+            obj: image object for coordinate rounding (optional)
         """
         rect = item.get_rect()
+        coords = RectangularROI.rect_to_coords(*rect)
+        # Round coordinates to appropriate precision
+        if obj is not None:
+            coords = round_image_coords(obj, coords)
         title = str(item.title().text())
-        return RectangularROI(RectangularROI.rect_to_coords(*rect), False, title)
+        return RectangularROI(coords, False, title)
 
 
 class CircularROIPlotPyAdapter(
@@ -166,15 +181,29 @@ class CircularROIPlotPyAdapter(
         return item
 
     @classmethod
-    def from_plot_item(cls, item: AnnotatedCircle) -> CircularROI:
+    def from_plot_item(
+        cls, item: AnnotatedCircle, obj: ImageObj | None = None
+    ) -> CircularROI:
         """Create ROI from plot item
 
         Args:
             item: plot item
+            obj: image object for coordinate rounding (optional)
         """
         rect = item.get_rect()
+        coords = CircularROI.rect_to_coords(*rect)
+        # Round coordinates to appropriate precision
+        # For circular ROI: [xc, yc, r] - round center (xc, yc) as pair, then radius
+        if obj is not None:
+            xc, yc, r = coords
+            # Round center coordinates
+            xc_rounded, yc_rounded = round_image_coords(obj, [xc, yc])
+            # Round radius using average of X and Y precision
+            # For radius, we use the X precision (could also average X and Y)
+            r_rounded = round_image_coords(obj, [r, 0])[0]
+            coords = [xc_rounded, yc_rounded, r_rounded]
         title = str(item.title().text())
-        return CircularROI(CircularROI.rect_to_coords(*rect), False, title)
+        return CircularROI(coords, False, title)
 
 
 class ImageROIPlotPyAdapter(BaseROIPlotPyAdapter[ImageROI]):

{datalab_platform-1.0.1 → datalab_platform-1.0.3}/datalab/adapters_plotpy/roi/signal.py

@@ -11,6 +11,7 @@ from plotpy.builder import make
 from plotpy.items import AnnotatedXRange
 from sigima.objects import SegmentROI, SignalObj, SignalROI
 
+from datalab.adapters_plotpy.coordutils import round_signal_coords
 from datalab.adapters_plotpy.roi.base import (
     BaseROIPlotPyAdapter,
     BaseSingleROIPlotPyAdapter,
@@ -36,11 +37,14 @@ class SegmentROIPlotPyAdapter(BaseSingleROIPlotPyAdapter[SegmentROI, AnnotatedXR
         return item
 
     @classmethod
-    def from_plot_item(cls, item: AnnotatedXRange) -> SegmentROI:
+    def from_plot_item(
+        cls, item: AnnotatedXRange, obj: SignalObj | None = None
+    ) -> SegmentROI:
         """Create ROI from plot item
 
         Args:
             item: plot item
+            obj: signal object for coordinate rounding (optional)
 
         Returns:
             ROI
@@ -48,6 +52,9 @@ class SegmentROIPlotPyAdapter(BaseSingleROIPlotPyAdapter[SegmentROI, AnnotatedXR
         if not isinstance(item, AnnotatedXRange):
             raise TypeError("Invalid plot item type")
         coords = sorted(item.get_range())
+        # Round coordinates to appropriate precision
+        if obj is not None:
+            coords = round_signal_coords(obj, coords)
         title = str(item.title().text())
         return SegmentROI(coords, False, title)
 

{datalab_platform-1.0.1 → datalab_platform-1.0.3}/datalab/config.py

@@ -301,6 +301,7 @@ class ViewSection(conf.Section, metaclass=conf.SectionMeta):
     ima_def_interpolation = conf.Option()
     ima_def_alpha = conf.Option()
     ima_def_alpha_function = conf.Option()
+    ima_def_keep_lut_range = conf.Option()
 
     # Annotated shape and marker visualization settings for signals
     sig_shape_param = conf.DataSetOption()
@@ -459,6 +460,7 @@ def initialize():
     Conf.view.ima_def_interpolation.get(5)
     Conf.view.ima_def_alpha.get(1.0)
     Conf.view.ima_def_alpha_function.get(LUTAlpha.NONE.value)
+    Conf.view.ima_def_keep_lut_range.get(False)
 
     # Datetime format strings: % must be escaped as %% for ConfigParser
     Conf.view.sig_datetime_format_s.get("%%H:%%M:%%S")
@@ -485,6 +487,8 @@ initialize()
 
 ROI_LINE_COLOR = "#5555ff"
 ROI_SEL_LINE_COLOR = "#9393ff"
+MARKER_LINE_COLOR = "#A11818"
+MARKER_TEXT_COLOR = "#440909"
 
 PLOTPY_DEFAULTS = {
     "plot": {
@@ -506,11 +510,27 @@ PLOTPY_DEFAULTS = {
         "selected_curve_symbol/alpha": 0.3,
         "selected_curve_symbol/size": 5,
         "marker/curve/text/textcolor": "black",
-        "marker/cross/text/textcolor": "black",
+        # Cross marker style (shown when pressing Alt key on plot)
+        "marker/cross/symbol/marker": "Cross",
+        "marker/cross/symbol/edgecolor": MAIN_FG_COLOR,
+        "marker/cross/symbol/facecolor": "#ff0000",
+        "marker/cross/symbol/alpha": 1.0,
+        "marker/cross/symbol/size": 8,
+        "marker/cross/text/font/family": "default",
+        "marker/cross/text/font/size": 8,
+        "marker/cross/text/font/bold": False,
+        "marker/cross/text/font/italic": False,
+        "marker/cross/text/textcolor": "#000000",
+        "marker/cross/text/background_color": "#ffffff",
         "marker/cross/text/background_alpha": 0.7,
+        "marker/cross/line/style": "DashLine",
+        "marker/cross/line/color": MARKER_LINE_COLOR,
+        "marker/cross/line/width": 1.0,
+        "marker/cross/markerstyle": "Cross",
+        "marker/cross/spacing": 7,
         # Cursor line and symbol style
         "marker/cursor/line/style": "SolidLine",
-        "marker/cursor/line/color": "#A11818",
+        "marker/cursor/line/color": MARKER_LINE_COLOR,
         "marker/cursor/line/width": 1.0,
         "marker/cursor/symbol/marker": "NoSymbol",
         "marker/cursor/symbol/size": 11,
@@ -518,41 +538,83 @@ PLOTPY_DEFAULTS = {
         "marker/cursor/symbol/facecolor": "#ff9393",
         "marker/cursor/symbol/alpha": 1.0,
         "marker/cursor/sel_line/style": "SolidLine",
-        "marker/cursor/sel_line/color": "#A11818",
+        "marker/cursor/sel_line/color": MARKER_LINE_COLOR,
         "marker/cursor/sel_line/width": 2.0,
         "marker/cursor/sel_symbol/marker": "NoSymbol",
         "marker/cursor/sel_symbol/size": 11,
         "marker/cursor/sel_symbol/edgecolor": MAIN_BG_COLOR,
-        "marker/cursor/sel_symbol/facecolor": "#A11818",
+        "marker/cursor/sel_symbol/facecolor": MARKER_LINE_COLOR,
         "marker/cursor/sel_symbol/alpha": 0.8,
         "marker/cursor/text/font/size": 9,
         "marker/cursor/text/font/family": "default",
         "marker/cursor/text/font/bold": False,
         "marker/cursor/text/font/italic": False,
-        "marker/cursor/text/textcolor": "#440909",
+        "marker/cursor/text/textcolor": MARKER_TEXT_COLOR,
         "marker/cursor/text/background_color": "#ffffff",
         "marker/cursor/text/background_alpha": 0.7,
         "marker/cursor/sel_text/font/size": 9,
         "marker/cursor/sel_text/font/family": "default",
         "marker/cursor/sel_text/font/bold": False,
         "marker/cursor/sel_text/font/italic": False,
-        "marker/cursor/sel_text/textcolor": "#440909",
+        "marker/cursor/sel_text/textcolor": MARKER_TEXT_COLOR,
         "marker/cursor/sel_text/background_color": "#ffffff",
         "marker/cursor/sel_text/background_alpha": 0.7,
+        # Default annotation text style for segments:
+        "shape/segment/line/style": "SolidLine",
+        "shape/segment/line/color": "#00ff55",
+        "shape/segment/line/width": 1.0,
+        "shape/segment/sel_line/style": "SolidLine",
+        "shape/segment/sel_line/color": "#00ff55",
+        "shape/segment/sel_line/width": 2.0,
+        "shape/segment/fill/style": "NoBrush",
+        "shape/segment/sel_fill/style": "NoBrush",
+        "shape/segment/symbol/marker": "XCross",
+        "shape/segment/symbol/size": 9,
+        "shape/segment/symbol/edgecolor": "#00ff55",
+        "shape/segment/symbol/facecolor": "#00ff55",
+        "shape/segment/symbol/alpha": 1.0,
+        "shape/segment/sel_symbol/marker": "XCross",
+        "shape/segment/sel_symbol/size": 12,
+        "shape/segment/sel_symbol/edgecolor": "#00ff55",
+        "shape/segment/sel_symbol/facecolor": "#00ff55",
+        "shape/segment/sel_symbol/alpha": 0.7,
+        # Default style for drag shapes: (global annotations style)
+        "shape/drag/line/style": "SolidLine",
+        "shape/drag/line/color": "#00ff55",
+        "shape/drag/line/width": 1.0,
+        "shape/drag/fill/style": "SolidPattern",
+        "shape/drag/fill/color": MAIN_BG_COLOR,
+        "shape/drag/fill/alpha": 0.1,
+        "shape/drag/symbol/marker": "Rect",
+        "shape/drag/symbol/size": 3,
+        "shape/drag/symbol/edgecolor": "#00ff55",
+        "shape/drag/symbol/facecolor": "#00ff55",
+        "shape/drag/symbol/alpha": 1.0,
+        "shape/drag/sel_line/style": "SolidLine",
+        "shape/drag/sel_line/color": "#00ff55",
+        "shape/drag/sel_line/width": 2.0,
+        "shape/drag/sel_fill/style": "SolidPattern",
+        "shape/drag/sel_fill/color": MAIN_BG_COLOR,
+        "shape/drag/sel_fill/alpha": 0.1,
+        "shape/drag/sel_symbol/marker": "Rect",
+        "shape/drag/sel_symbol/size": 7,
+        "shape/drag/sel_symbol/edgecolor": "#00ff55",
+        "shape/drag/sel_symbol/facecolor": "#00ff00",
+        "shape/drag/sel_symbol/alpha": 0.7,
     },
     "results": {
         # Annotated shape style for result shapes:
         #   Signals:
         "s/annotation/line/style": "SolidLine",
-        "s/annotation/line/color": MAIN_FG_COLOR,
-        "s/annotation/line/width": 1,
-        "s/annotation/fill/style": "SolidPattern",
+        "s/annotation/line/color": "#00aa00",
+        "s/annotation/line/width": 2,
+        "s/annotation/fill/style": "NoBrush",
         "s/annotation/fill/color": MAIN_BG_COLOR,
         "s/annotation/fill/alpha": 0.1,
         "s/annotation/symbol/marker": "XCross",
         "s/annotation/symbol/size": 7,
-        "s/annotation/symbol/edgecolor": MAIN_FG_COLOR,
-        "s/annotation/symbol/facecolor": MAIN_FG_COLOR,
+        "s/annotation/symbol/edgecolor": "#00aa00",
+        "s/annotation/symbol/facecolor": "#00aa00",
         "s/annotation/symbol/alpha": 1.0,
         "s/annotation/sel_line/style": "DashLine",
         "s/annotation/sel_line/color": "#00ff00",
@@ -591,65 +653,65 @@ PLOTPY_DEFAULTS = {
         # Marker styles for results:
         #   Signals:
         "s/marker/cursor/line/style": "DashLine",
-        "s/marker/cursor/line/color": "#ffff00",
+        "s/marker/cursor/line/color": MARKER_LINE_COLOR,
         "s/marker/cursor/line/width": 1.0,
         "s/marker/cursor/symbol/marker": "Ellipse",
         "s/marker/cursor/symbol/size": 11,
         "s/marker/cursor/symbol/edgecolor": MAIN_BG_COLOR,
-        "s/marker/cursor/symbol/facecolor": "#ffff00",
+        "s/marker/cursor/symbol/facecolor": MARKER_LINE_COLOR,
         "s/marker/cursor/symbol/alpha": 0.7,
         "s/marker/cursor/sel_line/style": "DashLine",
-        "s/marker/cursor/sel_line/color": "#ffff00",
+        "s/marker/cursor/sel_line/color": MARKER_LINE_COLOR,
         "s/marker/cursor/sel_line/width": 2.0,
         "s/marker/cursor/sel_symbol/marker": "Ellipse",
         "s/marker/cursor/sel_symbol/size": 11,
-        "s/marker/cursor/sel_symbol/edgecolor": "#ffff00",
-        "s/marker/cursor/sel_symbol/facecolor": "#ffff00",
+        "s/marker/cursor/sel_symbol/edgecolor": MARKER_LINE_COLOR,
+        "s/marker/cursor/sel_symbol/facecolor": MARKER_LINE_COLOR,
         "s/marker/cursor/sel_symbol/alpha": 0.7,
         "s/marker/cursor/text/font/size": 9,
         "s/marker/cursor/text/font/family": "default",
         "s/marker/cursor/text/font/bold": False,
         "s/marker/cursor/text/font/italic": False,
-        "s/marker/cursor/text/textcolor": "#440909",
+        "s/marker/cursor/text/textcolor": MARKER_TEXT_COLOR,
         "s/marker/cursor/text/background_color": "#ffffff",
         "s/marker/cursor/text/background_alpha": 0.7,
         "s/marker/cursor/sel_text/font/size": 9,
         "s/marker/cursor/sel_text/font/family": "default",
         "s/marker/cursor/sel_text/font/bold": False,
         "s/marker/cursor/sel_text/font/italic": False,
-        "s/marker/cursor/sel_text/textcolor": "#440909",
+        "s/marker/cursor/sel_text/textcolor": MARKER_TEXT_COLOR,
         "s/marker/cursor/sel_text/background_color": "#ffffff",
         "s/marker/cursor/sel_text/background_alpha": 0.7,
         "s/marker/cursor/markerstyle": "Cross",
         #   Images:
         "i/marker/cursor/line/style": "DashLine",
-        "i/marker/cursor/line/color": "#ffff00",
+        "i/marker/cursor/line/color": MARKER_LINE_COLOR,
         "i/marker/cursor/line/width": 1.0,
         "i/marker/cursor/symbol/marker": "Diamond",
         "i/marker/cursor/symbol/size": 11,
-        "i/marker/cursor/symbol/edgecolor": "#ffff00",
-        "i/marker/cursor/symbol/facecolor": "#ffff00",
+        "i/marker/cursor/symbol/edgecolor": MARKER_LINE_COLOR,
+        "i/marker/cursor/symbol/facecolor": MARKER_LINE_COLOR,
         "i/marker/cursor/symbol/alpha": 0.7,
         "i/marker/cursor/sel_line/style": "DashLine",
-        "i/marker/cursor/sel_line/color": "#ffff00",
+        "i/marker/cursor/sel_line/color": MARKER_LINE_COLOR,
         "i/marker/cursor/sel_line/width": 2.0,
         "i/marker/cursor/sel_symbol/marker": "Diamond",
         "i/marker/cursor/sel_symbol/size": 11,
-        "i/marker/cursor/sel_symbol/edgecolor": "#ffff00",
-        "i/marker/cursor/sel_symbol/facecolor": "#ffff00",
+        "i/marker/cursor/sel_symbol/edgecolor": MARKER_LINE_COLOR,
+        "i/marker/cursor/sel_symbol/facecolor": MARKER_LINE_COLOR,
         "i/marker/cursor/sel_symbol/alpha": 0.7,
         "i/marker/cursor/text/font/size": 9,
         "i/marker/cursor/text/font/family": "default",
         "i/marker/cursor/text/font/bold": False,
         "i/marker/cursor/text/font/italic": False,
-        "i/marker/cursor/text/textcolor": "#440909",
+        "i/marker/cursor/text/textcolor": MARKER_TEXT_COLOR,
         "i/marker/cursor/text/background_color": "#ffffff",
         "i/marker/cursor/text/background_alpha": 0.7,
         "i/marker/cursor/sel_text/font/size": 9,
         "i/marker/cursor/sel_text/font/family": "default",
         "i/marker/cursor/sel_text/font/bold": False,
         "i/marker/cursor/sel_text/font/italic": False,
-        "i/marker/cursor/sel_text/textcolor": "#440909",
+        "i/marker/cursor/sel_text/textcolor": MARKER_TEXT_COLOR,
         "i/marker/cursor/sel_text/background_color": "#ffffff",
         "i/marker/cursor/sel_text/background_alpha": 0.7,
         "i/marker/cursor/markerstyle": "Cross",