Skip to content

Commit

Permalink
Ready tikz default values from pyzx.
Browse files Browse the repository at this point in the history 
Also rearrange them in the code to appear in the same order as in pyzx.
  • Loading branch information
@dlyongemallo
dlyongemallo committed Nov 9, 2023
1 parent c26a89f commit 0f12644
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 40 deletions.
62 changes: 36 additions & 26 deletions zxlive/common.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os
from enum import IntEnum
from typing import Final
from typing import Final, Optional
from typing_extensions import TypeAlias

from PySide6.QtCore import QSettings
Expand Down Expand Up @@ -75,7 +75,7 @@ class Colors(object):
def __init__(self, color_scheme:str='modern-red-green'):
self.set_color_scheme(color_scheme)

def set_color_scheme(self,color_scheme):
def set_color_scheme(self, color_scheme: str) -> None:
if color_scheme == 'modern-red-green':
self.z_spider = QColor("#ccffcc")
self.z_spider_pressed = QColor("#64BC90")
Expand Down Expand Up @@ -111,42 +111,52 @@ def set_color_scheme(self,color_scheme):
else:
raise ValueError(f"Unknown colour scheme {color_scheme}")


settings = QSettings("zxlive", "zxlive")
color_scheme = settings.value("color-scheme")
if color_scheme is None: color_scheme = 'modern-red-green'
else: color_scheme = str(color_scheme)
colors = Colors(color_scheme)


def set_pyzx_tikz_settings() -> None:
settings = QSettings("zxlive", "zxlive")
tikz_classes = {
'boundary': str(settings.value('tikz/boundary-export')),
'Z': str(settings.value('tikz/Z-spider-export')),
'X': str(settings.value('tikz/X-spider-export')),
'Z phase': str(settings.value('tikz/Z-phase-export')),
'X phase': str(settings.value('tikz/X-phase-export')),
'Z box': str(settings.value('tikz/Z-box-export')),
'H': str(settings.value('tikz/Hadamard-export')),
'W': str(settings.value('tikz/W-output-export')),
'W input': str(settings.value('tikz/W-input-export')),
'edge': str(settings.value('tikz/edge-export')),
'H-edge': str(settings.value('tikz/edge-H-export')),
'W-io-edge': str(settings.value('tikz/edge-W-export')),
'boundary': str(settings.value('tikz/boundary-export') or pyzx.settings.tikz_classes['boundary']),
'Z': str(settings.value('tikz/Z-spider-export') or pyzx.settings.tikz_classes['Z']),
'X': str(settings.value('tikz/X-spider-export') or pyzx.settings.tikz_classes['X']),
'Z phase': str(settings.value('tikz/Z-phase-export') or pyzx.settings.tikz_classes['Z phase']),
'X phase': str(settings.value('tikz/X-phase-export') or pyzx.settings.tikz_classes['X phase']),
'Z box': str(settings.value('tikz/Z-box-export') or pyzx.settings.tikz_classes['Z box']),
'H': str(settings.value('tikz/Hadamard-export') or pyzx.settings.tikz_classes['H']),
'W': str(settings.value('tikz/W-output-export') or pyzx.settings.tikz_classes['W']),
'W input': str(settings.value('tikz/W-input-export') or pyzx.settings.tikz_classes['W input']),
'edge': str(settings.value('tikz/edge-export') or pyzx.settings.tikz_classes['edge']),
'H-edge': str(settings.value('tikz/edge-H-export') or pyzx.settings.tikz_classes['H-edge']),
'W-io-edge': str(settings.value('tikz/edge-W-export') or pyzx.settings.tikz_classes['W-io-edge']),
}

def _get_synonyms(key: str, default: list[str]) -> list[str]:
val: object = settings.value(key)
if not val:
return default
return [s.strip().lower() for s in str(val).split(',')]

pyzx.settings.tikz_classes = tikz_classes
pyzx.tikz.synonyms_boundary = [str(s).strip().lower() for s in settings.value('tikz/boundary-import').split(',')]
pyzx.tikz.synonyms_z = [str(s).strip().lower() for s in settings.value('tikz/Z-spider-import').split(',')]
pyzx.tikz.synonyms_x = [str(s).strip().lower() for s in settings.value('tikz/X-spider-import').split(',')]
pyzx.tikz.synonyms_hadamard = [str(s).strip().lower() for s in settings.value('tikz/Hadamard-import').split(',')]
pyzx.tikz.synonyms_w_input = [str(s).strip().lower() for s in settings.value('tikz/W-input-import').split(',')]
pyzx.tikz.synonyms_w_output = [str(s).strip().lower() for s in settings.value('tikz/W-output-import').split(',')]
pyzx.tikz.synonyms_z_box = [str(s).strip().lower() for s in settings.value('tikz/Z-box-import').split(',')]
pyzx.tikz.synonyms_edge = [str(s).strip().lower() for s in settings.value('tikz/edge-import').split(',')]
pyzx.tikz.synonyms_hedge = [str(s).strip().lower() for s in settings.value('tikz/edge-H-import').split(',')]
pyzx.tikz.synonyms_wedge = [str(s).strip().lower() for s in settings.value('tikz/edge-W-import').split(',')]
pyzx.tikz.synonyms_boundary = _get_synonyms('tikz/boundary-import', pyzx.tikz.synonyms_boundary)
pyzx.tikz.synonyms_z = _get_synonyms('tikz/Z-spider-import', pyzx.tikz.synonyms_z)
pyzx.tikz.synonyms_x = _get_synonyms('tikz/X-spider-import', pyzx.tikz.synonyms_x)
pyzx.tikz.synonyms_hadamard = _get_synonyms('tikz/Hadamard-import', pyzx.tikz.synonyms_hadamard)
pyzx.tikz.synonyms_w_input = _get_synonyms('tikz/W-input-import', pyzx.tikz.synonyms_w_input)
pyzx.tikz.synonyms_w_output = _get_synonyms('tikz/W-output-import', pyzx.tikz.synonyms_w_output)
pyzx.tikz.synonyms_z_box = _get_synonyms('tikz/Z-box-import', pyzx.tikz.synonyms_z_box)
pyzx.tikz.synonyms_edge = _get_synonyms('tikz/edge-import', pyzx.tikz.synonyms_edge)
pyzx.tikz.synonyms_hedge = _get_synonyms('tikz/edge-H-import', pyzx.tikz.synonyms_hedge)
pyzx.tikz.synonyms_wedge = _get_synonyms('tikz/edge-W-import', pyzx.tikz.synonyms_wedge)


set_pyzx_tikz_settings() # Call it once on startup


def to_tikz(g: GraphT) -> str:
return pyzx.tikz.to_tikz(g)

Expand All @@ -156,4 +166,4 @@ def from_tikz(s: str) -> GraphT:
except Exception as e:
from . import dialogs
dialogs.show_error_msg("Tikz import error", f"Error while importing tikz: {e}")
return None
return None
27 changes: 13 additions & 14 deletions zxlive/settings_dialog.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,27 +36,26 @@
"path/custom-rules": "lemmas/",
"color-scheme": "modern-red-green",

"tikz/Z-spider-export": "Z dot",
"tikz/Z-phase-export": "Z phase dot",
"tikz/X-spider-export": "X dot",
"tikz/X-phase-export": "X phase dot",
"tikz/Hadamard-export": "hadamard",
"tikz/boundary-export": "none",
"tikz/w-input-export": "W input",
"tikz/w-output-export": "W triangle",
"tikz/z-box-export": "Z box",
"tikz/boundary-export": pyzx.settings.tikz_classes['boundary'],
"tikz/Z-spider-export": pyzx.settings.tikz_classes['Z'],
"tikz/X-spider-export": pyzx.settings.tikz_classes['X'],
"tikz/Z-phase-export": pyzx.settings.tikz_classes['Z phase'],
"tikz/X-phase-export": pyzx.settings.tikz_classes['X phase'],
"tikz/z-box-export": pyzx.settings.tikz_classes['Z box'],
"tikz/Hadamard-export": pyzx.settings.tikz_classes['H'],
"tikz/w-output-export": pyzx.settings.tikz_classes['W'],
"tikz/w-input-export": pyzx.settings.tikz_classes['W input'],
"tikz/edge-export": pyzx.settings.tikz_classes['edge'],
"tikz/edge-H-export": pyzx.settings.tikz_classes['H-edge'],
"tikz/edge-W-export": pyzx.settings.tikz_classes['W-io-edge'],

"tikz/boundary-import": ", ".join(pyzx.tikz.synonyms_boundary),
"tikz/Z-spider-import": ", ".join(pyzx.tikz.synonyms_z),
"tikz/X-spider-import": ", ".join(pyzx.tikz.synonyms_x),
"tikz/Hadamard-import": ", ".join(pyzx.tikz.synonyms_hadamard),
"tikz/boundary-import": ", ".join(pyzx.tikz.synonyms_boundary),
"tikz/w-input-import": ", ".join(pyzx.tikz.synonyms_w_input),
"tikz/w-output-import": ", ".join(pyzx.tikz.synonyms_w_output),
"tikz/z-box-import": ", ".join(pyzx.tikz.synonyms_z_box),

"tikz/edge-export": "",
"tikz/edge-H-export": "hadamard edge",
"tikz/edge-W-export": "W io edge",
"tikz/edge-import": ", ".join(pyzx.tikz.synonyms_edge),
"tikz/edge-H-import": ", ".join(pyzx.tikz.synonyms_hedge),
"tikz/edge-W-import": ", ".join(pyzx.tikz.synonyms_wedge),
Expand Down

0 comments on commit 0f12644

Please sign in to comment.