IBB-Helper 0.4.8.dev15__tar.gz → 0.4.8.dev17__tar.gz

{ibb_helper-0.4.8.dev15/src/IBB_Helper.egg-info → ibb_helper-0.4.8.dev17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: IBB_Helper
-Version: 0.4.8.dev15
+Version: 0.4.8.dev17
 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.dev15 → ibb_helper-0.4.8.dev17}/pyproject.toml

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

{ibb_helper-0.4.8.dev15 → ibb_helper-0.4.8.dev17}/src/IBB_Helper/plot_2d.py

@@ -8,7 +8,7 @@ def plot_2d(exprs, var, labels=None, line_styles=None, colors=None,
             xlim=None, ylim=None, resolution=400, show=True, _break_=None,
             fontsize=14, title_size=None, label_size=None,
             tick_size=None, legend_size=None, linewidth=1,
-            swap_axes=False,scaling=None):
+            swap_axes=False, scaling=None):
     
     """
     Plots 2D curves from symbolic expressions or numeric datasets using Matplotlib.
@@ -19,9 +19,9 @@ def plot_2d(exprs, var, labels=None, line_styles=None, colors=None,
         labels       : Labels for each curve (default=None)
         line_styles  : Line styles or markers for each curve (default=None)
         colors       : Colors for each curve (default=None)
-        title        : Plot title (default="2D Plot")
-        xlabel       : X-axis label (default="x")
-        ylabel       : Y-axis label (default="y")
+        title        : Plot title (default=None)
+        xlabel       : X-axis label (default=None)
+        ylabel       : Y-axis label (default=None)
         xlim         : X-axis limits as (min, max) (default=None)
         ylim         : Y-axis limits as (min, max) (default=None)
         resolution   : Number of points used to evaluate symbolic expressions (default=400)
@@ -90,6 +90,10 @@ def plot_2d(exprs, var, labels=None, line_styles=None, colors=None,
         'o', 's', '^', 'x', '*', 'D', 'p', '+',
         'v', '<', '>', '1', '2', '3', '4'
     ]
+    
+    #Initialize lists to collect all plotted data points
+    all_plot_x = []
+    all_plot_y = []
 
     # Plot expressions
     for i, expr in enumerate(exprs):
@@ -104,6 +108,10 @@ def plot_2d(exprs, var, labels=None, line_styles=None, colors=None,
         if isinstance(expr, Matrix):
             expr = np.array(expr).astype(np.float64).flatten()
 
+        # Variable to hold what we actually plot
+        final_x_data = None
+        final_y_data = None
+
         # Parametric or dataset plot
         if isinstance(expr, (tuple, list)) and len(expr) == 2:
             x_data, y_data = expr
@@ -126,24 +134,9 @@ def plot_2d(exprs, var, labels=None, line_styles=None, colors=None,
                 marker = style
                 style = ''
 
-            if swap_axes:
-                ax.plot(
-                    y_data, x_data,
-                    label=label,
-                    linestyle=style,
-                    color=color,
-                    marker=marker,
-                    linewidth=linewidth
-                )
-            else:
-                ax.plot(
-                    x_data, y_data,
-                    label=label,
-                    linestyle=style,
-                    color=color,
-                    marker=marker,
-                    linewidth=linewidth
-                )
+            # Assign to final variables
+            final_x_data = x_data
+            final_y_data = y_data
 
         # Standard y = f(x)
         else:
@@ -159,45 +152,80 @@ def plot_2d(exprs, var, labels=None, line_styles=None, colors=None,
             if original_expr in _break_:
                 y_vals = _break_kinks(y_vals)
 
-            if swap_axes:
-                ax.plot(
-                    y_vals, x_vals_sample,
-                    label=label,
-                    linestyle=style,
-                    color=color,
-                    linewidth=linewidth
-                )
-            else:
-                ax.plot(
-                    x_vals_sample, y_vals,
-                    label=label,
-                    linestyle=style,
-                    color=color,
-                    linewidth=linewidth
-                )
+            # Assign to final variables
+            final_x_data = x_vals_sample
+            final_y_data = y_vals
+            
+            # Re-check style for markers (in case it wasn't caught above)
+            if style in marker_symbols:
+                marker = style
+                style = ''
+
+        # Execute Plot & Collect Data
+        if swap_axes:
+            ax.plot(
+                final_y_data, final_x_data,
+                label=label, linestyle=style, color=color,
+                marker=marker, linewidth=linewidth
+            )
+            #Collect data as it appears on screen (Swapped)
+            all_plot_x.append(final_y_data)
+            all_plot_y.append(final_x_data)
+        else:
+            ax.plot(
+                final_x_data, final_y_data,
+                label=label, linestyle=style, color=color,
+                marker=marker, linewidth=linewidth
+            )
+            #Collect data as it appears on screen (Standard)
+            all_plot_x.append(final_x_data)
+            all_plot_y.append(final_y_data)
+
+    #Calculate and apply 10% Padding
+    if all_plot_x and all_plot_y:
+        # Concatenate all arrays to find global min/max
+        # np.atleast_1d ensuresconstant functions don't break concatenation
+        flat_x = np.concatenate([np.atleast_1d(a) for a in all_plot_x])
+        flat_y = np.concatenate([np.atleast_1d(a) for a in all_plot_y])
+        
+        # Use nanmin/nanmax to ignore gaps from _break_kinks
+        min_x, max_x = np.nanmin(flat_x), np.nanmax(flat_x)
+        min_y, max_y = np.nanmin(flat_y), np.nanmax(flat_y)
+
+        # 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 the "Auto" default. They will be overwritten below
+        # if the user specifically provided xlim/ylim arguments.
+        ax.set_xlim(min_x - pad_x, max_x + pad_x)
+        ax.set_ylim(min_y - pad_y, max_y + pad_y)
 
     # Styling & Labels
-    ax.set_title(smart_label(title), fontsize=title_size)
+    if title is not None:
+        ax.set_title(smart_label(title), fontsize=title_size)
 
     if swap_axes:
-        ax.set_xlabel(smart_label(ylabel), fontsize=label_size)
-        ax.set_ylabel(smart_label(xlabel), fontsize=label_size)
+        if ylabel is not None:
+            ax.set_xlabel(smart_label(ylabel), fontsize=label_size)
+        if xlabel is not None:
+            ax.set_ylabel(smart_label(xlabel), fontsize=label_size)
     else:
-        ax.set_xlabel(smart_label(xlabel), fontsize=label_size)
-        ax.set_ylabel(smart_label(ylabel), fontsize=label_size)
+        if xlabel is not None:
+            ax.set_xlabel(smart_label(xlabel), fontsize=label_size)
+        if ylabel is not None:
+            ax.set_ylabel(smart_label(ylabel), fontsize=label_size)
 
     ax.tick_params(axis='both', labelsize=tick_size)
 
+    # Manual Limits Override (Manual > Auto Padding)
     if swap_axes:
-        if ylim:
-            ax.set_xlim(ylim)
-        if xlim:
-            ax.set_ylim(xlim)
+        if ylim: ax.set_xlim(ylim)
+        if xlim: ax.set_ylim(xlim)
     else:
-        if xlim:
-            ax.set_xlim(xlim)
-        if ylim:
-            ax.set_ylim(ylim)
+        if xlim: ax.set_xlim(xlim)
+        if ylim: ax.set_ylim(ylim)
 
     if scaling == 'constrained':
         ax.set_aspect('equal', adjustable='box')

{ibb_helper-0.4.8.dev15 → ibb_helper-0.4.8.dev17/src/IBB_Helper.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: IBB_Helper
-Version: 0.4.8.dev15
+Version: 0.4.8.dev17
 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