From b8b7f704e3fbded9dfb339bb160a44898f3618c5 Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 12 Apr 2025 22:44:00 +0200 Subject: [PATCH 1/2] Removed extension argument --- src/maxplotlib/canvas/canvas.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/maxplotlib/canvas/canvas.py b/src/maxplotlib/canvas/canvas.py index 7872f20..f4d6ca2 100644 --- a/src/maxplotlib/canvas/canvas.py +++ b/src/maxplotlib/canvas/canvas.py @@ -1,7 +1,7 @@ import matplotlib.pyplot as plt import plotly.graph_objects as go from plotly.subplots import make_subplots - +import os import maxplotlib.backends.matplotlib.utils as plt_utils import maxplotlib.subfigure.line_plot as lp import maxplotlib.subfigure.tikz_figure as tf @@ -120,11 +120,12 @@ def add_subplot(self, **kwargs): def savefig( self, filename, - extension="pdf", backend="matplotlib", layers=None, layer_by_layer=False, + verbose=False, ): + filename_no_extension, extension = os.path.splitext(filename) if backend == "matplotlib": if layer_by_layer: layers = [] @@ -133,17 +134,21 @@ def savefig( fig, axs = self.plot( show=False, backend="matplotlib", savefig=True, layers=layers ) - fig.savefig(f"{filename}_{layers}.{extension}") + _fn = f"{filename_no_extension}_{layers}.{extension}" + fig.savefig(_fn) + print(f"Saved {_fn}") else: if layers is None: layers = self.layers - full_filepath = f"{filename}.{extension}" + full_filepath = filename else: - full_filepath = f"{filename}_{layers}.{extension}" + full_filepath = f"{filename_no_extension}_{layers}.{extension}" fig, axs = self.plot( show=False, backend="matplotlib", savefig=True, layers=layers ) fig.savefig(full_filepath) + if verbose: + print(f"Saved {full_filepath}") def plot(self, backend="matplotlib", show=True, savefig=False, layers=None): if backend == "matplotlib": From 252c1b08ebe5220fa241b33389412a8a144b91c0 Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 12 Apr 2025 22:44:22 +0200 Subject: [PATCH 2/2] Formatting --- src/maxplotlib/canvas/canvas.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/maxplotlib/canvas/canvas.py b/src/maxplotlib/canvas/canvas.py index f4d6ca2..072c665 100644 --- a/src/maxplotlib/canvas/canvas.py +++ b/src/maxplotlib/canvas/canvas.py @@ -1,7 +1,9 @@ +import os + import matplotlib.pyplot as plt import plotly.graph_objects as go from plotly.subplots import make_subplots -import os + import maxplotlib.backends.matplotlib.utils as plt_utils import maxplotlib.subfigure.line_plot as lp import maxplotlib.subfigure.tikz_figure as tf