batplot 1.7.22__py3-none-any.whl → 1.7.23__py3-none-any.whl

batplot/__init__.py

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

batplot/args.py

@@ -190,6 +190,7 @@ def _print_general_help() -> None:
         "  (If you are not from UiO, send an email to sympa@kjemi.uio.no with the subject line \"subscribe batplot-lab@kjemi.uio.no your-name\")\n"
         "  Kindly cite the pypi package page (https://pypi.org/project/batplot/) if the plot is used for publication\n"
         "  Email: tianda@uio.no\n"
+        "  Personal page: https://www.mn.uio.no/kjemi/english/people/aca/tianda/\n"
         )
     _print_help(msg)
 

batplot/operando_ec_interactive.py

@@ -1050,6 +1050,15 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
             # Horizontal offsets (relative to canvas center, in inches)
             cb_h_offset = getattr(cbar.ax, '_cb_h_offset_in', 0.0)
             ec_h_offset = getattr(ec_ax, '_ec_h_offset_in', 0.0) if ec_ax is not None else None
+            # Colorbar tick/label positions (left/right)
+            cb_ticks_left = True
+            cb_label_left = True
+            try:
+                cb_ticks_left = any(getattr(tick, 'tick1line', None) and tick.tick1line.get_visible() for tick in cbar.ax.yaxis.get_major_ticks())
+                # label position is stored on axis; capture current setting
+                cb_label_left = (cbar.ax.yaxis.get_label_position() == 'left')
+            except Exception:
+                pass
             # Label pads (save current labelpad values to restore later)
             op_labelpads = {
                 'x': getattr(ax.xaxis, 'labelpad', None),
@@ -1084,6 +1093,8 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                 'ec_visible': ec_visible,
                 'cb_h_offset': float(cb_h_offset),
                 'ec_h_offset': float(ec_h_offset) if ec_h_offset is not None else None,
+                'cb_ticks_left': cb_ticks_left,
+                'cb_label_left': cb_label_left,
                 'op_labelpads': dict(op_labelpads),
                 'ec_labelpads': dict(ec_labelpads) if ec_labelpads is not None else None,
                 'op_title_offsets': {
@@ -1138,6 +1149,14 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                 _apply_group_layout_inches(fig, ax, cbar.ax, ec_ax, ax_w_i, ax_h_i, cb_w_i, cb_gap_i, ec_gap_i, ec_w_i)
             except Exception:
                 pass
+            # Colorbar tick/label side
+            try:
+                cb_ticks_left = snap.get('cb_ticks_left', True)
+                cb_label_left = snap.get('cb_label_left', True)
+                cbar.ax.yaxis.set_ticks_position('left' if cb_ticks_left else 'right')
+                cbar.ax.yaxis.set_label_position('left' if cb_label_left else 'right')
+            except Exception:
+                pass
             # Labels
             try:
                 op_l = snap.get('op_labels', {})
@@ -1170,6 +1189,14 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                 pass
             try:
                 if snap.get('clim') is not None:
+                    # Detach built-in colorbar update to avoid artist removal errors; we redraw custom below.
+                    try:
+                        if hasattr(cbar, 'mappable'):
+                            cbar.mappable = None
+                        if hasattr(cbar, 'solids'):
+                            cbar.solids = None
+                    except Exception:
+                        pass
                     lo, hi = snap['clim']; im.set_clim(float(lo), float(hi))
             except Exception:
                 pass
@@ -1180,6 +1207,15 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                         cbar.update_normal(im)
             except Exception:
                 pass
+            # Restore colorbar side (ticks/label) and redraw custom colorbar to keep position
+            try:
+                cb_ticks_left = snap.get('cb_ticks_left', True)
+                cb_label_left = snap.get('cb_label_left', True)
+                cbar.ax.yaxis.set_ticks_position('left' if cb_ticks_left else 'right')
+                cbar.ax.yaxis.set_label_position('left' if cb_label_left else 'right')
+                _update_custom_colorbar(cbar.ax, im)
+            except Exception:
+                pass
             # EC axes
             try:
                 if ec_ax is not None:
@@ -2840,7 +2876,6 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             continue
                         _snapshot("operando-xrange")
                         ax.set_xlim(cur[0], new_upper)
-                        _renormalize_to_visible()
                         fig.canvas.draw_idle()
                         print(f"Operando X range updated: {ax.get_xlim()[0]:.4g} {ax.get_xlim()[1]:.4g}")
                 if line.lower() == 'w':
@@ -2860,7 +2895,6 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             continue
                         _snapshot("operando-xrange")
                         ax.set_xlim(new_lower, cur[1])
-                        _renormalize_to_visible()
                         fig.canvas.draw_idle()
                         print(f"Operando X range updated: {ax.get_xlim()[0]:.4g} {ax.get_xlim()[1]:.4g}")
                 if line.lower() == 's':
@@ -2877,7 +2911,6 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                                 orig_min = min(extent[0], extent[1])
                                 orig_max = max(extent[0], extent[1])
                                 ax.set_xlim(orig_min, orig_max)
-                                _renormalize_to_visible()
                                 fig.canvas.draw_idle()
                                 print(f"Operando X range restored to original: {ax.get_xlim()[0]:.4g} {ax.get_xlim()[1]:.4g}")
                             else:
@@ -2891,8 +2924,6 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                 try:
                     lo, hi = map(float, line.split())
                     ax.set_xlim(lo, hi)
-                    # Re-normalize intensity to visible region
-                    _renormalize_to_visible()
                     fig.canvas.draw_idle()
                 except Exception as e:
                     print(f"Invalid range: {e}")
@@ -2918,7 +2949,6 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             continue
                         _snapshot("operando-yrange")
                         ax.set_ylim(cur[0], new_upper)
-                        _renormalize_to_visible()
                         fig.canvas.draw_idle()
                         print(f"Operando Y range updated: {ax.get_ylim()[0]:.4g} {ax.get_ylim()[1]:.4g}")
                 if line.lower() == 'w':
@@ -2938,7 +2968,6 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             continue
                         _snapshot("operando-yrange")
                         ax.set_ylim(new_lower, cur[1])
-                        _renormalize_to_visible()
                         fig.canvas.draw_idle()
                         print(f"Operando Y range updated: {ax.get_ylim()[0]:.4g} {ax.get_ylim()[1]:.4g}")
                 if line.lower() == 's':
@@ -2955,7 +2984,6 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                                 orig_min = min(extent[2], extent[3])
                                 orig_max = max(extent[2], extent[3])
                                 ax.set_ylim(orig_min, orig_max)
-                                _renormalize_to_visible()
                                 fig.canvas.draw_idle()
                                 print(f"Operando Y range restored to original: {ax.get_ylim()[0]:.4g} {ax.get_ylim()[1]:.4g}")
                             else:
@@ -2969,8 +2997,6 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                 try:
                     lo, hi = map(float, line.split())
                     ax.set_ylim(lo, hi)
-                    # Re-normalize intensity to visible region
-                    _renormalize_to_visible()
                     fig.canvas.draw_idle()
                 except Exception as e:
                     print(f"Invalid range: {e}")

batplot/session.py

@@ -38,6 +38,7 @@ import matplotlib.pyplot as plt
 import numpy as np
 
 from .utils import _confirm_overwrite
+from .color_utils import ensure_colormap
 
 
 def _current_tick_width(axis_obj, which: str):
@@ -831,8 +832,14 @@ def load_operando_session(filename: str):
     op = sess['operando']
     arr = _ma.masked_invalid(op['array'])
     extent = tuple(op['extent']) if op['extent'] is not None else None
+    cmap_name = op.get('cmap') or 'viridis'
+    try:
+        if not ensure_colormap(cmap_name):
+            cmap_name = 'viridis'
+    except Exception:
+        cmap_name = 'viridis'
     im = ax.imshow(arr, aspect='auto', origin=op.get('origin', 'upper'), extent=extent,
-                   cmap=op.get('cmap') or 'viridis', interpolation=op.get('interpolation', 'nearest'))
+                   cmap=cmap_name, interpolation=op.get('interpolation', 'nearest'))
     if op.get('clim'):
         try:
             im.set_clim(*op['clim'])

{batplot-1.7.22.dist-info → batplot-1.7.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.7.22
+Version: 1.7.23
 Summary: Interactive plotting tool for material science (1D plot) and electrochemistry (GC, CV, dQ/dV, CPC, operando) with batch processing
 Author-email: Tian Dai <tianda@uio.no>
 License-Expression: MIT
@@ -171,7 +171,9 @@ See [LICENSE](LICENSE)
 
 ## Author & Contact
 
-Tian Dai (tianda@uio.no)  
+Tian Dai
+tianda@uio.no
 University of Oslo
+https://www.mn.uio.no/kjemi/english/people/aca/tianda/
 
 **Subscribe for Updates**: Join batplot-lab@kjemi.uio.no for updates, feature announcements, and community feedback. If you are not from UiO, send an email to sympa@kjemi.uio.no with the exact subject line with your name: "subscribe batplot-lab@kjemi.uio.no your-name"

{batplot-1.7.22.dist-info → batplot-1.7.23.dist-info}/RECORD

@@ -1,5 +1,5 @@
-batplot/__init__.py,sha256=49tgsxXciOUfTdUerVfqotJBtQQT93XXCs_pBD-1y2k,119
-batplot/args.py,sha256=T10bmG09tgMks6YvlurHECLvwl94zcvdGZKbc9SuXxQ,34899
+batplot/__init__.py,sha256=vkOVAS6v23TnQZXUW0hx9pGUWLY7MUF__AXzrydzgBs,119
+batplot/args.py,sha256=6g1eHVsycDSAenwrXuCTcyuXCy_-30zy1lWtdguBG2s,34983
 batplot/batch.py,sha256=YQ7obCIqLCObwDbM7TXpOBh7g7BO95wZNsa2Fy84c6o,53858
 batplot/batplot.py,sha256=h960XKSmJ825DqI99Xnyomg_gaB0aFDUIKxkovm8BPQ,170691
 batplot/cif.py,sha256=JfHwNf3SHrcpALc_F5NjJmQ3lg71MBRSaIUJjGYPTx8,30120
@@ -13,16 +13,16 @@ batplot/interactive.py,sha256=gAmfHLVu4dAC_-hpmpfJj8dyQTBbzRNweVODuQDIocw,196317
 batplot/manual.py,sha256=pbRI6G4Pm12pOW8LrOLWWu7IEOtqWN3tRHtgge50LlA,11556
 batplot/modes.py,sha256=qE2OsOQQKhwOWene5zxJeuuewTrZxubtahQuz5je7ok,37252
 batplot/operando.py,sha256=CdTZJa6Cr1wNczFEbwAido2mc7C_h1xxoQ5b045ktSk,28105
-batplot/operando_ec_interactive.py,sha256=FpBdtkYdLOa31teRnNZ5qn1fo4Xqrk3AaFwCbj32c3A,280504
+batplot/operando_ec_interactive.py,sha256=snGzZBlgmXhvGupaMv-1Jvb9V7E3APMadYXKfQ4rZB4,281889
 batplot/plotting.py,sha256=hG2_EdDhF1Qpn1XfZKdCQ5-w_m9gUYFbr804UQ5QjsU,10841
 batplot/readers.py,sha256=kAI0AvYrdfGRZkvADJ4riN96IWtrH24aAoZpBtONTbw,112960
-batplot/session.py,sha256=5PVxu8Q7T6Fonq0zgvUD3SkoN-9QnlBa8l3_R02B_K0,120820
+batplot/session.py,sha256=3oo0jimTEdK7HpcBb326F8iBCM_LKPwNaSnmqSKU92Y,121025
 batplot/style.py,sha256=wmg4D4LdunLU88YYzh9y2REwet6xc5Ox2naa1ZW2OlM,58276
 batplot/ui.py,sha256=MIY2x_ghCYxjdYhjMUZsMMnQEUBLgrIT37hfPGZf_cs,36320
 batplot/utils.py,sha256=3dBZALWiCu5c6uc5MBII7n8329BZjieTEw4qithTlow,33939
 batplot/version_check.py,sha256=OG4LuHo5-rSqLLHQo5nWbX9lbNq6NyxRdvVUUcJRBqQ,6219
 batplot/data/USER_MANUAL.md,sha256=VYPvNZt3Fy8Z4Izr2FnQBw9vEaFTPkybhHDnF-OuKws,17694
-batplot-1.7.22.dist-info/licenses/LICENSE,sha256=2PAnHeCiTfgI7aKZLWr0G56HI9fGKQ0CEbQ02H-yExQ,1065
+batplot-1.7.23.dist-info/licenses/LICENSE,sha256=2PAnHeCiTfgI7aKZLWr0G56HI9fGKQ0CEbQ02H-yExQ,1065
 batplot_backup_20251121_223043/__init__.py,sha256=3s2DUQuTbWs65hoN9cQQ8IiJbaFJY8fNxiCpwRBYoOA,118
 batplot_backup_20251121_223043/args.py,sha256=OH-h84QhN-IhMS8sPAsSEqccHD3wpeMgmXa_fqv5xtg,21215
 batplot_backup_20251121_223043/batch.py,sha256=oI7PONJyciHDOqNPq-8fnOQMyn9CpAdVznKaEdsy0ig,48650
@@ -45,8 +45,8 @@ batplot_backup_20251121_223043/style.py,sha256=xg-tj6bEbFUVjjxYMokiLehS4tSfKanLI
 batplot_backup_20251121_223043/ui.py,sha256=K0XZWyiuBRNkFod9mgZyJ9CLN78GR1-hh6EznnIb5S8,31208
 batplot_backup_20251121_223043/utils.py,sha256=jydA0JxsCWWAudXEwSjlxTG17y2F8U6hIAukAzi1P0g,32526
 batplot_backup_20251121_223043/version_check.py,sha256=vlHkGkgUJcD_Z4KZmwonxZvKZh0MwHLaBSxaLPc66AQ,4555
-batplot-1.7.22.dist-info/METADATA,sha256=huY1GKnOrNjHphobQkIhbe94RtCDgTlwTNjmJRBQLIc,6137
-batplot-1.7.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-batplot-1.7.22.dist-info/entry_points.txt,sha256=73GgH3Zs-qGIvgiyQLgGsSW-ryOwPPKHveOW6TDIR5Q,82
-batplot-1.7.22.dist-info/top_level.txt,sha256=CgqK4RpsYnUFAcqO4bLOnEhCoPY4IPEGLPkiDlzLIxg,39
-batplot-1.7.22.dist-info/RECORD,,
+batplot-1.7.23.dist-info/METADATA,sha256=9CLx5Pt0Lrcu3244DqSt7DjHP8zO9FfqsGh-nFmvtfs,6188
+batplot-1.7.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+batplot-1.7.23.dist-info/entry_points.txt,sha256=73GgH3Zs-qGIvgiyQLgGsSW-ryOwPPKHveOW6TDIR5Q,82
+batplot-1.7.23.dist-info/top_level.txt,sha256=CgqK4RpsYnUFAcqO4bLOnEhCoPY4IPEGLPkiDlzLIxg,39
+batplot-1.7.23.dist-info/RECORD,,