From 09ce995866f7ff4c10f7e1ad49240258763b627f Mon Sep 17 00:00:00 2001 From: germano2239 Date: Tue, 26 Jul 2022 16:09:01 +0200 Subject: [PATCH 1/2] dev gg --- src/components/component.py | 5 +++- src/components/os_label_printer.py | 5 ++-- src/main.py | 4 +-- src/test/data/database/sqlite.db | Bin 0 -> 65536 bytes src/test/label_printer.py | 27 ++++++++++++++++++++ src/ui/leak_step_editor/leak_step_editor.ui | 2 +- 6 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 src/test/data/database/sqlite.db create mode 100644 src/test/label_printer.py diff --git a/src/components/component.py b/src/components/component.py index 93c8a33..6328053 100644 --- a/src/components/component.py +++ b/src/components/component.py @@ -79,7 +79,10 @@ class Component(QObject): self._set_sources.connect(self._do_set_sources) self._set_period.connect(self._do_set_period) if self.config is not None: - self.config.updated.connect(self._config_changed) + try: + self.config.updated.connect(self._config_changed) + except AttributeError: + pass self._config_changed() self._init_periodic() self._started = True diff --git a/src/components/os_label_printer.py b/src/components/os_label_printer.py index 3d84263..875685e 100644 --- a/src/components/os_label_printer.py +++ b/src/components/os_label_printer.py @@ -9,9 +9,10 @@ from .component import Component class Os_Label_Printer(Component): def __init__(self, config=None, name=None): super().__init__(config=config, name=name, threaded=False) + self.simulate = False if "--sim-os-label-printer" in sys.argv: self.simulate = True - + self.platform = "windows" def config_changed(self): self.platform = self.config[self.name]["platform"] # for windows: @@ -31,7 +32,7 @@ class Os_Label_Printer(Component): label = f.read() # LABEL PRINT label = label.format(**context) - label_file = "/tmp/label.prn" + label_file = "tmp/label.prn" with open(label_file, "w", errors="surrogateescape") as f: label = f.write(label) if self.platform == "windows": diff --git a/src/main.py b/src/main.py index 65798fe..972f6f5 100644 --- a/src/main.py +++ b/src/main.py @@ -152,10 +152,10 @@ try: def open_login(self): tab = Login() - tab.successful_login.connect(self.logghed_in) + tab.successful_login.connect(self.logged_in) self.main_window.open_tab(tab) - def logghed_in(self): + def logged_in(self): session = Users.get_session() if session is not None: if session.is_admin: diff --git a/src/test/data/database/sqlite.db b/src/test/data/database/sqlite.db new file mode 100644 index 0000000000000000000000000000000000000000..040439d6f0f67fa2cd84754bd2d155d93ca5717c GIT binary patch literal 65536 zcmeI)-%i_B90zcR07=T9bVDdwQOB7DY9pYKgd_wFX(xd+*cF}lyVXOi=) z{)uridOk`<{un9y{_>sqKKB0Vz2o_lZo~os2tWV=5V&c9Mq=C(2n1Z;?V4h#DjBAv z8P@9ddQM2@1(HubObdj!%6M|0mn%F;W%9z7kRzFFo@5H?G}+0ewv)L7@|AEfPk2SF zNj%95`+54pJlE_O?cHgqp-E+)Jle}=UK6 zCHU0m2?S}3p`I8_seN1{eMhXl*&5hBL7JoYz1QmrOi#OhC|aY}uGM~Wt9vBd<=0H- z*N~{Ion=-{(P+($&Uh?AiWSim zugs~ao5ejTdoVm4n45CFYG#vN)9#ktytjYzt-f2+-`=&= zYntqQ@bS=aV0OxN(bcq-rp+*({z+;dLo-X*simWBJ3(g#J%Ony*N@Z91Z~!^cN^|W z&gMp2^hyr&oN50@srmX8Y=QJSh0~O-YgJXO^gF-zCShv;yHk*rwubTDlDDC`tzr5; zZVi*2+xEjy_b_!Q{@aG>@(rUA^4wyX-_D%Wj{hG6tm30q8W8CElOwz``wK&-h?8n^=*{XMq z_f@uQe@RU=j2Eg-d)UjRtMqr8=1DPVUBtih>ZX5TLwpE800Izz00bZa0SG_<0uX=z z1l}aTzMCKL-{Jf}(G?a5KmY;|fB*y_009U<00Izzzy~K#a}RTqjqFE-Js~$E>c^@Q zmMb%7YoWwUZ7mj!Mq=~kT4Y{ZTb?;9$zSj0!>7`E{$Nvx?c|i&v35KYFK5HXv(3QWRd~t49T3%F3mA#Ya$#^YMUVO0_J1G?okLs>rF3`wMCpWfJnYYB-S*peL zxie9TtcY9sm$~QZ=iB?qneFAY8p-dS&aH1fDHuF009U<00Izz00bZa0SG|A5rNNLUM@8D+3c+M zVLJPG;o$*^t}KODLd)UM(&e*P_N{|f505VL^^!_TRrSR}>0IM{TyW}>*~XZ6liu@0 z)Mb(gN22i+`&IMBmD*ZWG)%cHl8UNnvPeoYy`NuM{D$5#NFrrbA*Q6)RCwhQ35eotk zfB*y_009U<00Izz00bc5ya2BMoi|5B2tWV=5P$##AOHafKmY;|fPm8ixc+xq9PuCk z0SG_<0uX=z1Rwwb2tWV=&I{oG|2uDvh!B7P1Rwwb2tWV=5P$##AOHcU1@Qg9)8dE+ z0SG_<0uX=z1Rwwb2tWV=5O7`q*Z-T0B(V}r?8(OpscUsZ(iO2LtrEVlC*=5f zqN`QOAbdtuBz|L{Un@(i(HLzdva%eyRx6KOtd&B~u~@A{!-;q-dbO40#&#-mc`%3f z#7a$8?j7;$`+v9p7ta5;|9AR;1p*L&00bZa0SG_<0uX=z1Rwx`8xr``opkkF?00 - 100 + 150 From 8be8175ea3d6f8ff47b754a0828b1dad714251b8 Mon Sep 17 00:00:00 2001 From: germano2239 Date: Tue, 26 Jul 2022 16:12:04 +0200 Subject: [PATCH 2/2] dev gg --- src/test/data/database/sqlite.db | Bin 65536 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/test/data/database/sqlite.db diff --git a/src/test/data/database/sqlite.db b/src/test/data/database/sqlite.db deleted file mode 100644 index 040439d6f0f67fa2cd84754bd2d155d93ca5717c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65536 zcmeI)-%i_B90zcR07=T9bVDdwQOB7DY9pYKgd_wFX(xd+*cF}lyVXOi=) z{)uridOk`<{un9y{_>sqKKB0Vz2o_lZo~os2tWV=5V&c9Mq=C(2n1Z;?V4h#DjBAv z8P@9ddQM2@1(HubObdj!%6M|0mn%F;W%9z7kRzFFo@5H?G}+0ewv)L7@|AEfPk2SF zNj%95`+54pJlE_O?cHgqp-E+)Jle}=UK6 zCHU0m2?S}3p`I8_seN1{eMhXl*&5hBL7JoYz1QmrOi#OhC|aY}uGM~Wt9vBd<=0H- z*N~{Ion=-{(P+($&Uh?AiWSim zugs~ao5ejTdoVm4n45CFYG#vN)9#ktytjYzt-f2+-`=&= zYntqQ@bS=aV0OxN(bcq-rp+*({z+;dLo-X*simWBJ3(g#J%Ony*N@Z91Z~!^cN^|W z&gMp2^hyr&oN50@srmX8Y=QJSh0~O-YgJXO^gF-zCShv;yHk*rwubTDlDDC`tzr5; zZVi*2+xEjy_b_!Q{@aG>@(rUA^4wyX-_D%Wj{hG6tm30q8W8CElOwz``wK&-h?8n^=*{XMq z_f@uQe@RU=j2Eg-d)UjRtMqr8=1DPVUBtih>ZX5TLwpE800Izz00bZa0SG_<0uX=z z1l}aTzMCKL-{Jf}(G?a5KmY;|fB*y_009U<00Izzzy~K#a}RTqjqFE-Js~$E>c^@Q zmMb%7YoWwUZ7mj!Mq=~kT4Y{ZTb?;9$zSj0!>7`E{$Nvx?c|i&v35KYFK5HXv(3QWRd~t49T3%F3mA#Ya$#^YMUVO0_J1G?okLs>rF3`wMCpWfJnYYB-S*peL zxie9TtcY9sm$~QZ=iB?qneFAY8p-dS&aH1fDHuF009U<00Izz00bZa0SG|A5rNNLUM@8D+3c+M zVLJPG;o$*^t}KODLd)UM(&e*P_N{|f505VL^^!_TRrSR}>0IM{TyW}>*~XZ6liu@0 z)Mb(gN22i+`&IMBmD*ZWG)%cHl8UNnvPeoYy`NuM{D$5#NFrrbA*Q6)RCwhQ35eotk zfB*y_009U<00Izz00bc5ya2BMoi|5B2tWV=5P$##AOHafKmY;|fPm8ixc+xq9PuCk z0SG_<0uX=z1Rwwb2tWV=&I{oG|2uDvh!B7P1Rwwb2tWV=5P$##AOHcU1@Qg9)8dE+ z0SG_<0uX=z1Rwwb2tWV=5O7`q*Z-T0B(V}r?8(OpscUsZ(iO2LtrEVlC*=5f zqN`QOAbdtuBz|L{Un@(i(HLzdva%eyRx6KOtd&B~u~@A{!-;q-dbO40#&#-mc`%3f z#7a$8?j7;$`+v9p7ta5;|9AR;1p*L&00bZa0SG_<0uX=z1Rwx`8xr``opkkF?00