IBB-Helper 0.4.8.dev7__tar.gz → 0.4.8.dev8__tar.gz

{ibb_helper-0.4.8.dev7/src/IBB_Helper.egg-info → ibb_helper-0.4.8.dev8}/PKG-INFO

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

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

ibb_helper-0.4.8.dev8/src/IBB_Helper/extend_plot.py

@@ -0,0 +1,177 @@
+import matplotlib.pyplot as plt
+import plotly.graph_objects as go
+import copy
+import numpy as np
+
+def extend_plot(plot_list, dx=0, colors=None, labels=None, line_styles=None,
+                 show=True, grid=False, xlim=None, ylim=None, title=None, 
+                 xlabel=None, ylabel=None, width=800, height=700, 
+                 stitch=True): # <--- NEW PARAMETER
+    """
+    stitched: If True, appends plots horizontally. If False, overlays them using absolute coords.
+    """
+
+    if not plot_list:
+        raise ValueError("Plot list cannot be empty")
+    
+    first_plot = plot_list[0]
+    
+    # === MATPLOTLIB AXES HANDLING ===
+    if hasattr(first_plot, 'lines') or hasattr(first_plot, 'get_lines'):
+        fig, ax = plt.subplots()
+        agg_xlim = [float('inf'), float('-inf')]
+        
+        if isinstance(colors, str): colors = [colors] * len(plot_list)
+        prev_plot_max_x = None
+        
+        for i, p in enumerate(plot_list):
+            if hasattr(p, 'lines'): lines = p.lines
+            elif hasattr(p, 'get_lines'): lines = p.get_lines()
+            else: lines = []
+            
+            # --- 1. Calculate Shift ---
+            if stitch:
+                plot_min_x = float('inf')
+                plot_max_x = float('-inf')
+                for line in lines:
+                    x_orig, _ = line.get_data()
+                    if len(x_orig) > 0:
+                        plot_min_x = min(plot_min_x, np.min(x_orig))
+                        plot_max_x = max(plot_max_x, np.max(x_orig))
+                
+                if i == 0:
+                    x_shift = 0
+                else:
+                    x_shift = prev_plot_max_x - plot_min_x + dx
+            else:
+                # OVERLAY MODE: No shifting
+                x_shift = 0
+                plot_max_x = 0 # Dummy value
+
+            # --- 2. Plotting ---
+            for line_index, line in enumerate(lines):
+                x_orig, y_orig = line.get_data()
+                x = x_orig + x_shift # Apply shift (0 if stitch=False)
+                y = y_orig
+                
+                plot_color = colors[i] if colors and i < len(colors) else line.get_color()
+                
+                orig_linestyle = line.get_linestyle()
+                if orig_linestyle in ['None', '']: orig_linestyle = ''
+                plot_style = line_styles[i] if line_styles and i < len(line_styles) else orig_linestyle
+                
+                plot_marker = line.get_marker()
+                if plot_marker in ['None', '']: plot_marker = ''
+                
+                plot_label = labels[i] if labels and i < len(labels) and line_index == 0 else None
+                
+                ax.plot(x, y, color=plot_color, linestyle=plot_style, marker=plot_marker,
+                        markersize=line.get_markersize(), linewidth=line.get_linewidth(), label=plot_label)
+
+                if len(x) > 0:
+                    agg_xlim[0] = min(agg_xlim[0], np.min(x))
+                    agg_xlim[1] = max(agg_xlim[1], np.max(x))
+
+            if stitch and plot_max_x != float('-inf'):
+                prev_plot_max_x = plot_max_x + x_shift
+
+        # Final Config
+        final_xlim = xlim if xlim else agg_xlim
+        final_ylim = ylim if ylim is not None else (first_plot.get_ylim() if hasattr(first_plot, 'get_ylim') else None)
+
+        ax.set_xlim(final_xlim)
+        if final_ylim: ax.set_ylim(final_ylim)
+        
+        ax.set_title(title if title else (first_plot.get_title() if hasattr(first_plot, 'get_title') else ''))
+        ax.set_xlabel(xlabel if xlabel else (first_plot.get_xlabel() if hasattr(first_plot, 'get_xlabel') else ''))
+        ax.set_ylabel(ylabel if ylabel else (first_plot.get_ylabel() if hasattr(first_plot, 'get_ylabel') else ''))
+        
+        if grid: ax.grid(True)
+        if labels: ax.legend()
+        if show: plt.show()
+        else: plt.close()
+        return ax
+    
+    # === PLOTLY FIGURE HANDLING (YOUR CASE) ===
+    elif hasattr(first_plot, 'data'):
+        combined_fig = go.Figure()
+        prev_plot_max_x = None
+        layout_defaults = first_plot.layout
+
+        for i, fig in enumerate(plot_list):
+            
+            # --- 1. Calculate Shift ---
+            if stitch:
+                plot_min_x = float('inf')
+                plot_max_x = float('-inf')
+                
+                # Check for Surface (z) or Scatter (x,y)
+                for trace in fig.data:
+                    # Prefer explicitly defined X data
+                    if hasattr(trace, 'x') and trace.x is not None:
+                        x_data = np.array(trace.x)
+                        if x_data.size > 0:
+                            plot_min_x = min(plot_min_x, np.min(x_data))
+                            plot_max_x = max(plot_max_x, np.max(x_data))
+                    # Fallback for Surface plots without explicit X (usually 0 to N)
+                    elif hasattr(trace, 'z') and trace.z is not None:
+                         # Assume local coordinates 0..shape[1] if x not provided
+                         # But usually ibb.plot_3d provides x
+                         pass 
+
+                if i == 0:
+                    x_shift = 0
+                else:
+                    x_shift = prev_plot_max_x - plot_min_x + dx
+            else:
+                # OVERLAY MODE: Disable shift entirely
+                x_shift = 0
+                plot_max_x = 0 # Dummy
+
+            # --- 2. Add Traces ---
+            for trace in fig.data:
+                new_trace = copy.deepcopy(trace)
+                
+                # Apply shift if X exists
+                if hasattr(trace, 'x') and trace.x is not None:
+                    x_data = np.array(trace.x)
+                    new_trace.x = x_data + x_shift
+                        
+                # Style overrides
+                if colors and i < len(colors):
+                    if hasattr(new_trace, 'line'): new_trace.line.color = colors[i]
+                    elif hasattr(new_trace, 'marker'): new_trace.marker.color = colors[i]
+                if line_styles and i < len(line_styles):
+                    if hasattr(new_trace, 'line'): new_trace.line.dash = line_styles[i]
+                if labels and i < len(labels):
+                    new_trace.name = labels[i]
+                
+                combined_fig.add_trace(new_trace)
+            
+            if stitch and plot_max_x != float('-inf'):
+                prev_plot_max_x = plot_max_x + x_shift
+
+        # Final Layout
+        combined_fig.update_layout(
+            title=title if title else (layout_defaults.title.text if layout_defaults.title else ''),
+            xaxis_title=xlabel if xlabel else (layout_defaults.xaxis.title.text if layout_defaults.xaxis.title else ''),
+            yaxis_title=ylabel if ylabel else (layout_defaults.yaxis.title.text if layout_defaults.yaxis.title else '')
+        )
+        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)),
+            ),
+            margin=dict(l=10, r=10, t=50, b=10),
+            legend=dict(x=0, y=1),
+        )
+        
+        if show: combined_fig.show()
+    
+        return combined_fig
+
+    else:
+        raise TypeError("Unknown plot object type passed to extend_plots.")

{ibb_helper-0.4.8.dev7 → ibb_helper-0.4.8.dev8/src/IBB_Helper.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: IBB_Helper
-Version: 0.4.8.dev7
+Version: 0.4.8.dev8
 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.dev7/src/IBB_Helper/extend_plot.py

@@ -1,240 +0,0 @@
-import matplotlib.pyplot as plt
-import plotly.graph_objects as go
-import copy
-import numpy as np
-
-def extend_plot(plot_list, dx=0, colors=None, labels=None, line_styles=None,
-                 show=True, grid=False, xlim=None, ylim=None, title=None, 
-                 xlabel=None, ylabel=None, width=800, height=700):
-    """
-    Stitches multiple plots end-to-end into a single continuous plot with optional horizontal offset.
-
-    Parameters:
-        plot_list  : List of matplotlib Axes or plotly Figure objects to be stitched together
-        dx         : Horizontal offset between consecutive plots (dx=0 no gap, dx>0 gap, dx<0 overlap) (default=0)
-        colors     : Single color or list of colors for each plot (default=None)
-        labels     : Labels for each stitched segment (default=None)
-        line_styles: Line styles for each plot segment (default=None)
-        show       : Whether to display the resulting plot (default=True)
-        grid       : Whether to display a grid (default=False)
-        xlim       : X-axis limits as (min, max) (default=None)
-        ylim       : Y-axis limits as (min, max) (default=None)
-        title      : Plot title (default=None)
-        xlabel     : X-axis label (default=None)
-        ylabel     : Y-axis label (default=None)
-
-    Returns:
-        matplotlib Axes or plotly.graph_objects.Figure
-            The stitched plot object, matching the input plot type
-    """
-
-
-    if not plot_list:
-        raise ValueError("Plot list cannot be empty")
-    
-    first_plot = plot_list[0]
-    
-    # === MATPLOTLIB AXES HANDLING (PRIMARY BRANCH) ===
-    if hasattr(first_plot, 'lines') or hasattr(first_plot, 'get_lines'):
-        fig, ax = plt.subplots()
-        
-        # Aggregation variables (for defaults if arguments are None)
-        agg_xlim = [float('inf'), float('-inf')]
-        
-        # Use a single color if provided, or prepare for individual colors
-        if isinstance(colors, str):
-            colors = [colors] * len(plot_list)
-        
-        # Track the ending x position of the previous plot
-        prev_plot_max_x = None
-        
-        for i, p in enumerate(plot_list):
-            
-            # Retrieve lines from Axes or Figure
-            if hasattr(p, 'lines'):
-                lines = p.lines
-            elif hasattr(p, 'get_lines'):
-                lines = p.get_lines()
-            else:
-                lines = []
-            
-            # First pass: find min and max x for this plot
-            plot_min_x = float('inf')
-            plot_max_x = float('-inf')
-            
-            for line in lines:
-                x_orig, y_orig = line.get_data()
-                if len(x_orig) > 0:
-                    plot_min_x = min(plot_min_x, np.min(x_orig))
-                    plot_max_x = max(plot_max_x, np.max(x_orig))
-            
-            # Calculate shift for this plot
-            if i == 0:
-                # First plot: no shift
-                x_shift = 0
-            else:
-                # Subsequent plots: align min_x with prev_max_x + dx
-                x_shift = prev_plot_max_x - plot_min_x + dx
-            
-            # --- Plotting ---
-            for line_index, line in enumerate(lines):
-                x_orig, y_orig = line.get_data()
-                
-                # Apply shift
-                x = x_orig + x_shift
-                y = y_orig
-                
-                # Default style transfer from source line
-                plot_color = colors[i] if colors and i < len(colors) else line.get_color()
-                
-                # Get linestyle - handle marker-only plots
-                orig_linestyle = line.get_linestyle()
-                if orig_linestyle in ['None', '']:
-                    orig_linestyle = ''
-                plot_style = line_styles[i] if line_styles and i < len(line_styles) else orig_linestyle
-                
-                # Get marker - normalize 'None' string to empty
-                plot_marker = line.get_marker()
-                if plot_marker in ['None', '']:
-                    plot_marker = ''
-
-                # Label transfer (only the first line of the source plot gets the label)
-                plot_label = labels[i] if labels and i < len(labels) and line_index == 0 else None
-                
-                # Plot the segment
-                ax.plot(x, y, 
-                        color=plot_color, 
-                        linestyle=plot_style, 
-                        marker=plot_marker,
-                        markersize=line.get_markersize(),
-                        linewidth=line.get_linewidth(),
-                        label=plot_label)
-
-                # Update global xlim
-                if len(x) > 0:
-                    agg_xlim[0] = min(agg_xlim[0], np.min(x))
-                    agg_xlim[1] = max(agg_xlim[1], np.max(x))
-
-            # Update previous plot's max x for next iteration
-            if plot_max_x != float('-inf'):
-                prev_plot_max_x = plot_max_x + x_shift
-
-
-        # --- Final Matplotlib Configuration ---
-        
-        # Apply limits (prioritize argument, then aggregated data, then source plot limits)
-        final_xlim = xlim if xlim else agg_xlim
-        
-        if ylim is None and hasattr(first_plot, 'get_ylim'):
-            final_ylim = first_plot.get_ylim()
-        else:
-            final_ylim = ylim
-
-        ax.set_xlim(final_xlim)
-        if final_ylim:
-             ax.set_ylim(final_ylim)
-
-        # Apply labels/title (prioritize argument, then source plot labels)
-        ax.set_title(title if title else (first_plot.get_title() if hasattr(first_plot, 'get_title') else ''))
-        ax.set_xlabel(xlabel if xlabel else (first_plot.get_xlabel() if hasattr(first_plot, 'get_xlabel') else ''))
-        ax.set_ylabel(ylabel if ylabel else (first_plot.get_ylabel() if hasattr(first_plot, 'get_ylabel') else ''))
-        
-        if grid:
-            ax.grid(True)
-        if labels: # Only show legend if we managed labels
-            ax.legend()
-            
-        if show:
-            plt.show()
-        else:
-            plt.close()
-
-        return ax
-    
-    # === PLOTLY FIGURE HANDLING (SECONDARY BRANCH) ===
-    elif hasattr(first_plot, 'data'):
-        # Plotly branch
-        combined_fig = go.Figure()
-        prev_plot_max_x = None
-
-        # Retrieve layout defaults from the first figure
-        layout_defaults = first_plot.layout
-
-        for i, fig in enumerate(plot_list):
-            # First pass: find min and max x for this plot
-            plot_min_x = float('inf')
-            plot_max_x = float('-inf')
-            
-            for trace in fig.data:
-
-                if hasattr(trace, 'x') and trace.x is not None:
-                    x_data = np.array(trace.x)
-                    if len(x_data) > 0:
-                        plot_min_x = min(plot_min_x, np.min(x_data))
-                        plot_max_x = max(plot_max_x, np.max(x_data))
-            
-            # Calculate shift for this plot
-            if i==0:
-                x_shift = 0
-            else:
-                x_shift = prev_plot_max_x - plot_min_x + dx
-
-            
-            # Second pass: apply shift and add traces
-            for trace in fig.data:
-                # Use deepcopy for safe cloning
-                new_trace = copy.deepcopy(trace)
-                
-                # Apply shift
-                if hasattr(trace, 'x') and trace.x is not None:
-                    x_data = np.array(trace.x)
-                    new_trace.x = x_data + x_shift
-                        
-                # Apply overrides/defaults
-                if colors and i < len(colors):
-                    if hasattr(new_trace, 'line'):
-                        new_trace.line.color = colors[i]
-                    elif hasattr(new_trace, 'marker'):
-                        new_trace.marker.color = colors[i]
-
-                if line_styles and i < len(line_styles):
-                    if hasattr(new_trace, 'line'):
-                        new_trace.line.dash = line_styles[i]
-                
-                if labels and i < len(labels):
-                    new_trace.name = labels[i]
-                
-                combined_fig.add_trace(new_trace)
-            
-            # Update previous plot's max x for next iteration
-            if plot_max_x != float('-inf'):
-                prev_plot_max_x = plot_max_x + x_shift
-
-        # Final Layout Configuration (prioritize arguments over defaults)
-        combined_fig.update_layout(
-            title=title if title else (layout_defaults.title.text if layout_defaults.title else ''),
-            xaxis_title=xlabel if xlabel else (layout_defaults.xaxis.title.text if layout_defaults.xaxis.title else ''),
-            yaxis_title=ylabel if ylabel else (layout_defaults.yaxis.title.text if layout_defaults.yaxis.title else '')
-        )
-        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)),
-            ),
-            margin=dict(l=10, r=10, t=50, b=10),
-            legend=dict(x=0, y=1),
-        )
-        
-        if show:
-            combined_fig.show()
-    
-        return combined_fig
-
-    else:
-        raise TypeError("Unknown plot object type passed to extend_plots.")