Formatted with isort and black

Author: max-models

src/maxplotlib/backends/matplotlib/utils.py

@@ -13,6 +13,7 @@
 from mpl_toolkits.mplot3d import Axes3D
 from mpl_toolkits.mplot3d.art3d import Line3DCollection, Poly3DCollection
 
+
 def setup_tex_fonts(fontsize=14):
     """
     Sets up LaTeX fonts for plotting.
@@ -30,6 +31,7 @@ def setup_tex_fonts(fontsize=14):
     plt.rcParams.update(tex_fonts)
     return tex_fonts
 
+
 def setup_plotstyle(
     tex_fonts=None,
     axes_grid=False,
@@ -51,6 +53,7 @@ def setup_plotstyle(
     plt.rcParams["xtick.major.pad"] = 8
     plt.rcParams["ytick.major.pad"] = 8
 
+
 def set_size(width, fraction=1, ratio="golden"):
     """
     Sets figure dimensions to avoid scaling in LaTeX.
@@ -63,7 +66,7 @@ def set_size(width, fraction=1, ratio="golden"):
         width_pt = width
 
     fig_width_pt = width_pt * fraction
-    #inches_per_pt = 1 / 72.27
+    # inches_per_pt = 1 / 72.27
 
     # Calculate the figure height based on the desired ratio
     if ratio == "golden":
@@ -78,6 +81,7 @@ def set_size(width, fraction=1, ratio="golden"):
     fig_dim = (fig_width_pt, fig_height_pt)
     return fig_dim
 
+
 def create_lineplot(
     nx_subplots=1,
     ny_subplots=1,
@@ -106,4 +110,4 @@ def create_lineplot(
         constrained_layout=False,
         gridspec_kw=gridspec_kw,
     )
-    return fig, axs
+    return fig, axs

src/maxplotlib/canvas/canvas.py

@@ -1,9 +1,12 @@
 import matplotlib.pyplot as plt
-import maxplotlib.subfigure.line_plot as lp
-import maxplotlib.subfigure.tikz_figure as tf
-import maxplotlib.backends.matplotlib.utils as plt_utils
 import plotly.graph_objects as go
 from plotly.subplots import make_subplots
+
+import maxplotlib.backends.matplotlib.utils as plt_utils
+import maxplotlib.subfigure.line_plot as lp
+import maxplotlib.subfigure.tikz_figure as tf
+
+
 class Canvas:
     def __init__(self, **kwargs):
         """
@@ -15,27 +18,27 @@ def __init__(self, **kwargs):
         figsize (tuple): Figure size.
         """
 
-        #nrows=1, ncols=1, caption=None, description=None, label=None, figsize=None
-        self._nrows = kwargs.get('nrows', 1)
-        self._ncols = kwargs.get('ncols', 1)
-        self._figsize = kwargs.get('figsize', None)
-        self._caption = kwargs.get('caption', None)
-        self._description = kwargs.get('description', None)
-        self._label = kwargs.get('label', None)
-
-        self._dpi=kwargs.get('dpi', 300)
-        self._width=kwargs.get('width', 426.79135)
-        self._ratio=kwargs.get('ratio', "golden")
-        self._gridspec_kw = kwargs.get('gridspec_kw', {"wspace": 0.08, "hspace": 0.1})
-        
+        # nrows=1, ncols=1, caption=None, description=None, label=None, figsize=None
+        self._nrows = kwargs.get("nrows", 1)
+        self._ncols = kwargs.get("ncols", 1)
+        self._figsize = kwargs.get("figsize", None)
+        self._caption = kwargs.get("caption", None)
+        self._description = kwargs.get("description", None)
+        self._label = kwargs.get("label", None)
+
+        self._dpi = kwargs.get("dpi", 300)
+        self._width = kwargs.get("width", 426.79135)
+        self._ratio = kwargs.get("ratio", "golden")
+        self._gridspec_kw = kwargs.get("gridspec_kw", {"wspace": 0.08, "hspace": 0.1})
+
         # Dictionary to store lines for each subplot
         # Key: (row, col), Value: list of lines with their data and kwargs
         self.subplots = {}
         self._num_subplots = 0
 
         self._subplot_matrix = [[None] * self.ncols for _ in range(self.nrows)]
-    
-    def generate_new_rowcol(self,row,col):
+
+    def generate_new_rowcol(self, row, col):
         if row is None:
             for irow in range(self.nrows):
                 has_none = any(item is None for item in self._subplot_matrix[irow])
@@ -62,9 +65,9 @@ def add_tikzfigure(self, **kwargs):
             - row (int): Row index for the subplot.
             - label (str): Label to identify the subplot.
         """
-        col = kwargs.get('col', None)
-        row = kwargs.get('row', None)
-        label = kwargs.get('label', None)
+        col = kwargs.get("col", None)
+        row = kwargs.get("row", None)
+        label = kwargs.get("label", None)
 
         row, col = self.generate_new_rowcol(row, col)
 
@@ -89,12 +92,12 @@ def add_subplot(self, **kwargs):
             - row (int): Row index for the subplot.
             - label (str): Label to identify the subplot.
         """
-        col = kwargs.get('col', None)
-        row = kwargs.get('row', None)
-        label = kwargs.get('label', None)
+        col = kwargs.get("col", None)
+        row = kwargs.get("row", None)
+        label = kwargs.get("label", None)
 
         row, col = self.generate_new_rowcol(row, col)
-        
+
         # Initialize the LinePlot for the given subplot position
         line_plot = lp.LinePlot(**kwargs)
         self._subplot_matrix[row][col] = line_plot
@@ -105,17 +108,20 @@ def add_subplot(self, **kwargs):
         else:
             self.subplots[label] = line_plot
         return line_plot
-    def savefig(self, filename, backend = 'matplotlib'):
-        if backend == 'matplotlib':
-            fig, axs = self.plot(show=False, backend='matplotlib', savefig=True)
+
+    def savefig(self, filename, backend="matplotlib"):
+        if backend == "matplotlib":
+            fig, axs = self.plot(show=False, backend="matplotlib", savefig=True)
             fig.savefig(filename)
+
     # def add_line(self, label, x_data, y_data, **kwargs):
 
-    def plot(self, backend='matplotlib', show=True, savefig=False):
-        if backend == 'matplotlib':
+    def plot(self, backend="matplotlib", show=True, savefig=False):
+        if backend == "matplotlib":
             return self.plot_matplotlib(show=show, savefig=savefig)
-        elif backend == 'plotly':
+        elif backend == "plotly":
             self.plot_plotly(show=show, savefig=savefig)
+
     def plot_matplotlib(self, show=True, savefig=False):
         """
         Generate and optionally display the subplots.
@@ -137,18 +143,26 @@ def plot_matplotlib(self, show=True, savefig=False):
         if self._figsize is not None:
             fig_width, fig_height = self._figsize
         else:
-            fig_width, fig_height = plt_utils.set_size(width=self._width, ratio=self._ratio)
-        
-        fig, axes = plt.subplots(self.nrows, self.ncols, figsize=(fig_width / self._dpi, fig_height / self._dpi), squeeze=False, dpi = self._dpi)
-        
+            fig_width, fig_height = plt_utils.set_size(
+                width=self._width, ratio=self._ratio
+            )
+
+        fig, axes = plt.subplots(
+            self.nrows,
+            self.ncols,
+            figsize=(fig_width / self._dpi, fig_height / self._dpi),
+            squeeze=False,
+            dpi=self._dpi,
+        )
+
         for (row, col), subplot in self.subplots.items():
             ax = axes[row][col]
             subplot.plot_matplotlib(ax)
             # ax.set_title(f"Subplot ({row}, {col})")
 
         # Set caption, labels, etc., if needed
         plt.tight_layout()
-        
+
         if show:
             plt.show()
         else:
@@ -164,18 +178,26 @@ def plot_plotly(self, show=True, savefig=None):
         savefig (str, optional): Filename to save the figure if provided.
         """
         fontsize = 14
-        tex_fonts = plt_utils.setup_tex_fonts(fontsize=fontsize)  # adjust or redefine for Plotly if needed
+        tex_fonts = plt_utils.setup_tex_fonts(
+            fontsize=fontsize
+        )  # adjust or redefine for Plotly if needed
 
         # Set default width and height if not specified
         if self._figsize is not None:
             fig_width, fig_height = self._figsize
         else:
-            fig_width, fig_height = plt_utils.set_size(width=self._width, ratio=self._ratio)
+            fig_width, fig_height = plt_utils.set_size(
+                width=self._width, ratio=self._ratio
+            )
         print(self._width, fig_width, fig_height)
         # Create subplots
-        fig = make_subplots(rows=self.nrows, cols=self.ncols, subplot_titles=[
-            f"Subplot ({row}, {col})" for (row, col) in self.subplots.keys()
-        ])
+        fig = make_subplots(
+            rows=self.nrows,
+            cols=self.ncols,
+            subplot_titles=[
+                f"Subplot ({row}, {col})" for (row, col) in self.subplots.keys()
+            ],
+        )
 
         # Plot each subplot
         for (row, col), line_plot in self.subplots.items():
@@ -200,7 +222,6 @@ def plot_plotly(self, show=True, savefig=None):
             fig.show()
         return fig
 
-
     # Property getters
 
     @property
@@ -239,7 +260,7 @@ def subplot_matrix(self):
     @nrows.setter
     def dpi(self, value):
         self._dpi = value
-    
+
     @nrows.setter
     def nrows(self, value):
         self._nrows = value
@@ -354,11 +375,11 @@ def __setitem__(self, key, value):
     #     latex_code += "\\caption{Multiple Subplots}\n"
     #     latex_code += "\\end{figure}\n"
     #     return latex_code
-    
 
-if __name__ == '__main__':
-    c = Canvas(ncols=2,nrows=2)
+
+if __name__ == "__main__":
+    c = Canvas(ncols=2, nrows=2)
     sp = c.add_subplot()
     sp.add_line("Line 1", [0, 1, 2, 3], [0, 1, 4, 9])
     c.plot()
-    print('done')
+    print("done")

src/maxplotlib/colors/colors.py

@@ -1,7 +1,9 @@
-import numpy as np
+import re
+
 import matplotlib.colors as mcolors
 import matplotlib.patches as patches
-import re
+import numpy as np
+
 
 class Color:
     def __init__(self, color_spec):
@@ -32,11 +34,11 @@ def _parse_color(self, color_spec):
             return rgb
 
         # If it's a hex code
-        if isinstance(color_spec, str) and color_spec.startswith('#'):
+        if isinstance(color_spec, str) and color_spec.startswith("#"):
             return mcolors.hex2color(color_spec)
 
         # If it's a TikZ color string
-        match = re.match(r'(\w+)!([\d.]+)', color_spec)
+        match = re.match(r"(\w+)!([\d.]+)", color_spec)
         if match:
             base_color_name, percentage = match.groups()
             percentage = float(percentage)

src/maxplotlib/console/main.py

@@ -1,2 +1,2 @@
 def maxplotlib():
-    print('Hello, world!')
+    print("Hello, world!")

src/maxplotlib/linestyle/linestyle.py

@@ -1,5 +1,6 @@
 import re
 
+
 class Linestyle:
     def __init__(self, style_spec):
         """
@@ -24,10 +25,10 @@ def _parse_style(self, style_spec):
         """
         # Predefined mappings from TikZ to Matplotlib
         linestyle_mapping = {
-            'solid': 'solid',
-            'dashed': 'dashed',
-            'dotted': 'dotted',
-            'dashdot': 'dashdot',
+            "solid": "solid",
+            "dashed": "dashed",
+            "dotted": "dotted",
+            "dashdot": "dashdot",
             # You can add more styles or custom dash patterns
         }
 
@@ -36,7 +37,7 @@ def _parse_style(self, style_spec):
             return linestyle_mapping[style_spec]
         else:
             # Check if it's a custom dash pattern, e.g., 'dash pattern=on 5pt off 2pt'
-            match = re.match(r'dash pattern=on ([\d.]+)pt off ([\d.]+)pt', style_spec)
+            match = re.match(r"dash pattern=on ([\d.]+)pt off ([\d.]+)pt", style_spec)
             if match:
                 on_length = float(match.group(1))
                 off_length = float(match.group(2))
@@ -45,7 +46,7 @@ def _parse_style(self, style_spec):
             else:
                 # Default to solid if style is unknown
                 print(f"Unknown line style: '{style_spec}', defaulting to 'solid'")
-                return 'solid'
+                return "solid"
 
     def to_matplotlib(self):
         """