IBB-Helper 0.4.8.dev23__tar.gz → 0.4.8.dev24__tar.gz

{ibb_helper-0.4.8.dev23/src/IBB_Helper.egg-info → ibb_helper-0.4.8.dev24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: IBB_Helper
-Version: 0.4.8.dev23
+Version: 0.4.8.dev24
 Summary: Helper functions for symbolic math, matrix visualization, and plotting
 Author-email: "University of Stuttgart, Institute for Structural Mechanics (IBB)" <mvs@ibb.uni-stuttgart.de>
 License-Expression: BSD-3-Clause

{ibb_helper-0.4.8.dev23 → ibb_helper-0.4.8.dev24}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "IBB_Helper"
-version = "0.4.8.dev23"
+version = "0.4.8.dev24"
 description = "Helper functions for symbolic math, matrix visualization, and plotting"
 readme = "README.md"
 license = "BSD-3-Clause"

{ibb_helper-0.4.8.dev23 → ibb_helper-0.4.8.dev24}/src/IBB_Helper/combine_plots.py

@@ -1,10 +1,11 @@
 import matplotlib.pyplot as plt
 import plotly.graph_objects as go
 import copy
+import numpy as np
 
 def combine_plots(plot_list, labels=None, line_styles=None, colors=None,
-                 swap_axes=False, show=True, grid=False,
-                 xlim=None, ylim=None, title=None, xlabel=None, ylabel=None,width=800, height=700):
+                  swap_axes=False, show=True, grid=False,
+                  xlim=None, ylim=None, title=None, xlabel=None, ylabel=None, width=800, height=700):
     """
     Combines multiple Matplotlib Axes or Plotly Figures into a single plot while preserving styles.
 
@@ -21,69 +22,80 @@ def combine_plots(plot_list, labels=None, line_styles=None, colors=None,
         title      : Plot title (default=None)
         xlabel     : X-axis label (default=None)
         ylabel     : Y-axis label (default=None)
+        width      : width of the Plotly (default=800)
+        height     : height of the Plotly (default=700)
 
     Returns:
         matplotlib Axes or plotly.graph_objects.Figure
             The combined plot object, matching the input plot type
     """
-
-
-    if not plot_list:
-        raise ValueError("plot_list cannot be empty")
-
-    first_plot = plot_list[0]
     
-    # Define marker symbols for internal check (same list used in plot_2d)
-    marker_symbols = ['o', 's', '^', 'x', '*', 'D', 'p', '+', 'v', '<', '>', '1', '2', '3', '4']
+    # Apply Padding (Matplotlib)
+    def _apply_padding(ax, all_x, all_y):
+        if not all_x or not all_y: 
+            return
+
+        # Concatenate all arrays to find global min/max
+        flat_x = np.concatenate([np.atleast_1d(a) for a in all_x])
+        flat_y = np.concatenate([np.atleast_1d(a) for a in all_y])
+        
+        # Use nanmin/nanmax to ignore NaNs
+        min_x, max_x = np.nanmin(flat_x), np.nanmax(flat_x)
+        min_y, max_y = np.nanmin(flat_y), np.nanmax(flat_y)
 
-    # === MATPLOTLIB AXES HANDLING ===
-    if hasattr(first_plot, 'lines'):
+        # Calculate padding (handle case where max == min)
+        pad_x = (max_x - min_x) * 0.1 if max_x != min_x else 0.5
+        pad_y = (max_y - min_y) * 0.1 if max_y != min_y else 0.5
+        
+        # Apply padded limits (These act as defaults, overridden by user limits later)
+        ax.set_xlim(min_x - pad_x, max_x + pad_x)
+        ax.set_ylim(min_y - pad_y, max_y + pad_y)
+
+    # Matplotlib Handler
+    def _handle_matplotlib(plot_list):
         fig, ax = plt.subplots()
+        marker_symbols = ['o', 's', '^', 'x', '*', 'D', 'p', '+', 'v', '<', '>', '1', '2', '3', '4']
         
+        # Lists to collect data for padding calculation
+        all_plot_x = []
+        all_plot_y = []
+
         for i, plot_ax in enumerate(plot_list):
             first_line = True
             
             for line in plot_ax.lines:
                 x, y = line.get_data()
 
-                # --- 1. Retrieve Existing Properties (Default Transfer) ---
+                # Retrieve Existing Properties
                 current_color = line.get_color()
                 current_marker = line.get_marker()
                 current_linestyle = line.get_linestyle()
                 current_markersize = line.get_markersize()
                 current_linewidth = line.get_linewidth()
                 
-                # Normalize marker: Convert 'None' string to None
-                if current_marker in ['None', '']:
-                    current_marker = None
-                    
-                # Normalize linestyle: Matplotlib stores '' for marker-only plots
-                if current_linestyle in ['None', '']: 
-                    current_linestyle = 'None' 
-
-                # --- 2. Apply Overrides from append_plots Arguments (Only for First Line) ---
+                # Normalize marker/linestyle
+                if current_marker in ['None', '']: current_marker = None
+                if current_linestyle in ['None', '']: current_linestyle = 'None' 
+
+                # Apply Overrides (Only for First Line of the plot)
                 if first_line:
-                    # Override Line Style / Marker
+                    # Style Override
                     if line_styles and i < len(line_styles):
                         new_style = line_styles[i]
-                        
                         if new_style in marker_symbols:
-                            # Case A: User forces a marker (e.g., 'o', 'x')
                             current_marker = new_style
-                            current_linestyle = 'None' # Ensure linestyle is off
+                            current_linestyle = 'None'
                         else:
-                            # Case B: User forces a line style (e.g., '--', 'solid')
                             current_linestyle = new_style
-                            current_marker = None # Clear the marker
+                            current_marker = None
 
-                    # Override Color
+                    # Color Override
                     if colors and i < len(colors):
                         current_color = colors[i]
                 
-                # Apply label only to the first line of the current plot_ax
                 label_to_use = labels[i] if first_line and labels and i < len(labels) else None
 
-                # --- 3. Plot on the New Axes ---
+                # Plot on New Axes
                 if swap_axes:
                     ax.plot(y, x, 
                             color=current_color, 
@@ -92,6 +104,9 @@ def combine_plots(plot_list, labels=None, line_styles=None, colors=None,
                             markersize=current_markersize,
                             linewidth=current_linewidth,
                             label=label_to_use)
+                    # Collect data for padding (Swapped)
+                    all_plot_x.append(y)
+                    all_plot_y.append(x)
                 else:
                     ax.plot(x, y, 
                             color=current_color, 
@@ -100,92 +115,90 @@ def combine_plots(plot_list, labels=None, line_styles=None, colors=None,
                             markersize=current_markersize,
                             linewidth=current_linewidth,
                             label=label_to_use)
+                    # Collect data for padding (Standard)
+                    all_plot_x.append(x)
+                    all_plot_y.append(y)
 
                 first_line = False
-
-        # --- 4. Final Axis/Figure Configuration (Matplotlib) ---
-        if xlim:
-            ax.set_xlim(xlim)
-        if ylim:
-            ax.set_ylim(ylim)
-        if title:
-            ax.set_title(title)
-        if xlabel:
-            ax.set_xlabel(xlabel)
-        if ylabel:
-            ax.set_ylabel(ylabel)
-        if grid:
-            ax.grid()
-        if labels:
-            ax.legend()
+        
+        # Apply 10% Padding 
+        _apply_padding(ax, all_plot_x, all_plot_y)
+
+        # Final Config
+        if xlim: ax.set_xlim(xlim)
+        if ylim: ax.set_ylim(ylim)
+        if title: ax.set_title(title)
+        if xlabel: ax.set_xlabel(xlabel)
+        if ylabel: ax.set_ylabel(ylabel)
+        if grid: ax.grid(True)
+        if labels: ax.legend()
+        
         if show:
             plt.show()
         else:
             plt.close()
-
+            
         return ax
 
-    # === PLOTLY FIGURE HANDLING ===
-    elif hasattr(first_plot, 'data'):
+    # Plotly Handler
+    def _handle_plotly(plot_list):
         combined_fig = go.Figure()
         
         for i, fig in enumerate(plot_list):
             for trace in fig.data:
-                # Use deepcopy for safe cloning of the trace
                 new_trace = copy.deepcopy(trace)
 
-                # Apply colors if provided and trace supports it
+                # Color Override
                 if colors and i < len(colors):
-                    if hasattr(new_trace, 'line'):
-                        new_trace.line.color = colors[i]
-                    if hasattr(new_trace, 'marker'):
-                        new_trace.marker.color = colors[i]
+                    if hasattr(new_trace, 'line'): new_trace.line.color = colors[i]
+                    if hasattr(new_trace, 'marker'): new_trace.marker.color = colors[i]
 
-                # Apply line styles (dash) if provided
+                # Style Override
                 if line_styles and i < len(line_styles):
                     if isinstance(new_trace, go.Scatter) and hasattr(new_trace, 'line'):
                         new_trace.line.dash = line_styles[i]
 
-                # Apply labels/name
+                # Label Override
                 if labels and i < len(labels):
                     new_trace.name = labels[i]
                 
-                # Handle Axis Swap (if requested)
+                # Swap Axes
                 if swap_axes and hasattr(new_trace, 'x') and hasattr(new_trace, 'y'):
                      new_trace.x, new_trace.y = new_trace.y, new_trace.x
 
                 combined_fig.add_trace(new_trace)
 
-        # Final Layout Configuration (Plotly)
-        if title:
-            combined_fig.update_layout(title=title)
-        if xlabel or ylabel:
-            combined_fig.update_layout(xaxis_title=xlabel if xlabel else None,
-                                       yaxis_title=ylabel if ylabel else None)
-        if xlim:
-            combined_fig.update_xaxes(range=xlim)
-        if ylim:
-            combined_fig.update_yaxes(range=ylim)
-        if grid:
-            combined_fig.update_layout(xaxis_showgrid=True, yaxis_showgrid=True)
+        # Final Config
+        if title: combined_fig.update_layout(title=title)
+        combined_fig.update_layout(
+            xaxis_title=xlabel if xlabel else None,
+            yaxis_title=ylabel if ylabel else None
+        )
+        if xlim: combined_fig.update_xaxes(range=xlim)
+        if ylim: combined_fig.update_yaxes(range=ylim)
+        if grid: combined_fig.update_layout(xaxis_showgrid=True, yaxis_showgrid=True)
             
         combined_fig.update_layout(
-            autosize=False,
-            width=width,
-            height=height,
-            scene=dict(
-                aspectratio=dict(x=1, y=1, z=1),
-                camera=dict(eye=dict(x=1.87, y=0.88, z=1.5)),
-            ),
+            autosize=False, width=width, height=height,
+            scene=dict(aspectratio=dict(x=1, y=1, z=1), camera=dict(eye=dict(x=1.87, y=0.88, z=1.5))),
             margin=dict(l=10, r=10, t=50, b=10),
             legend=dict(x=0, y=1),
         )
-        
 
-        if show:
-            combined_fig.show()
+        if show: combined_fig.show()
 
         return combined_fig
 
+    # Main Execution
+    if not plot_list:
+        raise ValueError("plot_list cannot be empty")
+
+    first_plot = plot_list[0]
+
+    # Dispatch based on type
+    if hasattr(first_plot, 'lines'):
+        return _handle_matplotlib(plot_list)
+    elif hasattr(first_plot, 'data'):
+        return _handle_plotly(plot_list)
     else:
-        raise TypeError("Unknown plot object type passed to append_plots.")
+        raise TypeError("Unknown plot object type passed to combine_plots.")

{ibb_helper-0.4.8.dev23 → ibb_helper-0.4.8.dev24/src/IBB_Helper.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: IBB_Helper
-Version: 0.4.8.dev23
+Version: 0.4.8.dev24
 Summary: Helper functions for symbolic math, matrix visualization, and plotting
 Author-email: "University of Stuttgart, Institute for Structural Mechanics (IBB)" <mvs@ibb.uni-stuttgart.de>
 License-Expression: BSD-3-Clause