From dedb5e519889fcec04c2bff06c1c353df3e341ff Mon Sep 17 00:00:00 2001
From: John van de Wetering <john@vdwetering.name>
Date: Wed, 23 Oct 2024 21:50:16 +0200
Subject: [PATCH] Made it so that all files are loaded as multigraphs, and
 set_auto_simplify is set to False, as is the behaviour when you make a new
 graph in ZXLive.

---
 zxlive/dialogs.py           | 25 ++++++++++++++++++-------
 zxlive/editor_base_panel.py |  1 +
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/zxlive/dialogs.py b/zxlive/dialogs.py
index 323fdb3..0a9725e 100644
--- a/zxlive/dialogs.py
+++ b/zxlive/dialogs.py
@@ -139,25 +139,36 @@ def import_diagram_from_file(file_path: str, selected_filter: str = FileFormat.A
         elif selected_format == FileFormat.ZXRule:
             return ImportRuleOutput(selected_format, file_path, CustomRule.from_json(data))
         elif selected_format in (FileFormat.QGraph, FileFormat.Json):
-            return ImportGraphOutput(selected_format, file_path, GraphT.from_json(data))  # type: ignore # This is something that needs to be better annotated in PyZX
+            g = GraphT.from_json(data)
+            g.set_auto_simplify(False)
+            return ImportGraphOutput(selected_format, file_path, g)  # type: ignore # This is something that needs to be better annotated in PyZX
         elif selected_format == FileFormat.QASM:
-            return ImportGraphOutput(selected_format, file_path, Circuit.from_qasm(data).to_graph()) # type: ignore
+            g = Circuit.from_qasm(data).to_graph(zh=True,backend='multigraph')
+            g.set_auto_simplify(False)
+            return ImportGraphOutput(selected_format, file_path, ) # type: ignore
         elif selected_format == FileFormat.TikZ:
             try:
-                return ImportGraphOutput(selected_format, file_path, GraphT.from_tikz(data))  # type: ignore
+                g = GraphT.from_tikz(data)
+                g.set_auto_simplify(False)
+                return ImportGraphOutput(selected_format, file_path, g)  # type: ignore
             except ValueError:
                 raise ValueError("Probable reason: attempted to import a proof from TikZ, which is not supported.")
         else:
             assert selected_format == FileFormat.All
             try:
-                circ = Circuit.load(file_path)
-                return ImportGraphOutput(FileFormat.QASM, file_path, circ.to_graph())  # type: ignore
+                g = Circuit.load(file_path).to_graph(zx=True,backend='multigraph')
+                g.set_auto_simplify(False)
+                return ImportGraphOutput(FileFormat.QASM, file_path, g)  # type: ignore
             except TypeError:
                 try:
-                    return ImportGraphOutput(FileFormat.QGraph, file_path, GraphT.from_json(data))  # type: ignore
+                    g = GraphT.from_json(data)
+                    g.set_auto_simplify(False)
+                    return ImportGraphOutput(FileFormat.QGraph, file_path, g)  # type: ignore
                 except Exception:
                     try:
-                        return ImportGraphOutput(FileFormat.TikZ, file_path, GraphT.from_tikz(data))  # type: ignore
+                        g = GraphT.from_tikz(data)
+                        g.set_auto_simplify(False)
+                        return ImportGraphOutput(FileFormat.TikZ, file_path, g)  # type: ignore
                     except:
                         show_error_msg(f"Failed to import {selected_format.name} file",
                                        f"Couldn't determine filetype: {file_path}.", parent=parent)
diff --git a/zxlive/editor_base_panel.py b/zxlive/editor_base_panel.py
index d04bc60..401114f 100644
--- a/zxlive/editor_base_panel.py
+++ b/zxlive/editor_base_panel.py
@@ -182,6 +182,7 @@ def add_vert(self, x: float, y: float, edges: list[EItem]) -> None:
 
     def add_edge(self, u: VT, v: VT, verts: list[VItem]) -> None:
         """Add an edge between vertices u and v. `verts` is a list of VItems that collide with the edge.
+        If self.snap_vertex_edge is true, then we try to connect `u` through all the `vertices` in `verts`, and then to `v`.
         """
         cmd: BaseCommand
         graph = self.graph_view.graph_scene.g