From 999c32734e2dc8a3258335ca0afd33bd73dee51d Mon Sep 17 00:00:00 2001 From: neo-dl Date: Sun, 3 Sep 2023 17:27:54 +0200 Subject: [PATCH] tentative fix label glitch + speedup --- src/ui/rfid_recipe_selection/__init__.py | 1 - .../rfid_recipe_selection.py | 85 ----------------- .../rfid_recipe_selection.ui | 95 ------------------- src/ui/test/test.py | 6 +- src/ui/test_leak/test_leak.py | 4 + 5 files changed, 7 insertions(+), 184 deletions(-) delete mode 100644 src/ui/rfid_recipe_selection/__init__.py delete mode 100644 src/ui/rfid_recipe_selection/rfid_recipe_selection.py delete mode 100644 src/ui/rfid_recipe_selection/rfid_recipe_selection.ui diff --git a/src/ui/rfid_recipe_selection/__init__.py b/src/ui/rfid_recipe_selection/__init__.py deleted file mode 100644 index b3a3f30..0000000 --- a/src/ui/rfid_recipe_selection/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .rfid_recipe_selection import RFID_Recipe_Selection diff --git a/src/ui/rfid_recipe_selection/rfid_recipe_selection.py b/src/ui/rfid_recipe_selection/rfid_recipe_selection.py deleted file mode 100644 index b4145fc..0000000 --- a/src/ui/rfid_recipe_selection/rfid_recipe_selection.py +++ /dev/null @@ -1,85 +0,0 @@ -import sys - -import peewee -from PyQt5 import Qt - -from lib.helpers import timing -from PyQt5.QtCore import Qt, QTimer, QThread -from PyQt5.QtGui import QKeySequence, QPixmap, QPalette, QColor -from PyQt5.QtWidgets import QShortcut, QApplication -from ui.widget import Widget -from lib import db -from lib.db.models import Recipes - -class RFID(Widget): - def __init__(self, parent): - super().__init__() - self.parent=parent - self.recipe_db_model=Recipes - self.status_palettes = { - True: QPalette(), - "": QPalette(), - "warning": QPalette(), - False: QPalette(), - None: QPalette(), - } - self.status_palettes[True].setColor(QPalette.Base, Qt.green) - self.status_palettes[False].setColor(QPalette.Base, Qt.red) - self.status_palettes["warning"].setColor(QPalette.Base, QColor(255, 165, 0)) - self.status_palettes[""].setColor(QPalette.Base, QColor(255, 255, 0)) - - self.delay_timer = QTimer() - self.delay_timer.setSingleShot(True) - self.delay_timer.timeout.connect(self.reset_display) - - self.ok_timer = QTimer() - self.ok_timer.setSingleShot(True) - self.ok_timer.timeout.connect(self.set_recipe) - - def start(self, recipe=None, step=None, pieces=None): - - self.rfid_input_l.setPalette(self.status_palettes[None]) - self.rfid_input_l.setPlainText("") - - def get(self, data=None, override=False): - if not len(data): - data = None - if data is None: - return - else: - lines = data - if lines[0]=="ERRECINQUE RFID": - # RECIPE CODE FOUND - self.recipe=lines[1] - self.rfid_input_l.setPalette(self.status_palettes[True]) - self.ok_timer.start(2000) - - else: - # RECIPE CODE NOT FOUND - self.rfid_input_l.setPalette(self.status_palettes[False]) - self.instruction_text("FORMATO RFID DIMA NON VALIDO", "red") - self.delay_timer.start(3000) - - # LOOKUP RECIPE - - def set_recipe(self): - try: - recipe = self.recipe_db_model.get_by_id(self.recipe) - self.parent.set_recipe(recipe) - except peewee.DoesNotExist: - self.rfid_input_l.setPalette(self.status_palettes[False]) - self.instruction_text("RICETTA NON TROVATA","red") - self.delay_timer.start(3000) - - - def reset_display(self): - self.rfid_input_l.setFocus() - self.rfid_input_l.setPlainText("") - self.rfid_input_l.setPalette(self.status_palettes[""]) - self.instruction_text("INSERIRE IL CONNETTORE DI COLLEGAMENTO DIMA PER SELEZIONARE AUTOMATICAMENTE LA RICETTA DI COLLAUDO") - - def instruction_text(self,text,color=None): - if getattr(self.parent.centralWidget, "set_text"): - self.parent.centralWidget.set_text(text, color=color) - - diff --git a/src/ui/rfid_recipe_selection/rfid_recipe_selection.ui b/src/ui/rfid_recipe_selection/rfid_recipe_selection.ui deleted file mode 100644 index 2805d48..0000000 --- a/src/ui/rfid_recipe_selection/rfid_recipe_selection.ui +++ /dev/null @@ -1,95 +0,0 @@ - - - Test_Connector - - - - 0 - 0 - 1445 - 793 - - - - Test Connector - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 200 - 200 - - - - - 12 - - - - - - - - - - - - 600 - 0 - - - - - 600 - 200 - - - - - 20 - - - - 123 -456 -abc - - - - - - - - 20 - - - - TORNA ALLA TABELLA RICETTE - - - - - - - - diff --git a/src/ui/test/test.py b/src/ui/test/test.py index 01e374a..b76a47b 100755 --- a/src/ui/test/test.py +++ b/src/ui/test/test.py @@ -317,14 +317,14 @@ class Test(Widget): self.next_timer.start(0) if self.step.type == "done": self.archived = self.done() - self.next_timer.start(2000) + self.next_timer.start(1000) elif self.step.type == "print": compiled_label = self.print(self.archived, self.step.spec.get("template", "EtichettaR5")) self.archived.label = compiled_label self.archived.save() - self.next_timer.start(2000) + self.next_timer.start(1000) elif self.step.type == "wait": - self.next_timer.start(2000) + self.next_timer.start(1000) # UPDATE COUNT DISPLAY self.updaate_count_display() diff --git a/src/ui/test_leak/test_leak.py b/src/ui/test_leak/test_leak.py index 2b6cc78..f6324cd 100644 --- a/src/ui/test_leak/test_leak.py +++ b/src/ui/test_leak/test_leak.py @@ -30,6 +30,10 @@ class Test_Leak(Test_Test): dialog.setCentralWidget(Test_Instructions_Reminder(recipe=self.parent.recipe,bench_name=self.parent.config.machine_id)) dialog.show() + def reset(self): + self.components["tecna_t3"].stop_test() + super.reset() + def stop_test(self): self.components["tecna_t3"].stop_test() self.display_text(text="PROVA INTERROTTA", bg_color="yellow")