Update plot directly from canvas

Author: max-models

src/maxplotlib/__init__.py

@@ -1,3 +1,3 @@
 from maxplotlib.canvas.canvas import Canvas
 
-__all__ = ["Canvas"]
+__all__ = ["Canvas"]

src/maxplotlib/canvas/canvas.py

@@ -5,8 +5,8 @@
 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
+from maxplotlib.subfigure.line_plot import LinePlot
+from maxplotlib.subfigure.tikz_figure import TikzFigure
 
 
 class Canvas:
@@ -70,6 +70,38 @@ def generate_new_rowcol(self, row, col):
         assert col is not None, "Not enough columns!"
         return row, col
 
+    def add_line(
+        self,
+        x_data,
+        y_data,
+        layer=0,
+        subplot: LinePlot | None = None,
+        row: int | None = None,
+        col: int | None = None,
+        plot_type="plot",
+        **kwargs,
+    ):
+        if row is not None and col is not None:
+            try:
+                subplot = self._subplot_matrix[row][col]
+            except KeyError:
+                raise ValueError("Invalid subplot position.")
+        else:
+            row, col = 0, 0
+            subplot = self._subplot_matrix[row][col]
+
+        if subplot is None:
+            row, col = self.generate_new_rowcol(row, col)
+            subplot = self.add_subplot(col=col, row=row)
+
+        subplot.add_line(
+            x_data=x_data,
+            y_data=y_data,
+            layer=layer,
+            plot_type=plot_type,
+            **kwargs,
+        )
+
     def add_tikzfigure(self, **kwargs):
         """
         Adds a subplot to the figure.
@@ -87,7 +119,7 @@ def add_tikzfigure(self, **kwargs):
         row, col = self.generate_new_rowcol(row, col)
 
         # Initialize the LinePlot for the given subplot position
-        tikz_figure = tf.TikzFigure(**kwargs)
+        tikz_figure = TikzFigure(**kwargs)
         self._subplot_matrix[row][col] = tikz_figure
 
         # Store the LinePlot instance by its position for easy access
@@ -97,7 +129,13 @@ def add_tikzfigure(self, **kwargs):
             self._subplots[label] = tikz_figure
         return tikz_figure
 
-    def add_subplot(self, col: int | None = None, row: int | None = None, label: str | None = None, **kwargs):
+    def add_subplot(
+        self,
+        col: int | None = None,
+        row: int | None = None,
+        label: str | None = None,
+        **kwargs,
+    ):
         """
         Adds a subplot to the figure.
 
@@ -108,11 +146,10 @@ def add_subplot(self, col: int | None = None, row: int | None = None, label: str
             - label (str): Label to identify the subplot.
         """
 
-
         row, col = self.generate_new_rowcol(row, col)
 
         # Initialize the LinePlot for the given subplot position
-        line_plot = lp.LinePlot(col=col, row=row, label=label, **kwargs)
+        line_plot = LinePlot(col=col, row=row, label=label, **kwargs)
         self._subplot_matrix[row][col] = line_plot
 
         # Store the LinePlot instance by its position for easy access
@@ -171,10 +208,8 @@ def plot(self, backend="matplotlib", savefig=False, layers=None):
 
     def show(self, backend="matplotlib"):
         if backend == "matplotlib":
-            fig, axs = self.plot(backend="matplotlib", savefig=False, layers=None)
-            print('hmm')
+            self.plot(backend="matplotlib", savefig=False, layers=None)
             self._matplotlib_fig.show()
-            plt.show()
         elif backend == "plotly":
             plot = self.plot_plotly(savefig=False)
         else:

src/maxplotlib/subfigure/line_plot.py

@@ -86,7 +86,14 @@ def _add(self, obj, layer):
         else:
             self.layered_line_data[layer] = [obj]
 
-    def add_line(self, x_data, y_data, layer=0, plot_type="plot", **kwargs):
+    def add_line(
+        self,
+        x_data,
+        y_data,
+        layer=0,
+        plot_type="plot",
+        **kwargs,
+    ):
         """
         Add a line to the plot.
 

tutorials/tutorial_01.ipynb

@@ -29,10 +29,26 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "c = Canvas(width=\"17cm\", ratio=0.5, fontsize=12)\n",
+    "c.add_line([0, 1, 2, 3], [0, 1, 4, 9], label=\"Line 1\")\n",
+    "c.add_line([0, 1, 2, 3], [0, 2, 3, 4], linestyle=\"dashed\", color=\"red\", label=\"Line 2\")\n",
+    "c.show()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "3",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# You can also explicitly create a subplot and add lines to it\n",
+    "\n",
     "c = Canvas(width=\"17cm\", ratio=0.5, fontsize=12)\n",
     "sp = c.add_subplot(\n",
     "    grid=True, xlabel=\"(x - 10) * 0.1\", ylabel=\"10y\", yscale=10, xshift=-10, xscale=0.1\n",
     ")\n",
+    "\n",
     "sp.add_line([0, 1, 2, 3], [0, 1, 4, 9], label=\"Line 1\")\n",
     "sp.add_line([0, 1, 2, 3], [0, 2, 3, 4], linestyle=\"dashed\", color=\"red\", label=\"Line 2\")\n",
     "c.show()"
@@ -41,10 +57,12 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "3",
+   "id": "4",
    "metadata": {},
    "outputs": [],
    "source": [
+    "# Example with multiple subplots\n",
+    "\n",
     "c = Canvas(width=\"17cm\", ncols=2, nrows=2, ratio=0.5)\n",
     "sp = c.add_subplot(grid=True)\n",
     "c.add_subplot(row=1)\n",
@@ -59,7 +77,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "4",
+   "id": "5",
    "metadata": {},
    "outputs": [],
    "source": [