batplot 1.3.7__tar.gz → 1.3.8__tar.gz

{batplot-1.3.7 → batplot-1.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.3.7
+Version: 1.3.8
 Summary: Interactive plotting for XRD, PDF, and XAS data (.xye, .xy, .qye, .dat, .csv, .gr, .nor, .chik, .chir)
 Author-email: Tian Dai <tianda@uio.no>
 License: MIT License

{batplot-1.3.7 → batplot-1.3.8}/batplot/__init__.py

@@ -1,5 +1,5 @@
 """batplot: Interactive plotting for battery data visualization."""
 
-__version__ = "1.3.7"
+__version__ = "1.3.8"
 
 __all__ = ["__version__"]

{batplot-1.3.7 → batplot-1.3.8}/batplot/operando.py

@@ -167,8 +167,8 @@ def plot_operando_folder(folder: str, args) -> Tuple[plt.Figure, plt.Axes, Dict[
     # Use imshow for speed; mask nans
     Zm = np.ma.masked_invalid(Z)
     extent = (grid_x.min(), grid_x.max(), 0, Zm.shape[0]-1)
-    # Top-to-down visual order (scan 0 at top) -> origin='upper'
-    im = ax.imshow(Zm, aspect='auto', origin='upper', extent=extent, cmap='viridis', interpolation='nearest')
+    # Bottom-to-top visual order (scan 0 at bottom) to match EC time progression -> origin='lower'
+    im = ax.imshow(Zm, aspect='auto', origin='lower', extent=extent, cmap='viridis', interpolation='nearest')
     # Place colorbar on the left
     cbar = fig.colorbar(im, ax=ax, location='left', pad=0.15)
     cbar.ax.yaxis.set_ticks_position('left')

{batplot-1.3.7 → batplot-1.3.8}/batplot/session.py

@@ -135,12 +135,24 @@ def dump_session(
         for side in ('top', 'bottom', 'left', 'right'):
             sp_obj = axis.spines.get(side)
             prefix = {'top': 't', 'bottom': 'b', 'left': 'l', 'right': 'r'}[side]
+            # Consistent tick/title state logic for all sides
+            if side == 'left':
+                ylabel_text = axis.get_ylabel()
+                title_state = bool(ylabel_text)
+            elif side == 'bottom':
+                title_state = bool(axis.get_xlabel())
+            elif side == 'top':
+                title_state = bool(getattr(axis, '_top_xlabel_on', False))
+            elif side == 'right':
+                title_state = bool(getattr(axis, '_right_ylabel_on', False))
+            else:
+                title_state = False
             wasd[side] = {
                 'spine': bool(sp_obj.get_visible() if sp_obj else False),
                 'ticks': bool(ts.get(f'{prefix}_ticks', ts.get({'top':'tx','bottom':'bx','left':'ly','right':'ry'}[side], side=='bottom' or side=='left'))),
                 'minor': bool(ts.get(f'm{prefix}x' if side in ('top','bottom') else f'm{prefix}y', False)),
                 'labels': bool(ts.get(f'{prefix}_labels', ts.get({'top':'tx','bottom':'bx','left':'ly','right':'ry'}[side], side=='bottom' or side=='left'))),
-                'title': bool(getattr(axis, '_top_xlabel_on' if side=='top' else '_right_ylabel_on' if side=='right' else '', False)) if side in ('top','right') else bool(axis.get_xlabel() if side=='bottom' else axis.get_ylabel() if side=='left' else False),
+                'title': title_state,
             }
         return wasd
     
@@ -321,12 +333,26 @@ def dump_operando_session(
             for side in ('top', 'bottom', 'left', 'right'):
                 sp = axis.spines.get(side)
                 prefix = {'top': 't', 'bottom': 'b', 'left': 'l', 'right': 'r'}[side]
+                # For 'left' side ylabel: check if it's currently visible (has text)
+                # If hidden but has stored text, the title state should be False (hidden)
+                if side == 'left':
+                    ylabel_text = axis.get_ylabel()
+                    title_state = bool(ylabel_text)  # True only if currently visible with text
+                elif side == 'bottom':
+                    title_state = bool(axis.get_xlabel())
+                elif side == 'top':
+                    title_state = bool(getattr(axis, '_top_xlabel_on', False))
+                elif side == 'right':
+                    title_state = bool(getattr(axis, '_right_ylabel_on', False))
+                else:
+                    title_state = False
+                
                 wasd[side] = {
                     'spine': bool(sp.get_visible() if sp else False),
                     'ticks': bool(ts.get(f'{prefix}_ticks', ts.get({'top':'tx','bottom':'bx','left':'ly','right':'ry'}[side], side=='bottom' or side=='left'))),
                     'minor': bool(ts.get(f'm{prefix}x' if side in ('top','bottom') else f'm{prefix}y', False)),
                     'labels': bool(ts.get(f'{prefix}_labels', ts.get({'top':'tx','bottom':'bx','left':'ly','right':'ry'}[side], side=='bottom' or side=='left'))),
-                    'title': bool(getattr(axis, '_top_xlabel_on' if side=='top' else '_right_ylabel_on' if side=='right' else '', False)) if side in ('top','right') else bool(axis.get_xlabel() if side=='bottom' else axis.get_ylabel() if side=='left' else False),
+                    'title': title_state,
                 }
             return wasd
         
@@ -414,6 +440,7 @@ def dump_operando_session(
                 'wasd_state': ec_wasd_state,
                 'spines': ec_spines,
                 'ticks': {'widths': ec_ticks},
+                'stored_ylabel': getattr(ec_ax, '_stored_ylabel', None),  # Save hidden ylabel text
             }
 
         sess = {
@@ -440,6 +467,7 @@ def dump_operando_session(
                 'wasd_state': op_wasd_state,
                 'spines': op_spines,
                 'ticks': {'widths': op_ticks},
+                'stored_ylabel': getattr(ax, '_stored_ylabel', None),  # Save hidden ylabel text
             },
             'colorbar': {
                 'label': cb_label,
@@ -549,6 +577,11 @@ def load_operando_session(filename: str):
     # Persist custom labels
     setattr(ax, '_custom_labels', dict(op.get('custom_labels', {'x': None, 'y': None})))
     
+    # Restore stored ylabel if present (for cases where ylabel was hidden with a5)
+    stored_ylabel = op.get('stored_ylabel')
+    if stored_ylabel is not None:
+        setattr(ax, '_stored_ylabel', stored_ylabel)
+    
     # Apply operando WASD state if version 2+
     version = sess.get('version', 1)
     if version >= 2:
@@ -750,6 +783,11 @@ def load_operando_session(filename: str):
             except Exception:
                 pass
         
+        # Restore stored ylabel if present (for cases where ylabel was hidden)
+        stored_ylabel = ec.get('stored_ylabel')
+        if stored_ylabel is not None:
+            setattr(ec_ax, '_stored_ylabel', stored_ylabel)
+        
         # Apply EC WASD state if version 2+
         if version >= 2:
             ec_wasd = ec.get('wasd_state')

{batplot-1.3.7 → batplot-1.3.8}/batplot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.3.7
+Version: 1.3.8
 Summary: Interactive plotting for XRD, PDF, and XAS data (.xye, .xy, .qye, .dat, .csv, .gr, .nor, .chik, .chir)
 Author-email: Tian Dai <tianda@uio.no>
 License: MIT License

{batplot-1.3.7 → batplot-1.3.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "batplot"
-version = "1.3.7"
+version = "1.3.8"
 description = "Interactive plotting for XRD, PDF, and XAS data (.xye, .xy, .qye, .dat, .csv, .gr, .nor, .chik, .chir)"
 authors = [
     { name = "Tian Dai", email = "tianda@uio.no" }