scitex 2.7.0__py3-none-any.whl → 2.8.1__py3-none-any.whl

scitex/plt/_subplots/_FigWrapper.py

@@ -14,6 +14,10 @@ import warnings
 import numpy as np
 import pandas as pd
 
+from scitex import logging
+
+logger = logging.getLogger(__name__)
+
 
 class FigWrapper:
     def __init__(self, fig_mpl):
@@ -169,9 +173,7 @@ class FigWrapper:
                     auto_metadata["custom"].update(metadata)
             except Exception as e:
                 # If metadata collection fails, warn but continue
-                import warnings
-
-                warnings.warn(f"Could not collect metadata: {e}")
+                logger.warning(f"Could not collect metadata: {e}")
                 auto_metadata = metadata
 
             # Use scitex.io.save_image for metadata embedding
@@ -183,9 +185,7 @@ class FigWrapper:
                 )
             except Exception as e:
                 # Fallback to regular matplotlib savefig
-                import warnings
-
-                warnings.warn(f"Metadata embedding failed, using regular savefig: {e}")
+                logger.warning(f"Metadata embedding failed, using regular savefig: {e}")
                 self._fig_mpl.savefig(fname, *args, **kwargs)
         else:
             # For non-image formats or when metadata disabled, use regular savefig

scitex/plt/_subplots/_SubplotsWrapper.py

@@ -62,24 +62,13 @@ if _arial_enabled:
     ]
 else:
     # Warn about missing Arial
-    try:
-        from scitex.logging import getLogger
+    from scitex import logging as _logging
 
-        _logger = getLogger(__name__)
-        _logger.warning(
-            "Arial font not found. Using fallback fonts (Helvetica/DejaVu Sans). "
-            "For publication figures with Arial: sudo apt-get install ttf-mscorefonts-installer && fc-cache -fv"
-        )
-    except:
-        # If scitex.logging not available, use standard warnings
-        import warnings
-
-        warnings.warn(
-            "Arial font not found. Using fallback fonts (Helvetica/DejaVu Sans). "
-            "For publication figures with Arial: sudo apt-get install ttf-mscorefonts-installer && fc-cache -fv",
-            UserWarning,
-            stacklevel=2,
-        )
+    _logger = _logging.getLogger(__name__)
+    _logger.warning(
+        "Arial font not found. Using fallback fonts (Helvetica/DejaVu Sans). "
+        "For publication figures with Arial: sudo apt-get install ttf-mscorefonts-installer && fc-cache -fv"
+    )
 
 
 class SubplotsWrapper:
@@ -124,6 +113,7 @@ class SubplotsWrapper:
         dpi=None,
         styles=None,  # List of style dicts for per-axes control
         transparent=None,  # Transparent background (default: from SCITEX_STYLE.yaml)
+        theme=None,  # Color theme: "light" or "dark" (default: "light")
         **kwargs,
     ):
         """
@@ -179,6 +169,9 @@ class SubplotsWrapper:
         transparent : bool, optional
             Create figure with transparent background (default: False)
             Useful for publication-ready figures that will be cropped
+        theme : str, optional
+            Color theme: "light" or "dark" (default: "light")
+            Dark mode uses eye-friendly colors optimized for dark backgrounds
         **kwargs
             Additional arguments passed to matplotlib.pyplot.subplots
 
@@ -287,6 +280,9 @@ class SubplotsWrapper:
             transparent = _S.get("transparent", True)
         if mode is None:
             mode = _S.get("mode", "publication")
+        # Resolve theme from YAML (default: "light")
+        if theme is None:
+            theme = _resolve("theme.mode", None, "light", str)
 
         # Always use mm-control pathway with SCITEX_STYLE defaults
         if True:
@@ -319,6 +315,7 @@ class SubplotsWrapper:
                 dpi=dpi,
                 styles=styles,
                 transparent=transparent,
+                theme=theme,
                 **kwargs,
             )
 
@@ -355,17 +352,22 @@ class SubplotsWrapper:
         dpi=None,
         styles=None,
         transparent=None,  # Resolved from caller
+        theme=None,  # Color theme: "light" or "dark"
         **kwargs,
     ):
         """Create figure with mm-based control over axes dimensions."""
         from scitex.plt.utils import mm_to_inch, apply_style_mm
 
-        # Parse nrows, ncols from args (like matplotlib.pyplot.subplots)
+        # Parse nrows, ncols from args or kwargs (like matplotlib.pyplot.subplots)
         nrows, ncols = 1, 1
         if len(args) >= 1:
             nrows = args[0]
+        elif "nrows" in kwargs:
+            nrows = kwargs.pop("nrows")
         if len(args) >= 2:
             ncols = args[1]
+        elif "ncols" in kwargs:
+            ncols = kwargs.pop("ncols")
 
         n_axes = nrows * ncols
 
@@ -451,6 +453,10 @@ class SubplotsWrapper:
         else:
             self._fig_mpl = plt.figure(figsize=figsize_inch, dpi=dpi)
 
+        # Store theme on figure for later retrieval (e.g., when saving plot.json)
+        if theme is not None:
+            self._fig_mpl._scitex_theme = theme
+
         # Create axes array and position each one manually
         axes_mpl_list = []
         ax_idx = 0
@@ -541,6 +547,10 @@ class SubplotsWrapper:
                 if n_ticks is not None:
                     style_dict["n_ticks"] = n_ticks
 
+            # Always add theme to style_dict (default: "light")
+            if theme is not None:
+                style_dict["theme"] = theme
+
             # Extract suptitle font size if available
             if "suptitle_font_size_pt" in style_dict:
                 suptitle_font_size_pt_value = style_dict["suptitle_font_size_pt"]

scitex/plt/_subplots/_export_as_csv.py

@@ -10,12 +10,14 @@ __FILE__ = __file__
 __DIR__ = os.path.dirname(__FILE__)
 # ----------------------------------------
 
-import warnings
-
 import numpy as np
 import pandas as pd
 from scitex.pd import to_xyz
 
+from scitex import logging
+
+logger = logging.getLogger(__name__)
+
 # Global warning registry to track which warnings have been shown
 _warning_registry = set()
 
@@ -59,7 +61,7 @@ def _warn_once(message, category=UserWarning):
     """
     if message not in _warning_registry:
         _warning_registry.add(message)
-        warnings.warn(message, category, stacklevel=3)
+        logger.warning(message)
 
 
 from ._export_as_csv_formatters import (
@@ -93,11 +95,13 @@ from ._export_as_csv_formatters import (
     # Custom scitex formatters
     _format_plot_box,
     _format_plot_conf_mat,
+    _format_stx_contour,
     _format_plot_ecdf,
     _format_plot_fillv,
     _format_plot_heatmap,
     _format_plot_image,
     _format_plot_imshow,
+    _format_stx_imshow,
     _format_plot_joyplot,
     _format_plot_kde,
     _format_plot_line,
@@ -110,6 +114,11 @@ from ._export_as_csv_formatters import (
     _format_plot_scatter_hist,
     _format_plot_shaded_line,
     _format_plot_violin,
+    # stx_ aliases formatters
+    _format_stx_scatter,
+    _format_stx_bar,
+    _format_stx_barh,
+    _format_stx_errorbar,
     # Seaborn formatters
     _format_sns_barplot,
     _format_sns_boxplot,
@@ -157,11 +166,13 @@ _FORMATTER_REGISTRY = {
     # Custom scitex methods
     "stx_box": _format_plot_box,
     "stx_conf_mat": _format_plot_conf_mat,
+    "stx_contour": _format_stx_contour,
     "stx_ecdf": _format_plot_ecdf,
     "stx_fillv": _format_plot_fillv,
     "stx_heatmap": _format_plot_heatmap,
     "stx_image": _format_plot_image,
     "plot_imshow": _format_plot_imshow,
+    "stx_imshow": _format_stx_imshow,
     "stx_joyplot": _format_plot_joyplot,
     "stx_kde": _format_plot_kde,
     "stx_line": _format_plot_line,
@@ -174,6 +185,11 @@ _FORMATTER_REGISTRY = {
     "stx_scatter_hist": _format_plot_scatter_hist,
     "stx_shaded_line": _format_plot_shaded_line,
     "stx_violin": _format_plot_violin,
+    # stx_ aliases
+    "stx_scatter": _format_stx_scatter,
+    "stx_bar": _format_stx_bar,
+    "stx_barh": _format_stx_barh,
+    "stx_errorbar": _format_stx_errorbar,
     # Seaborn methods (sns_ prefix)
     "sns_barplot": _format_sns_barplot,
     "sns_boxplot": _format_sns_boxplot,
@@ -226,7 +242,7 @@ def export_as_csv(history_records):
         ValueError: If no plotting records are found or they cannot be combined.
     """
     if len(history_records) <= 0:
-        warnings.warn("Plotting records not found. Cannot export empty data.")
+        logger.warning("Plotting records not found. Cannot export empty data.")
         return pd.DataFrame()  # Return empty DataFrame instead of None
 
     dfs = []
@@ -268,7 +284,7 @@ def export_as_csv(history_records):
         df = pd.concat(dfs_reset, axis=1)
         return df
     except Exception as e:
-        warnings.warn(f"Failed to combine plotting records: {e}")
+        logger.warning(f"Failed to combine plotting records: {e}")
         # Return a DataFrame with metadata about what records were attempted
         meta_df = pd.DataFrame(
             {
@@ -355,6 +371,8 @@ def format_record(record, record_index=0):
         return _format_plot_box(id, tracked_dict, kwargs)
     elif method == "stx_conf_mat":
         return _format_plot_conf_mat(id, tracked_dict, kwargs)
+    elif method == "stx_contour":
+        return _format_stx_contour(id, tracked_dict, kwargs)
     elif method == "stx_ecdf":
         return _format_plot_ecdf(id, tracked_dict, kwargs)
     elif method == "stx_fillv":
@@ -365,6 +383,8 @@ def format_record(record, record_index=0):
         return _format_plot_image(id, tracked_dict, kwargs)
     elif method == "plot_imshow":
         return _format_plot_imshow(id, tracked_dict, kwargs)
+    elif method == "stx_imshow":
+        return _format_stx_imshow(id, tracked_dict, kwargs)
     elif method == "stx_joyplot":
         return _format_plot_joyplot(id, tracked_dict, kwargs)
     elif method == "stx_kde":
@@ -390,6 +410,16 @@ def format_record(record, record_index=0):
     elif method == "stx_violin":
         return _format_plot_violin(id, tracked_dict, kwargs)
 
+    # stx_ aliases
+    elif method == "stx_scatter":
+        return _format_stx_scatter(id, tracked_dict, kwargs)
+    elif method == "stx_bar":
+        return _format_stx_bar(id, tracked_dict, kwargs)
+    elif method == "stx_barh":
+        return _format_stx_barh(id, tracked_dict, kwargs)
+    elif method == "stx_errorbar":
+        return _format_stx_errorbar(id, tracked_dict, kwargs)
+
     # Seaborn functions (sns_ prefix)
     elif method == "sns_barplot":
         return _format_sns_barplot(id, tracked_dict, kwargs)

scitex/plt/_subplots/_export_as_csv_formatters/__init__.py

@@ -41,10 +41,12 @@ from ._format_violinplot import _format_violinplot
 from ._format_plot_imshow import _format_plot_imshow
 from ._format_plot_box import _format_plot_box
 from ._format_stx_conf_mat import _format_plot_conf_mat
+from ._format_stx_contour import _format_stx_contour
 from ._format_stx_ecdf import _format_plot_ecdf
 from ._format_stx_fillv import _format_plot_fillv
 from ._format_stx_heatmap import _format_plot_heatmap
 from ._format_stx_image import _format_plot_image
+from ._format_stx_imshow import _format_stx_imshow
 from ._format_stx_joyplot import _format_plot_joyplot
 from ._format_plot_kde import _format_plot_kde
 from ._format_stx_line import _format_plot_line
@@ -58,6 +60,12 @@ from ._format_stx_scatter_hist import _format_plot_scatter_hist
 from ._format_stx_shaded_line import _format_plot_shaded_line
 from ._format_stx_violin import _format_plot_violin
 
+# stx_ aliases formatters
+from ._format_stx_scatter import _format_stx_scatter
+from ._format_stx_bar import _format_stx_bar
+from ._format_stx_barh import _format_stx_barh
+from ._format_stx_errorbar import _format_stx_errorbar
+
 # Seaborn formatters (sns_ prefix)
 from ._format_sns_barplot import _format_sns_barplot
 from ._format_sns_boxplot import _format_sns_boxplot

scitex/plt/_subplots/_export_as_csv_formatters/_format_annotate.py

@@ -12,22 +12,8 @@ __DIR__ = os.path.dirname(__FILE__)
 
 import pandas as pd
 
-
-def _make_column_name(id, suffix, method="annotate"):
-    """Create column name with method descriptor, avoiding duplication.
-
-    For example:
-    - id="annotate_0", suffix="x" -> "annotate_0_x"
-    - id="plot_5", suffix="x" -> "plot_5_annotate_x"
-    """
-    # Check if method name is already in the ID
-    id_parts = id.rsplit("_", 1)
-    if len(id_parts) == 2 and id_parts[0].endswith(method):
-        # Method already in ID, don't duplicate
-        return f"{id}_{suffix}"
-    else:
-        # Method not in ID, add it for clarity
-        return f"{id}_{method}_{suffix}"
+from scitex.plt.utils._csv_column_naming import get_csv_column_name
+from ._format_plot import _parse_tracking_id
 
 
 def _format_annotate(id, tracked_dict, kwargs):
@@ -42,6 +28,9 @@ def _format_annotate(id, tracked_dict, kwargs):
     if not tracked_dict or not isinstance(tracked_dict, dict):
         return pd.DataFrame()
 
+    # Parse the tracking ID to get axes position and trace ID
+    ax_row, ax_col, trace_id = _parse_tracking_id(id)
+
     # Get the args from tracked_dict
     args = tracked_dict.get("args", [])
 
@@ -57,9 +46,9 @@ def _format_annotate(id, tracked_dict, kwargs):
             return pd.DataFrame()
 
         data = {
-            _make_column_name(id, "x"): [x],
-            _make_column_name(id, "y"): [y],
-            _make_column_name(id, "content"): [text_content],
+            get_csv_column_name("x", ax_row, ax_col, trace_id=trace_id): [x],
+            get_csv_column_name("y", ax_row, ax_col, trace_id=trace_id): [y],
+            get_csv_column_name("content", ax_row, ax_col, trace_id=trace_id): [text_content],
         }
 
         # Check if xytext was provided (either as third arg or in kwargs)
@@ -70,8 +59,8 @@ def _format_annotate(id, tracked_dict, kwargs):
             xytext = kwargs["xytext"]
 
         if xytext is not None and hasattr(xytext, "__len__") and len(xytext) >= 2:
-            data[_make_column_name(id, "text_x")] = [xytext[0]]
-            data[_make_column_name(id, "text_y")] = [xytext[1]]
+            data[get_csv_column_name("text_x", ax_row, ax_col, trace_id=trace_id)] = [xytext[0]]
+            data[get_csv_column_name("text_y", ax_row, ax_col, trace_id=trace_id)] = [xytext[1]]
 
         # Create DataFrame with proper column names (use dict with list values)
         df = pd.DataFrame(data)

scitex/plt/_subplots/_export_as_csv_formatters/_format_eventplot.py

@@ -13,6 +13,12 @@ import numpy as np
 import pandas as pd
 import scitex
 
+from scitex import logging
+from scitex.plt.utils._csv_column_naming import get_csv_column_name
+from ._format_plot import _parse_tracking_id
+
+logger = logging.getLogger(__name__)
+
 
 def _format_eventplot(id, tracked_dict, kwargs):
     """Format data from an eventplot call."""
@@ -20,6 +26,9 @@ def _format_eventplot(id, tracked_dict, kwargs):
     if not tracked_dict or not isinstance(tracked_dict, dict):
         return pd.DataFrame()
 
+    # Parse the tracking ID to get axes position and trace ID
+    ax_row, ax_col, trace_id = _parse_tracking_id(id)
+
     # Get the args from tracked_dict
     args = tracked_dict.get("args", [])
 
@@ -36,13 +45,15 @@ def _format_eventplot(id, tracked_dict, kwargs):
                 if isinstance(positions, (list, np.ndarray)) and not isinstance(
                     positions[0], (list, np.ndarray)
                 ):
-                    return pd.DataFrame({f"{id}_eventplot_events": positions})
+                    col_name = get_csv_column_name("eventplot-events", ax_row, ax_col, trace_id=trace_id)
+                    return pd.DataFrame({col_name: positions})
 
                 # If positions is a list of arrays (multiple event sets)
                 elif isinstance(positions, (list, np.ndarray)):
                     data = {}
                     for i, events in enumerate(positions):
-                        data[f"{id}_eventplot_events{i:02d}"] = events
+                        col_name = get_csv_column_name(f"eventplot-events{i:02d}", ax_row, ax_col, trace_id=f"{trace_id}-{i}")
+                        data[col_name] = events
 
                     # Use force_df to handle different length arrays
                     return scitex.pd.force_df(data)
@@ -53,20 +64,20 @@ def _format_eventplot(id, tracked_dict, kwargs):
                 if isinstance(positions, (list, np.ndarray)) and not isinstance(
                     positions[0], (list, np.ndarray)
                 ):
-                    return pd.DataFrame({f"{id}_eventplot_events": positions})
+                    col_name = get_csv_column_name("eventplot-events", ax_row, ax_col, trace_id=trace_id)
+                    return pd.DataFrame({col_name: positions})
 
                 # If positions is a list of arrays (multiple event sets)
                 elif isinstance(positions, (list, np.ndarray)):
                     # Create a DataFrame where each column is a Series that can handle varying lengths
                     df = pd.DataFrame()
                     for i, events in enumerate(positions):
-                        df[f"{id}_eventplot_events{i:02d}"] = pd.Series(events)
+                        col_name = get_csv_column_name(f"eventplot-events{i:02d}", ax_row, ax_col, trace_id=f"{trace_id}-{i}")
+                        df[col_name] = pd.Series(events)
                     return df
         except Exception as e:
             # If all else fails, return an empty DataFrame
-            import warnings
-
-            warnings.warn(f"Error formatting eventplot data: {str(e)}")
+            logger.warning(f"Error formatting eventplot data: {str(e)}")
             return pd.DataFrame()
 
     return pd.DataFrame()

scitex/plt/_subplots/_export_as_csv_formatters/_format_imshow2d.py

@@ -1,32 +1,48 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Timestamp: "2025-05-18 18:14:26 (ywatanabe)"
-# File: /data/gpfs/projects/punim2354/ywatanabe/scitex_repo/src/scitex/plt/_subplots/_export_as_csv_formatters/_format_imshow2d.py
-# ----------------------------------------
-import os
-
-__FILE__ = __file__
-__DIR__ = os.path.dirname(__FILE__)
-# ----------------------------------------
+# Timestamp: "2025-12-13 (ywatanabe)"
+# File: /home/ywatanabe/proj/scitex-code/src/scitex/plt/_subplots/_export_as_csv_formatters/_format_imshow2d.py
 
 import pandas as pd
 
+from scitex.plt.utils._csv_column_naming import get_csv_column_name
+from ._format_plot import _parse_tracking_id
+
 
 def _format_imshow2d(id, tracked_dict, kwargs):
-    """Format data from an imshow2d call."""
+    """Format data from an imshow2d call.
+
+    Args:
+        id (str): Identifier for the plot
+        tracked_dict (dict): Dictionary containing tracked data
+        kwargs (dict): Keyword arguments passed to imshow2d
+
+    Returns:
+        pd.DataFrame: Formatted data from imshow2d
+    """
     # Check if tracked_dict is empty or not a dictionary
     if not tracked_dict or not isinstance(tracked_dict, dict):
         return pd.DataFrame()
 
+    # Parse the tracking ID to get axes position and trace ID
+    ax_row, ax_col, trace_id = _parse_tracking_id(id)
+
     # Get the args from tracked_dict
     args = tracked_dict.get("args", [])
 
     # Extract data if available
     if len(args) >= 1 and isinstance(args[0], pd.DataFrame):
         df = args[0].copy()
-        # Add prefixes to columns and index if needed
-        # df.columns = [f"{id}_imshow2d_{col}" for col in df.columns]
-        # df.index = [f"{id}_imshow2d_{idx}" for idx in df.index]
+        # Rename columns using the single source of truth
+        renamed_cols = {}
+        for col in df.columns:
+            renamed_cols[col] = get_csv_column_name(
+                f"imshow2d_{col}", ax_row, ax_col, trace_id=trace_id
+            )
+        df = df.rename(columns=renamed_cols)
         return df
 
     return pd.DataFrame()
+
+
+# EOF

scitex/plt/_subplots/_export_as_csv_formatters/_format_matshow.py

@@ -1,11 +1,14 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Timestamp: "2025-12-01 12:20:00 (ywatanabe)"
+# Timestamp: "2025-12-13 (ywatanabe)"
 # File: /home/ywatanabe/proj/scitex-code/src/scitex/plt/_subplots/_export_as_csv_formatters/_format_matshow.py
 
 import numpy as np
 import pandas as pd
 
+from scitex.plt.utils._csv_column_naming import get_csv_column_name
+from ._format_plot import _parse_tracking_id
+
 
 def _format_matshow(id, tracked_dict, kwargs):
     """Format data from a matshow call.
@@ -21,6 +24,9 @@ def _format_matshow(id, tracked_dict, kwargs):
     if not tracked_dict or not isinstance(tracked_dict, dict):
         return pd.DataFrame()
 
+    # Parse the tracking ID to get axes position and trace ID
+    ax_row, ax_col, trace_id = _parse_tracking_id(id)
+
     if "args" in tracked_dict:
         args = tracked_dict["args"]
         if isinstance(args, tuple) and len(args) > 0:
@@ -31,9 +37,9 @@ def _format_matshow(id, tracked_dict, kwargs):
 
             df = pd.DataFrame(
                 {
-                    f"{id}_matshow_row": rows.flatten(),
-                    f"{id}_matshow_col": cols.flatten(),
-                    f"{id}_matshow_value": Z.flatten(),
+                    get_csv_column_name("row", ax_row, ax_col, trace_id=trace_id): rows.flatten(),
+                    get_csv_column_name("col", ax_row, ax_col, trace_id=trace_id): cols.flatten(),
+                    get_csv_column_name("value", ax_row, ax_col, trace_id=trace_id): Z.flatten(),
                 }
             )
             return df

scitex/plt/_subplots/_export_as_csv_formatters/_format_plot_imshow.py

@@ -10,6 +10,8 @@ __DIR__ = os.path.dirname(__FILE__)
 # ----------------------------------------
 
 import pandas as pd
+from scitex.plt.utils._csv_column_naming import get_csv_column_name
+from ._format_plot import _parse_tracking_id
 
 
 def _format_plot_imshow(id, tracked_dict, kwargs):
@@ -29,8 +31,18 @@ def _format_plot_imshow(id, tracked_dict, kwargs):
 
         # Add id prefix to column names if id is provided
         if id is not None:
+            # Parse tracking ID to extract axes position and trace ID
+            ax_row, ax_col, trace_id = _parse_tracking_id(id)
+
+            # Use standardized column naming for each column
             df = df.copy()
-            df.columns = [f"{id}_plot_imshow_{col}" for col in df.columns]
+            renamed_cols = {}
+            for col in df.columns:
+                # Create column name like "plot_imshow_row" or "plot_imshow_col"
+                renamed_cols[col] = get_csv_column_name(
+                    f"plot_imshow_{col}", ax_row, ax_col, trace_id=trace_id
+                )
+            df.rename(columns=renamed_cols, inplace=True)
 
         return df
 

scitex/plt/_subplots/_export_as_csv_formatters/_format_plot_kde.py

@@ -11,6 +11,8 @@ __DIR__ = os.path.dirname(__FILE__)
 
 import pandas as pd
 from scitex.pd import force_df
+from scitex.plt.utils._csv_column_naming import get_csv_column_name
+from ._format_plot import _parse_tracking_id
 
 
 def _format_plot_kde(id, tracked_dict, kwargs):
@@ -37,13 +39,21 @@ def _format_plot_kde(id, tracked_dict, kwargs):
     if x is None or kde is None:
         return pd.DataFrame()
 
-    df = pd.DataFrame({f"{id}_kde_x": x, f"{id}_kde_density": kde})
+    # Parse tracking ID to extract axes position and trace ID
+    ax_row, ax_col, trace_id = _parse_tracking_id(id)
+
+    # Use standardized column naming
+    x_col = get_csv_column_name("kde_x", ax_row, ax_col, trace_id=trace_id)
+    density_col = get_csv_column_name("kde_density", ax_row, ax_col, trace_id=trace_id)
+
+    df = pd.DataFrame({x_col: x, density_col: kde})
 
     # Add sample count if available
     if n is not None:
         # If n is a scalar, create a list with the same length as x
         if not hasattr(n, "__len__"):
             n = [n] * len(x)
-        df[f"{id}_kde_n"] = n
+        n_col = get_csv_column_name("kde_n", ax_row, ax_col, trace_id=trace_id)
+        df[n_col] = n
 
     return df

scitex/plt/_subplots/_export_as_csv_formatters/_format_plot_scatter.py

@@ -10,6 +10,8 @@ __DIR__ = os.path.dirname(__FILE__)
 # ----------------------------------------
 
 import pandas as pd
+from scitex.plt.utils._csv_column_naming import get_csv_column_name
+from ._format_plot import _parse_tracking_id
 
 
 def _format_plot_scatter(id, tracked_dict, kwargs):
@@ -26,10 +28,15 @@ def _format_plot_scatter(id, tracked_dict, kwargs):
     scatter_df = tracked_dict.get("scatter_df")
 
     if scatter_df is not None and isinstance(scatter_df, pd.DataFrame):
+        # Parse tracking ID to extract axes position and trace ID
+        ax_row, ax_col, trace_id = _parse_tracking_id(id)
+
+        # Use standardized column naming
+        x_col = get_csv_column_name("scatter_x", ax_row, ax_col, trace_id=trace_id)
+        y_col = get_csv_column_name("scatter_y", ax_row, ax_col, trace_id=trace_id)
+
         # Rename columns to include the id
-        return scatter_df.rename(
-            columns={"x": f"{id}_scatter_x", "y": f"{id}_scatter_y"}
-        )
+        return scatter_df.rename(columns={"x": x_col, "y": y_col})
 
     return pd.DataFrame()
 

scitex/plt/_subplots/_export_as_csv_formatters/_format_quiver.py

@@ -6,6 +6,9 @@
 import numpy as np
 import pandas as pd
 
+from scitex.plt.utils._csv_column_naming import get_csv_column_name
+from ._format_plot import _parse_tracking_id
+
 
 def _format_quiver(id, tracked_dict, kwargs):
     """Format data from a quiver (vector field) call.
@@ -21,6 +24,9 @@ def _format_quiver(id, tracked_dict, kwargs):
     if not tracked_dict or not isinstance(tracked_dict, dict):
         return pd.DataFrame()
 
+    # Parse the tracking ID to get axes position and trace ID
+    ax_row, ax_col, trace_id = _parse_tracking_id(id)
+
     if "args" in tracked_dict:
         args = tracked_dict["args"]
         if isinstance(args, tuple):
@@ -41,10 +47,10 @@ def _format_quiver(id, tracked_dict, kwargs):
 
             df = pd.DataFrame(
                 {
-                    f"{id}_quiver_x": X.flatten(),
-                    f"{id}_quiver_y": Y.flatten(),
-                    f"{id}_quiver_u": U.flatten(),
-                    f"{id}_quiver_v": V.flatten(),
+                    get_csv_column_name("quiver-x", ax_row, ax_col, trace_id=trace_id): X.flatten(),
+                    get_csv_column_name("quiver-y", ax_row, ax_col, trace_id=trace_id): Y.flatten(),
+                    get_csv_column_name("quiver-u", ax_row, ax_col, trace_id=trace_id): U.flatten(),
+                    get_csv_column_name("quiver-v", ax_row, ax_col, trace_id=trace_id): V.flatten(),
                 }
             )
             return df