Formatting

Author: max-models

src/maxplotlib/canvas/canvas.py

@@ -287,7 +287,7 @@ def show(
             self.plot(backend="matplotlib", savefig=False, layers=None)
             self._matplotlib_fig.show()
         elif backend == "plotly":
-            plot = self.plot_plotly(savefig=False)
+            self.plot_plotly(savefig=False)
         elif backend == "tikzpics":
             fig = self.plot_tikzpics(savefig=False)
             fig.show()
@@ -321,14 +321,12 @@ def plot_matplotlib(self, savefig=False, layers=None, usetex=False):
                 dpi=self.dpi,
             )
 
-        # print(f"{(fig_width / self._dpi, fig_height / self._dpi) = }")
-
         fig, axes = plt.subplots(
             self.nrows,
             self.ncols,
             figsize=(fig_width, fig_height),
             squeeze=False,
-            dpi=self._dpi,
+            dpi=self.dpi,
         )
 
         for (row, col), subplot in self.subplots.items():
@@ -371,7 +369,7 @@ def plot_plotly(self, show=True, savefig=None, usetex=False):
         savefig (str, optional): Filename to save the figure if provided.
         """
 
-        tex_fonts = setup_tex_fonts(
+        setup_tex_fonts(
             fontsize=self.fontsize,
             usetex=usetex,
         )  # adjust or redefine for Plotly if needed
@@ -456,9 +454,6 @@ def subplot_matrix(self):
         return self._subplot_matrix
 
     # Property setters
-    @nrows.setter
-    def dpi(self, value):
-        self._dpi = value
 
     @nrows.setter
     def nrows(self, value):
@@ -518,7 +513,6 @@ def plot_matplotlib(tikzfigure: TikzFigure, ax, layers=None):
     nodes = tikzfigure.layers.get_nodes()
     paths = tikzfigure.layers.get_paths()
 
-
     for path in paths:
         x_coords = [node.x for node in path.nodes]
         y_coords = [node.y for node in path.nodes]

src/maxplotlib/subfigure/tikz_figure.py

@@ -274,14 +274,21 @@ def generate_tikz(self):
             reqs = layer.get_reqs()
             if all([r == layer.label for r in reqs]):
                 ordered_layers.append(layer)
-            elif all([r in [l.label for l in ordered_layers] for r in reqs]):
+            elif all(
+                [_req in [_lay.label for _lay in ordered_layers] for _req in reqs]
+            ):
                 ordered_layers.append(layer)
             else:
                 buffered_layers.add(layer)
 
             for buffered_layer in buffered_layers:
                 buff_reqs = buffered_layer.get_reqs()
-                if all([r in [l.label for l in ordered_layers] for r in buff_reqs]):
+                if all(
+                    [
+                        _req in [_lay.label for _lay in ordered_layers]
+                        for _req in buff_reqs
+                    ]
+                ):
                     print("Move layer from buffer")
                     ordered_layers.append(key)
                     buffered_layers.remove(key)

tutorials/tutorial_02.ipynb

@@ -54,10 +54,10 @@
     "tikz = c.add_tikzfigure(grid=False)\n",
     "\n",
     "# Add nodes\n",
-    "tikz.add_node(0, 0, label = \"A\", shape=\"circle\", draw=\"black\", fill=\"blue\", layer=0)\n",
-    "tikz.add_node(1, 0, label = \"B\", shape=\"circle\", draw=\"black\", fill=\"blue\", layer=0)\n",
-    "tikz.add_node(1, 1, label = \"C\", shape=\"circle\", draw=\"black\", fill=\"blue\", layer=0)\n",
-    "tikz.add_node(0, 1, label = \"D\", shape=\"circle\", draw=\"black\", fill=\"blue\", layer=2)\n",
+    "tikz.add_node(0, 0, label=\"A\", shape=\"circle\", draw=\"black\", fill=\"blue\", layer=0)\n",
+    "tikz.add_node(1, 0, label=\"B\", shape=\"circle\", draw=\"black\", fill=\"blue\", layer=0)\n",
+    "tikz.add_node(1, 1, label=\"C\", shape=\"circle\", draw=\"black\", fill=\"blue\", layer=0)\n",
+    "tikz.add_node(0, 1, label=\"D\", shape=\"circle\", draw=\"black\", fill=\"blue\", layer=2)\n",
     "\n",
     "\n",
     "# Add a line between nodes\n",