Bugfix for the layering

Author: max-models

src/maxplotlib/subfigure/tikz_figure.py

@@ -23,7 +23,8 @@ def get_reqs(self):
         for item in self.items:
             if isinstance(item, Path):
                 for node in item.nodes:
-                    reqs.add(node.layer)
+                    if not node.layer == self.label:
+                        reqs.add(node.layer)
         return reqs
     def generate_tikz(self):
         tikz_script = f"\n% Layer {self.label}\n"
@@ -140,7 +141,7 @@ def add_node(self, x, y, label=None, content="", layer = 0, **kwargs):
         """
         if label is None:
             label = f"node{self._node_counter}"
-        node = Node(x=x, y=y, label=label, content=content, **kwargs)
+        node = Node(x=x, y=y, label=label, layer=layer, content=content, **kwargs)
         self.nodes.append(node)
         if layer in self.layers:
             self.layers[layer].add(node)
@@ -171,7 +172,6 @@ def add_path(self, nodes, layer=0, **kwargs):
             else ValueError(f"Invalid node type: {type(node)}")
             for node in nodes
         ]
-
         path = Path(nodes, **kwargs)
         self.paths.append(path)
         if layer in self.layers:
@@ -219,18 +219,6 @@ def generate_tikz(self):
         # Add grid if enabled
         if self._grid:
             tikz_script += "    \\draw[step=1cm, gray, very thin] (-10,-10) grid (10,10);\n"
-        # def update_layer_order(layer, layer_order, buffered_layers):
-        #     reqs = layer.get_reqs()
-        #     if len(reqs) == 0:
-        #         layer_order.append(key)
-        #         buffered_layers.pop(key)
-        #     elif all([r in layer_order for r in reqs]):
-        #         layer_order.append(key)
-        #         buffered_layers.pop(key)
-        #     else:
-        #         buffered_layers.append(key)
-        #     return layer, layer_order, buffered_layers
-        # Determine the order to print the layers
         ordered_layers = []
         buffered_layers = set()
 
@@ -246,8 +234,6 @@ def generate_tikz(self):
 
             for buffered_layer in buffered_layers:
                 buff_reqs = buffered_layer.get_reqs()
-                print(buff_reqs)
-                print([r in [l.label for l in ordered_layers] for r in buff_reqs], [l.label for l in ordered_layers])
                 if all([r in [l.label for l in ordered_layers] for r in buff_reqs]):
                     print('Move layer from buffer')
                     ordered_layers.append(key)

tutorials/tutorial_02.ipynb

@@ -24,7 +24,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 191,
+   "execution_count": 229,
    "id": "650f0afa-f719-4495-b020-fc2b2df36bd7",
    "metadata": {},
    "outputs": [
@@ -41,26 +41,28 @@
     "tikz = c.add_tikzfigure(grid=False)\n",
     "\n",
     "# Add nodes\n",
-    "tikz.add_node(0, 0, 'A', shape='circle', draw='black', fill='blue', layer=3)\n",
-    "tikz.add_node(1, 0, 'B')\n",
-    "tikz.add_node(1, 1, 'C')\n",
-    "tikz.add_node(0, 1, 'D')\n",
-    "tikz.add_node(0.5, 0.5, content='Cube', layer=2)\n",
+    "tikz.add_node(0, 0, 'A', shape='circle', draw='black', fill='blue', layer=0)\n",
+    "tikz.add_node(1, 0, 'B', shape='circle', draw='black', fill='blue', layer=0)\n",
+    "tikz.add_node(1, 1, 'C', shape='circle', draw='black', fill='blue', layer=0)\n",
+    "tikz.add_node(0, 1, 'D', shape='circle', draw='black', fill='blue', layer=2)\n",
+    "\n",
     "\n",
     "# Add a line between nodes \n",
-    "tikz.add_path(['A', 'B', 'C', 'D'], path_actions=['draw', 'rounded corners'], fill='red', opacity=1.0,cycle=True)\n",
+    "tikz.add_path(['A', 'B', 'C', 'D'], path_actions=['draw', 'rounded corners'], fill='red', opacity=1.0,cycle=True, layer=1)\n",
+    "\n",
+    "tikz.add_node(0.5, 0.5, content='Cube', layer=10)\n",
     "\n",
     "# Generate the TikZ script\n",
     "#script = tikz.generate_tikz()\n",
     "#print(script)\n",
     "#print(tikz.generate_standalone())\n",
     "tikz.compile_pdf('my_figure.pdf')\n",
-    "\n"
+    "# "
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 206,
+   "execution_count": 207,
    "id": "344589d9-c60f-4d01-8171-e35db585f1ad",
    "metadata": {},
    "outputs": [
@@ -89,7 +91,7 @@
        "       dtype=object))"
       ]
      },
-     "execution_count": 206,
+     "execution_count": 207,
      "metadata": {},
      "output_type": "execute_result"
     }