xslope 0.1.10__py3-none-any.whl → 0.1.11__py3-none-any.whl

xslope/_version.py

@@ -1,4 +1,4 @@
 __all__ = ["__version__"]
-__version__ = "0.1.10"
+__version__ = "0.1.11"
 
 

xslope/plot.py

@@ -717,15 +717,14 @@ def plot_reinforcement_lines(ax, slope_data):
                 tension_points_plotted = True
 
 
-def plot_inputs(slope_data, title="Slope Geometry and Inputs", width=12, height=6, mat_table=True):
+def plot_inputs(slope_data, title="Slope Geometry and Inputs", figsize=(12, 6), mat_table=True, save_png=False, dpi=300):
     """
     Creates a plot showing the slope geometry and input parameters.
 
     Parameters:
         slope_data: Dictionary containing plot data
         title: Title for the plot
-        width: Width of the plot in inches
-        height: Height of the plot in inches
+        figsize: Tuple of (width, height) in inches for the plot
         mat_table: Controls material table display. Can be:
             - True: Auto-position material table to avoid overlaps
             - False: Don't show material table
@@ -736,7 +735,7 @@ def plot_inputs(slope_data, title="Slope Geometry and Inputs", width=12, height=
     Returns:
         None
     """
-    fig, ax = plt.subplots(figsize=(width, height))
+    fig, ax = plt.subplots(figsize=figsize)
 
     # Plot contents
     plot_profile_lines(ax, slope_data['profile_lines'])
@@ -803,11 +802,16 @@ def plot_inputs(slope_data, title="Slope Geometry and Inputs", width=12, height=
     ax.set_title(title)
 
     plt.tight_layout()
+    
+    if save_png:
+        filename = 'plot_' + title.lower().replace(' ', '_').replace(':', '').replace(',', '') + '.png'
+        plt.savefig(filename, dpi=dpi, bbox_inches='tight')
+    
     plt.show()
 
 # ========== Main Plotting Function =========
 
-def plot_solution(slope_data, slice_df, failure_surface, results, width=12, height=7, slice_numbers=False):
+def plot_solution(slope_data, slice_df, failure_surface, results, figsize=(12, 7), slice_numbers=False, save_png=False, dpi=300):
     """
     Plots the full solution including slices, numbers, thrust line, and base stresses.
 
@@ -816,13 +820,12 @@ def plot_solution(slope_data, slice_df, failure_surface, results, width=12, heig
         slice_df: DataFrame containing slice data
         failure_surface: Failure surface geometry
         results: Solution results
-        width: Width of the plot in inches
-        height: Height of the plot in inches
+        figsize: Tuple of (width, height) in inches for the plot
 
     Returns:
         None
     """
-    fig, ax = plt.subplots(figsize=(width, height))
+    fig, ax = plt.subplots(figsize=figsize)
     ax.set_xlabel("x")
     ax.set_ylabel("y")
     ax.grid(False)
@@ -896,6 +899,11 @@ def plot_solution(slope_data, slice_df, failure_surface, results, width=12, heig
     ax.set_ylim(ymin, ymax)
 
     plt.tight_layout()
+    
+    if save_png:
+        filename = 'plot_' + title.lower().replace(' ', '_').replace(':', '').replace(',', '').replace('°', 'deg') + '.png'
+        plt.savefig(filename, dpi=dpi, bbox_inches='tight')
+    
     plt.show()
 
 # ========== Functions for Search Results =========
@@ -956,7 +964,7 @@ def plot_search_path(ax, search_path):
         ax.arrow(start['x'], start['y'], dx, dy,
                  head_width=1, head_length=2, fc='green', ec='green', length_includes_head=True)
 
-def plot_circular_search_results(slope_data, fs_cache, search_path=None, highlight_fs=True, width=12, height=7):
+def plot_circular_search_results(slope_data, fs_cache, search_path=None, highlight_fs=True, figsize=(12, 7), save_png=False, dpi=300):
     """
     Creates a plot showing the results of a circular failure surface search.
 
@@ -965,13 +973,12 @@ def plot_circular_search_results(slope_data, fs_cache, search_path=None, highlig
         fs_cache: List of dictionaries containing failure surface data and FS values
         search_path: List of dictionaries containing search path coordinates
         highlight_fs: Boolean indicating whether to highlight the critical failure surface
-        width: Width of the plot in inches
-        height: Height of the plot in inches
+        figsize: Tuple of (width, height) in inches for the plot
 
     Returns:
         None
     """
-    fig, ax = plt.subplots(figsize=(width, height))
+    fig, ax = plt.subplots(figsize=figsize)
 
     plot_profile_lines(ax, slope_data['profile_lines'])
     plot_max_depth(ax, slope_data['profile_lines'], slope_data['max_depth'])
@@ -995,9 +1002,14 @@ def plot_circular_search_results(slope_data, fs_cache, search_path=None, highlig
         ax.set_title(f"Critical Factor of Safety = {critical_fs:.3f}")
 
     plt.tight_layout()
+    
+    if save_png:
+        filename = 'plot_circular_search_results.png'
+        plt.savefig(filename, dpi=dpi, bbox_inches='tight')
+    
     plt.show()
 
-def plot_noncircular_search_results(slope_data, fs_cache, search_path=None, highlight_fs=True, width=12, height=7):
+def plot_noncircular_search_results(slope_data, fs_cache, search_path=None, highlight_fs=True, figsize=(12, 7), save_png=False, dpi=300):
     """
     Creates a plot showing the results of a non-circular failure surface search.
 
@@ -1006,13 +1018,12 @@ def plot_noncircular_search_results(slope_data, fs_cache, search_path=None, high
         fs_cache: List of dictionaries containing failure surface data and FS values
         search_path: List of dictionaries containing search path coordinates
         highlight_fs: Boolean indicating whether to highlight the critical failure surface
-        width: Width of the plot in inches
-        height: Height of the plot in inches
+        figsize: Tuple of (width, height) in inches for the plot
 
     Returns:
         None
     """
-    fig, ax = plt.subplots(figsize=(width, height))
+    fig, ax = plt.subplots(figsize=figsize)
 
     # Plot basic profile elements
     plot_profile_lines(ax, slope_data['profile_lines'])
@@ -1060,22 +1071,26 @@ def plot_noncircular_search_results(slope_data, fs_cache, search_path=None, high
         ax.set_title(f"Critical Factor of Safety = {critical_fs:.3f}")
 
     plt.tight_layout()
+    
+    if save_png:
+        filename = 'plot_noncircular_search_results.png'
+        plt.savefig(filename, dpi=dpi, bbox_inches='tight')
+    
     plt.show()
 
-def plot_reliability_results(slope_data, reliability_data, width=12, height=7):
+def plot_reliability_results(slope_data, reliability_data, figsize=(12, 7), save_png=False, dpi=300):
     """
     Creates a plot showing the results of reliability analysis.
     
     Parameters:
         slope_data: Dictionary containing plot data
         reliability_data: Dictionary containing reliability analysis results
-        width: Width of the plot in inches
-        height: Height of the plot in inches
+        figsize: Tuple of (width, height) in inches for the plot
     
     Returns:
         None
     """
-    fig, ax = plt.subplots(figsize=(width, height))
+    fig, ax = plt.subplots(figsize=figsize)
 
     # Plot basic slope elements (same as other search functions)
     plot_profile_lines(ax, slope_data['profile_lines'])
@@ -1143,9 +1158,14 @@ def plot_reliability_results(slope_data, reliability_data, width=12, height=7):
                 f"Reliability = {reliability*100:.2f}%, $P_f$ = {prob_failure*100:.2f}%")
 
     plt.tight_layout()
+    
+    if save_png:
+        filename = 'plot_reliability_results.png'
+        plt.savefig(filename, dpi=dpi, bbox_inches='tight')
+    
     plt.show()
 
-def plot_mesh(mesh, materials=None, figsize=(14, 6), pad_frac=0.05, show_nodes=True, label_elements=False, label_nodes=False):
+def plot_mesh(mesh, materials=None, figsize=(14, 6), pad_frac=0.05, show_nodes=True, label_elements=False, label_nodes=False, save_png=False, dpi=300):
     """
     Plot the finite element mesh with material regions.
     
@@ -1332,10 +1352,15 @@ def plot_mesh(mesh, materials=None, figsize=(14, 6), pad_frac=0.05, show_nodes=T
     ax.set_ylim(y_min - y_pad, y_max + y_pad)
 
     plt.tight_layout()
+    
+    if save_png:
+        filename = 'plot_mesh.png'
+        plt.savefig(filename, dpi=dpi, bbox_inches='tight')
+    
     plt.show()
 
 
-def plot_polygons(polygons, title="Material Zone Polygons"):
+def plot_polygons(polygons, title="Material Zone Polygons", save_png=False, dpi=300):
     """
     Plot all material zone polygons in a single figure.
     
@@ -1358,10 +1383,15 @@ def plot_polygons(polygons, title="Material Zone Polygons"):
     ax.grid(True, alpha=0.3)
     ax.set_aspect('equal')
     plt.tight_layout()
+    
+    if save_png:
+        filename = 'plot_' + title.lower().replace(' ', '_').replace(':', '').replace(',', '') + '.png'
+        plt.savefig(filename, dpi=dpi, bbox_inches='tight')
+    
     plt.show()
 
 
-def plot_polygons_separately(polygons, title_prefix='Material Zone'):
+def plot_polygons_separately(polygons, title_prefix='Material Zone', save_png=False, dpi=300):
     """
     Plot each polygon in a separate matplotlib frame (subplot), with vertices as round dots.
     
@@ -1387,6 +1417,11 @@ def plot_polygons_separately(polygons, title_prefix='Material Zone'):
         ax.set_aspect('equal')
         ax.legend()
     plt.tight_layout()
+    
+    if save_png:
+        filename = 'plot_' + title_prefix.lower().replace(' ', '_').replace(':', '').replace(',', '') + '_separate.png'
+        plt.savefig(filename, dpi=dpi, bbox_inches='tight')
+    
     plt.show()
 
 

xslope/plot_fem.py

@@ -23,7 +23,7 @@ from matplotlib.patches import Polygon
 
 
 def plot_fem_data(fem_data, figsize=(14, 6), show_nodes=False, show_bc=True, material_table=False, 
-                  label_elements=False, label_nodes=False, alpha=0.4, bc_symbol_size=0.03):
+                  label_elements=False, label_nodes=False, alpha=0.4, bc_symbol_size=0.03, save_png=False, dpi=300):
     """
     Plots a FEM mesh colored by material zone with boundary conditions displayed.
     
@@ -251,6 +251,11 @@ def plot_fem_data(fem_data, figsize=(14, 6), show_nodes=False, show_bc=True, mat
     
     ax.set_title(title)
     plt.tight_layout()
+    
+    if save_png:
+        filename = 'plot_' + title.lower().replace(' ', '_').replace(':', '').replace(',', '').replace('(', '').replace(')', '') + '.png'
+        plt.savefig(filename, dpi=dpi, bbox_inches='tight')
+    
     plt.show()
 
 
@@ -427,7 +432,7 @@ def _plot_fem_material_table(ax, fem_data, xloc=0.6, yloc=0.7):
 def plot_fem_results(fem_data, solution, plot_type='displacement', deform_scale=None, 
                     show_mesh=True, show_reinforcement=True, figsize=(12, 8), label_elements=False,
                     plot_nodes=False, plot_elements=False, plot_boundary=True, displacement_tolerance=0.5,
-                    scale_vectors=False):
+                    scale_vectors=False, save_png=False, dpi=300):
     """
     Plot FEM results with various visualization options.
     
@@ -540,6 +545,11 @@ def plot_fem_results(fem_data, solution, plot_type='displacement', deform_scale=
         ax.set_aspect('equal')
     
     plt.tight_layout()
+    
+    if save_png:
+        filename = f'plot_fem_results_{plot_type.lower().replace(",", "_").replace(" ", "_")}.png'
+        plt.savefig(filename, dpi=dpi, bbox_inches='tight')
+    
     plt.show()
     
     # Return appropriate values
@@ -1071,7 +1081,7 @@ def plot_reinforcement_forces(ax, fem_data, solution):
                 ax.add_collection(lc_failed)
 
 
-def plot_reinforcement_force_profiles(fem_data, solution, figsize=(12, 8)):
+def plot_reinforcement_force_profiles(fem_data, solution, figsize=(12, 8), save_png=False, dpi=300):
     """
     Plot force profiles along each reinforcement line.
     """
@@ -1170,10 +1180,15 @@ def plot_reinforcement_force_profiles(fem_data, solution, figsize=(12, 8)):
         axes[i].set_visible(False)
     
     plt.tight_layout()
+    
+    if save_png:
+        filename = 'plot_reinforcement_force_profiles.png'
+        plt.savefig(filename, dpi=dpi, bbox_inches='tight')
+    
     return fig, axes
 
 
-def plot_ssrm_convergence(ssrm_solution, figsize=(10, 6)):
+def plot_ssrm_convergence(ssrm_solution, figsize=(10, 6), save_png=False, dpi=300):
     """
     Plot SSRM convergence history.
     """
@@ -1214,6 +1229,11 @@ def plot_ssrm_convergence(ssrm_solution, figsize=(10, 6)):
     ax2.grid(True, alpha=0.3)
     
     plt.tight_layout()
+    
+    if save_png:
+        filename = 'plot_ssrm_convergence.png'
+        plt.savefig(filename, dpi=dpi, bbox_inches='tight')
+    
     return fig, (ax1, ax2)
 
 

xslope/plot_seep.py

@@ -4,7 +4,7 @@ from matplotlib.ticker import MaxNLocator
 import numpy as np
 
 
-def plot_seep_data(seep_data, figsize=(14, 6), show_nodes=False, show_bc=False, material_table=False, label_elements=False, label_nodes=False, alpha=0.4):
+def plot_seep_data(seep_data, figsize=(14, 6), show_nodes=False, show_bc=False, material_table=False, label_elements=False, label_nodes=False, alpha=0.4, save_png=False, dpi=300):
     """
     Plots a mesh colored by material zone.
     Supports both triangular and quadrilateral elements.
@@ -214,10 +214,15 @@ def plot_seep_data(seep_data, figsize=(14, 6), show_nodes=False, show_bc=False,
     ax.set_title(title)
     # plt.subplots_adjust(bottom=0.2)  # Add vertical cushion
     plt.tight_layout()
+    
+    if save_png:
+        filename = 'plot_' + title.lower().replace(' ', '_').replace(':', '').replace(',', '').replace('(', '').replace(')', '') + '.png'
+        plt.savefig(filename, dpi=dpi, bbox_inches='tight')
+    
     plt.show()
 
 
-def plot_seep_solution(seep_data, solution, figsize=(14, 6), levels=20, base_mat=1, fill_contours=True, phreatic=True, alpha=0.4, pad_frac=0.05, mesh=True, variable="head", vectors=False, vector_scale=0.05, flowlines=True):
+def plot_seep_solution(seep_data, solution, figsize=(14, 6), levels=20, base_mat=1, fill_contours=True, phreatic=True, alpha=0.4, pad_frac=0.05, mesh=True, variable="head", vectors=False, vector_scale=0.05, flowlines=True, save_png=False, dpi=300):
     """
     Plot seepage analysis results including head contours, flowlines, and phreatic surface.
     
@@ -579,6 +584,11 @@ def plot_seep_solution(seep_data, solution, figsize=(14, 6), levels=20, base_mat
     # Remove tight_layout and subplots_adjust for best constrained layout
     # plt.tight_layout()
     # plt.subplots_adjust(top=0.78)
+    
+    if save_png:
+        filename = 'plot_' + title.lower().replace(' ', '_').replace(':', '').replace(',', '').replace('—', '').replace('(', '').replace(')', '') + '.png'
+        plt.savefig(filename, dpi=dpi, bbox_inches='tight')
+    
     plt.show()
 
 

{xslope-0.1.10.dist-info → xslope-0.1.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: xslope
-Version: 0.1.10
+Version: 0.1.11
 Summary: Slope stability analysis (limit equilibrium and FEM) in Python.
 Author: Norman L. Jones
 Project-URL: Homepage, https://github.com/njones61/xslope

{xslope-0.1.10.dist-info → xslope-0.1.11.dist-info}/RECORD

@@ -1,21 +1,21 @@
 xslope/__init__.py,sha256=ZygAIkX6Nbjag1czWdQa-yP-GM1mBE_9ss21Xh__JFc,34
-xslope/_version.py,sha256=DfeCqc-dgdypmy58WabEWmjpVnqKiY50hCCECclU5_I,51
+xslope/_version.py,sha256=EuS8ourwvf_O1n08GOG1eXlKDKt7dguYQ663MaapOxQ,51
 xslope/advanced.py,sha256=35k_ekQJ-mQJ1wHnoIHMc5TVfYn-2EPCJyHz827Cpbc,18281
 xslope/fem.py,sha256=K4_Pq06HFBpRkN3JwtXF2zw_AMnCkXvj0ggrlRFMQQw,115731
 xslope/fileio.py,sha256=DnFUYmJedjKXOuVPZUfTRxGfTjiIz8KyHkRDK7ddQg0,28840
 xslope/global_config.py,sha256=Cj8mbPidIuj5Ty-5cZM-c8H12kNvyHsk5_ofNGez-3M,2253
 xslope/mesh copy.py,sha256=qtMH1yKFgHM4kNuIrxco7tKV86R3Dbf7Nok5j6MtlLY,131013
 xslope/mesh.py,sha256=qtMH1yKFgHM4kNuIrxco7tKV86R3Dbf7Nok5j6MtlLY,131013
-xslope/plot.py,sha256=OW2eZyrT5h3Y95qjNFgGMnC_Am7TurUB2S7b_BgnO6E,54641
-xslope/plot_fem.py,sha256=al9zjqjxWKooLl4SAds77Zz-j9cjD4TJGygyU9QK5vo,71111
-xslope/plot_seep.py,sha256=Fs8S-0_7bnNJZlj7SnM0ij1mFDZWlNjXGnP6iMDiplY,34647
+xslope/plot.py,sha256=MexmrZJ1CVSnG0ZN3lNz67DyQdDTdO6hLlbTTBYz4Zw,56016
+xslope/plot_fem.py,sha256=WiFFt9cUIRwX1uCiJrPaMtmhz5LfhZnzNVJwhp0fMP8,71902
+xslope/plot_seep.py,sha256=ep9spY2DiMvOJELccBAj77p9HTnBRgoyqQ_brQphWHw,35166
 xslope/search.py,sha256=dvgKn8JCobuvyD7fClF5lcbeHESCvV8gZ_U_lQnYRok,16867
 xslope/seep.py,sha256=tLvme-eL0R5SGGTH2Y6z4Rrfe36UuSWWLlL_1kglee8,93030
 xslope/slice.py,sha256=QHawTk7XPLziHoN_ZS0jrEPYKlhPT62caUc_q-_EGjs,45236
 xslope/solve.py,sha256=u_sBjtsj1EeZtgSEmo80tEWoRrrMgvRjmi6P0ODO1lU,48645
-xslope-0.1.10.dist-info/LICENSE,sha256=NU5J88FUai_4Ixu5DqOQukA-gcXAyX8pXLhIg8OB3AM,10969
-xslope-0.1.10.dist-info/METADATA,sha256=-iSQGoUnwIJgNg0sZizK2iZk6JRVarH5mDMpUxsFSgI,2028
-xslope-0.1.10.dist-info/NOTICE,sha256=E-sbN0MWwvJC27Z-2_G4VUHIx4IsfvLDTmOstvY4-OQ,530
-xslope-0.1.10.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-xslope-0.1.10.dist-info/top_level.txt,sha256=5qHbWJ1R2pdTNIainFyrVtFk8R1tRcwIn0kzTuwuV1Q,7
-xslope-0.1.10.dist-info/RECORD,,
+xslope-0.1.11.dist-info/LICENSE,sha256=NU5J88FUai_4Ixu5DqOQukA-gcXAyX8pXLhIg8OB3AM,10969
+xslope-0.1.11.dist-info/METADATA,sha256=ZbDxeZ2g25EwvsZDdbQIhwRB5eOu-LSpeFYmcFn0nUk,2028
+xslope-0.1.11.dist-info/NOTICE,sha256=E-sbN0MWwvJC27Z-2_G4VUHIx4IsfvLDTmOstvY4-OQ,530
+xslope-0.1.11.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+xslope-0.1.11.dist-info/top_level.txt,sha256=5qHbWJ1R2pdTNIainFyrVtFk8R1tRcwIn0kzTuwuV1Q,7
+xslope-0.1.11.dist-info/RECORD,,