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

batplot/style.py

@@ -500,7 +500,8 @@ def export_style_config(
     label_text_objects: Optional[List] = None,
     base_path: Optional[str] = None,
     show_cif_titles: Optional[bool] = None,
-) -> None:
+    overwrite_path: Optional[str] = None,
+) -> Optional[str]:
     """Export style configuration after displaying a summary and prompting the user.
     
     This function now matches the EC menu workflow: display summary, then prompt for export.
@@ -635,6 +636,14 @@ def export_style_config(
             "has_left_y": bool(ax.yaxis.label.get_visible()),
         }
         cfg["axis_title_texts"] = axis_title_texts
+        cfg["title_offsets"] = {
+            "top_y": float(getattr(ax, '_top_xlabel_manual_offset_y_pts', 0.0) or 0.0),
+            "top_x": float(getattr(ax, '_top_xlabel_manual_offset_x_pts', 0.0) or 0.0),
+            "bottom_y": float(getattr(ax, '_bottom_xlabel_manual_offset_y_pts', 0.0) or 0.0),
+            "left_x": float(getattr(ax, '_left_ylabel_manual_offset_x_pts', 0.0) or 0.0),
+            "right_x": float(getattr(ax, '_right_ylabel_manual_offset_x_pts', 0.0) or 0.0),
+            "right_y": float(getattr(ax, '_right_ylabel_manual_offset_y_pts', 0.0) or 0.0),
+        }
         # Save rotation angle
         cfg["rotation_angle"] = getattr(ax, '_rotation_angle', 0)
         
@@ -674,14 +683,27 @@ def export_style_config(
             if serialized_palettes:
                 cfg['curve_palettes'] = serialized_palettes
         
-        # Ask user for style-only or style+geometry
-        print("\nExport options:")
-        print("  ps  = style only (.bps)")
-        print("  psg = style + geometry (.bpsg)")
-        exp_choice = input("Export choice (ps/psg, q=cancel): ").strip().lower()
-        if not exp_choice or exp_choice == 'q':
-            print("Style export canceled.")
-            return
+        # If overwrite_path is provided, determine export type from existing file
+        if overwrite_path:
+            try:
+                with open(overwrite_path, 'r', encoding='utf-8') as f:
+                    old_cfg = json.load(f)
+                old_kind = old_cfg.get('kind', '')
+                if old_kind == 'xy_style_geom':
+                    exp_choice = 'psg'
+                else:
+                    exp_choice = 'ps'
+            except Exception:
+                exp_choice = 'ps'  # Default to style-only if can't read
+        else:
+            # Ask user for style-only or style+geometry
+            print("\nExport options:")
+            print("  ps  = style only (.bps)")
+            print("  psg = style + geometry (.bpsg)")
+            exp_choice = input("Export choice (ps/psg, q=cancel): ").strip().lower()
+            if not exp_choice or exp_choice == 'q':
+                print("Style export canceled.")
+                return None
         
         # Determine file extension and add geometry if requested
         if exp_choice == 'ps':
@@ -704,55 +726,74 @@ def export_style_config(
             print(f"Unknown option: {exp_choice}")
             return
         
-        # List existing files for user convenience (from Styles subdirectory)
-        import os
-        from .utils import list_files_in_subdirectory, get_organized_path
-        
-        if base_path:
-            print(f"\nChosen path: {base_path}")
-        file_list = list_files_in_subdirectory((default_ext, '.bpcfg'), 'style', base_path=base_path)
-        style_files = [f[0] for f in file_list]
-
-        if style_files:
-            styles_root = base_path if base_path else os.getcwd()
-            styles_dir = os.path.join(styles_root, 'Styles')
-            print(f"\nExisting {default_ext} files in {styles_dir}:")
-            for i, f in enumerate(style_files, 1):
-                print(f"  {i}: {f}")
+        # If overwrite_path is provided, use it directly
+        if overwrite_path:
+            target_path = overwrite_path
+        else:
+            # List existing files for user convenience (from Styles subdirectory)
+            import os
+            from .utils import list_files_in_subdirectory, get_organized_path
+            
+            if base_path:
+                print(f"\nChosen path: {base_path}")
+            file_list = list_files_in_subdirectory((default_ext, '.bpcfg'), 'style', base_path=base_path)
+            style_files = [f[0] for f in file_list]
 
-        choice = input("Export to file? Enter filename or number to overwrite (q=cancel): ").strip()
-        if not choice or choice.lower() == 'q':
-            print("Style export canceled.")
-            return
+            if style_files:
+                styles_root = base_path if base_path else os.getcwd()
+                styles_dir = os.path.join(styles_root, 'Styles')
+                print(f"\nExisting {default_ext} files in {styles_dir}:")
+                for i, f in enumerate(style_files, 1):
+                    print(f"  {i}: {f}")
 
-        # Determine the target path
-        if choice.isdigit() and style_files and 1 <= int(choice) <= len(style_files):
-            target_path = file_list[int(choice) - 1][1]  # Full path from list
-        else:
-            # Add default extension if no extension provided
-            if not any(choice.lower().endswith(ext) for ext in ['.bps', '.bpsg', '.bpcfg']):
-                filename_with_ext = f"{choice}{default_ext}"
+            last_style_path = getattr(fig, '_last_style_export_path', None)
+            if last_style_path:
+                choice = input("Export to file? Enter filename, number to overwrite, or o to overwrite last (q=cancel): ").strip()
             else:
-                filename_with_ext = choice
-            
-            # Use organized path unless it's an absolute path
-            if os.path.isabs(filename_with_ext):
-                target_path = filename_with_ext
+                choice = input("Export to file? Enter filename or number to overwrite (q=cancel): ").strip()
+            if not choice or choice.lower() == 'q':
+                print("Style export canceled.")
+                return None
+            if choice.lower() == 'o':
+                # Overwrite last exported style file - handled by caller
+                if not last_style_path:
+                    print("No previous export found.")
+                    return None
+                if not os.path.exists(last_style_path):
+                    print(f"Previous export file not found: {last_style_path}")
+                    return None
+                target_path = last_style_path
             else:
-                target_path = get_organized_path(filename_with_ext, 'style', base_path=base_path)
+                # Determine the target path
+                if choice.isdigit() and style_files and 1 <= int(choice) <= len(style_files):
+                    target_path = file_list[int(choice) - 1][1]  # Full path from list
+                else:
+                    # Add default extension if no extension provided
+                    if not any(choice.lower().endswith(ext) for ext in ['.bps', '.bpsg', '.bpcfg']):
+                        filename_with_ext = f"{choice}{default_ext}"
+                    else:
+                        filename_with_ext = choice
+                    
+                    # Use organized path unless it's an absolute path
+                    if os.path.isabs(filename_with_ext):
+                        target_path = filename_with_ext
+                    else:
+                        target_path = get_organized_path(filename_with_ext, 'style', base_path=base_path)
 
-        # Only prompt ONCE for overwrite if the file exists
-        if os.path.exists(target_path):
-            yn = input(f"Overwrite '{os.path.basename(target_path)}'? (y/n): ").strip().lower()
-            if yn != 'y':
-                print("Style export canceled.")
-                return
+                # Only prompt ONCE for overwrite if the file exists
+                if os.path.exists(target_path):
+                    yn = input(f"Overwrite '{os.path.basename(target_path)}'? (y/n): ").strip().lower()
+                    if yn != 'y':
+                        print("Style export canceled.")
+                        return None
 
         with open(target_path, "w", encoding="utf-8") as f:
             json.dump(cfg, f, indent=2)
         print(f"Exported style to {target_path}")
+        return target_path
     except Exception as e:
         print(f"Error exporting style: {e}")
+        return None
 
 
 def apply_style_config(
@@ -1204,6 +1245,27 @@ def apply_style_config(
             except Exception as e:
                 print(f"Warning: Could not restore rotation angle: {e}")
 
+        # Restore title offsets BEFORE positioning titles
+        title_offsets = cfg.get("title_offsets", {})
+        if title_offsets:
+            try:
+                if 'top_y' in title_offsets:
+                    ax._top_xlabel_manual_offset_y_pts = float(title_offsets.get('top_y', 0.0) or 0.0)
+                else:
+                    # Backward compatibility: old format used 'top' for y-offset
+                    ax._top_xlabel_manual_offset_y_pts = float(title_offsets.get('top', 0.0) or 0.0)
+                ax._top_xlabel_manual_offset_x_pts = float(title_offsets.get('top_x', 0.0) or 0.0)
+                ax._bottom_xlabel_manual_offset_y_pts = float(title_offsets.get('bottom_y', 0.0) or 0.0)
+                ax._left_ylabel_manual_offset_x_pts = float(title_offsets.get('left_x', 0.0) or 0.0)
+                if 'right_x' in title_offsets:
+                    ax._right_ylabel_manual_offset_x_pts = float(title_offsets.get('right_x', 0.0) or 0.0)
+                else:
+                    # Backward compatibility: old format used 'right' for x-offset
+                    ax._right_ylabel_manual_offset_x_pts = float(title_offsets.get('right', 0.0) or 0.0)
+                ax._right_ylabel_manual_offset_y_pts = float(title_offsets.get('right_y', 0.0) or 0.0)
+            except Exception as e:
+                print(f"Warning: Could not restore title offsets: {e}")
+
         # Restore grid state
         if "grid" in cfg:
             try:

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

@@ -1,9 +1,30 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.7.22
+Version: 1.7.24
 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
+License: MIT License
+        
+        Copyright (c) 2025 Tian Dai
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+        
 Project-URL: Homepage, https://github.com/TianDai1729/batplot
 Project-URL: Repository, https://github.com/TianDai1729/batplot
 Project-URL: Issues, https://github.com/TianDai1729/batplot/issues
@@ -171,7 +192,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.24.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=vcxX_RWa2zNjGw0VeGmJHavkp3EFX9_6FzqOzyahxOI,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
@@ -7,22 +7,22 @@ batplot/cli.py,sha256=ScDb2je8VQ0mz_z0SLCHEigiTuFPY5pb1snnzCouKms,5828
 batplot/color_utils.py,sha256=ow2ElqjIWFLRdrnLwQvrnfa3w3IEB0FodPFdoDQR_Dc,19990
 batplot/config.py,sha256=6nGY7fKN4T5KZUGQS2ArUBgEkLAL0j37XwG5SCVQgKA,6420
 batplot/converters.py,sha256=rR2WMPM0nR5E3eZI3gWbaJf_AfbdQx3urVSbJmZXNzo,8237
-batplot/cpc_interactive.py,sha256=ICrY25rSqKsds9Cb2lW1GiTdY-lTQaAuD4NRzQCZGCw,187304
-batplot/electrochem_interactive.py,sha256=f71CsXDNoge-7ENKX3PhmnSf7uBFXoHhcPSHL9_cF-Q,209167
-batplot/interactive.py,sha256=gAmfHLVu4dAC_-hpmpfJj8dyQTBbzRNweVODuQDIocw,196317
+batplot/cpc_interactive.py,sha256=zeMIoPt8fNEi-PcxkMf2PnU7k8owoU6SUfsruohIAsM,195690
+batplot/electrochem_interactive.py,sha256=ig9I-bQelTIRxSdXMppdA9RBqrR9vJ1lbkyNtwTC7-A,217226
+batplot/interactive.py,sha256=R9ipqK4ZN5wwe6L1mcvWt1TbmGXwPU87V5jm1BWvgeM,203584
 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=wMuWMz96TeJcKp52iUEqsWy6_NTxAagva4NvCALG0GI,293064
 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/style.py,sha256=wmg4D4LdunLU88YYzh9y2REwet6xc5Ox2naa1ZW2OlM,58276
+batplot/session.py,sha256=fuUCRdZ2Trl_RKuFgF_m4BUfplhhzOHJ16vtetLC2T0,126312
+batplot/style.py,sha256=ZeRJ15fneSQqCYN_SGap-9Y2J8UkzRxYmf6qLJA6zMo,62058
 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.24.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.24.dist-info/METADATA,sha256=dJA_9A2XGrZlSltD6KplJokAvn02C88tY4LYxc9A1mg,7407
+batplot-1.7.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+batplot-1.7.24.dist-info/entry_points.txt,sha256=73GgH3Zs-qGIvgiyQLgGsSW-ryOwPPKHveOW6TDIR5Q,82
+batplot-1.7.24.dist-info/top_level.txt,sha256=CgqK4RpsYnUFAcqO4bLOnEhCoPY4IPEGLPkiDlzLIxg,39
+batplot-1.7.24.dist-info/RECORD,,