Merge branch 'master' into save_rule_or_proof

zxcalc · Nov 20, 2023 · f4094d5 · f4094d5
2 parents 35e104b + e27b098
commit f4094d5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/zxlive/proof_panel.py b/zxlive/proof_panel.py
@@ -401,7 +401,6 @@ def _refresh_rewrites_model(self) -> None:
         self.rewrites_panel.clicked.connect(model.do_rewrite)
         # TODO: Right now this calls for every single vertex selected, even if we select many at the same time
         self.graph_scene.selectionChanged.connect(model.update_on_selection)
-        self.rewrites_panel.expandAll()
 
 
 class ProofStepItemDelegate(QStyledItemDelegate):

diff --git a/zxlive/rewrite_data.py b/zxlive/rewrite_data.py
@@ -239,6 +239,7 @@ def _extract_circuit(graph: GraphT, matches: list) -> GraphT:
 
 action_groups = {
     "Basic rules": {key: operations[key] for key in rules_basic},
+    "Custom rules": {},
     "Graph-like rules": rewrites_graph_theoretic,
     "ZXW rules": {key: operations[key] for key in rules_zxw},
     "ZH rules": {key: operations[key] for key in rules_zh},

diff --git a/zxlive/tikz.py b/zxlive/tikz.py
@@ -6,13 +6,11 @@
 
 def proof_to_tikz(proof: ProofModel) -> str:
     settings = QSettings("zxlive", "zxlive")
-    vspace = settings.value("tikz/layout/vspace")
-    hspace = settings.value("tikz/layout/hspace")
-    max_width = settings.value("tikz/layout/max-width")
+    vspace = float(settings.value("tikz/layout/vspace"))
+    hspace = float(settings.value("tikz/layout/hspace"))
+    max_width = float(settings.value("tikz/layout/max-width"))
     draw_scalar = False
 
-    assert isinstance(vspace, float) and isinstance(hspace, float) and isinstance(max_width, float)
-
     xoffset = -max_width
     yoffset = -10
     idoffset = 0