Merge remote-tracking branch 'origin/master'

config/label_templates/st-ten-7/MB1.prn

@@ -0,0 +1,38 @@
+CT~~CD,~CC^~CT~
+^XA
+~TA000
+~JSN
+^LT0
+^MNW
+^MTT
+^PON
+^PMN
+^LH0,0
+^JMA
+^PR2,2
+~SD15
+^JUS
+^LRN
+^CI27
+^PA0,1,1,0
+^XZ
+^XA
+^MMT
+^PW679
+^LL200
+^LS0
+^FT137,147^A0B,42,41^FH\^CI28^FDMB  1^FS^CI27
+^FO148,86^GB8,61,4^FS
+^FT394,147^A0B,42,41^FH\^CI28^FDMB  1^FS^CI27
+^FO405,86^GB8,61,4^FS
+^FT239,34^A0R,42,41^FH\^CI28^FDMB  1^FS^CI27
+^FO220,33^GB8,61,4^FS
+^FT504,34^A0R,42,41^FH\^CI28^FDMB  1^FS^CI27
+^FO485,33^GB8,61,4^FS
+^LRY^FO2,1^GB676,0,198^FS^LRN
+^LRY^FO100,33^GB56,0,53^FS^LRN
+^LRY^FO357,33^GB56,0,53^FS^LRN
+^LRY^FO220,94^GB56,0,53^FS^LRN
+^LRY^FO485,94^GB56,0,53^FS^LRN
+^PQ1,0,1,Y
+^XZ

config/label_templates/st-ten-7/MB2.prn

@@ -0,0 +1,38 @@
+CT~~CD,~CC^~CT~
+^XA
+~TA000
+~JSN
+^LT0
+^MNW
+^MTT
+^PON
+^PMN
+^LH0,0
+^JMA
+^PR2,2
+~SD15
+^JUS
+^LRN
+^CI27
+^PA0,1,1,0
+^XZ
+^XA
+^MMT
+^PW679
+^LL200
+^LS0
+^FT137,147^A0B,42,41^FH\^CI28^FDMB  2^FS^CI27
+^FO148,86^GB8,61,4^FS
+^FT394,147^A0B,42,41^FH\^CI28^FDMB  2^FS^CI27
+^FO405,86^GB8,61,4^FS
+^FT239,34^A0R,42,41^FH\^CI28^FDMB  2^FS^CI27
+^FO220,33^GB8,61,4^FS
+^FT504,34^A0R,42,41^FH\^CI28^FDMB  2^FS^CI27
+^FO485,33^GB8,61,4^FS
+^LRY^FO2,1^GB676,0,198^FS^LRN
+^LRY^FO100,33^GB56,0,53^FS^LRN
+^LRY^FO357,33^GB56,0,53^FS^LRN
+^LRY^FO220,94^GB56,0,53^FS^LRN
+^LRY^FO485,94^GB56,0,53^FS^LRN
+^PQ1,0,1,Y
+^XZ

config/label_templates/st-ten-7/MI1.prn

@@ -0,0 +1,38 @@
+CT~~CD,~CC^~CT~
+^XA
+~TA000
+~JSN
+^LT0
+^MNW
+^MTT
+^PON
+^PMN
+^LH0,0
+^JMA
+^PR2,2
+~SD15
+^JUS
+^LRN
+^CI27
+^PA0,1,1,0
+^XZ
+^XA
+^MMT
+^PW679
+^LL200
+^LS0
+^FT137,137^A0B,42,41^FH\^CI28^FDMI  1^FS^CI27
+^FO148,86^GB8,61,4^FS
+^FT394,137^A0B,42,41^FH\^CI28^FDMI  1^FS^CI27
+^FO405,86^GB8,61,4^FS
+^FT239,40^A0R,42,41^FH\^CI28^FDMI  1^FS^CI27
+^FO220,33^GB8,61,4^FS
+^FT506,44^A0R,42,41^FH\^CI28^FDMI  1^FS^CI27
+^FO487,35^GB8,61,4^FS
+^LRY^FO2,1^GB676,0,198^FS^LRN
+^LRY^FO100,33^GB56,0,53^FS^LRN
+^LRY^FO357,33^GB56,0,53^FS^LRN
+^LRY^FO220,94^GB56,0,53^FS^LRN
+^LRY^FO487,97^GB56,0,53^FS^LRN
+^PQ1,0,1,Y
+^XZ

config/label_templates/st-ten-7/MI2.prn

@@ -0,0 +1,38 @@
+CT~~CD,~CC^~CT~
+^XA
+~TA000
+~JSN
+^LT0
+^MNW
+^MTT
+^PON
+^PMN
+^LH0,0
+^JMA
+^PR2,2
+~SD15
+^JUS
+^LRN
+^CI27
+^PA0,1,1,0
+^XZ
+^XA
+^MMT
+^PW679
+^LL200
+^LS0
+^FT137,137^A0B,42,41^FH\^CI28^FDMI  2^FS^CI27
+^FO148,86^GB8,61,4^FS
+^FT394,137^A0B,42,41^FH\^CI28^FDMI  2^FS^CI27
+^FO405,86^GB8,61,4^FS
+^FT239,40^A0R,42,41^FH\^CI28^FDMI  2^FS^CI27
+^FO220,33^GB8,61,4^FS
+^FT506,44^A0R,42,41^FH\^CI28^FDMI  2^FS^CI27
+^FO487,35^GB8,61,4^FS
+^LRY^FO2,1^GB676,0,198^FS^LRN
+^LRY^FO100,33^GB56,0,53^FS^LRN
+^LRY^FO357,33^GB56,0,53^FS^LRN
+^LRY^FO220,94^GB56,0,53^FS^LRN
+^LRY^FO487,97^GB56,0,53^FS^LRN
+^PQ1,0,1,Y
+^XZ

config/label_templates/st-ten-7/RB1.prn

@@ -0,0 +1,38 @@
+CT~~CD,~CC^~CT~
+^XA
+~TA000
+~JSN
+^LT0
+^MNW
+^MTT
+^PON
+^PMN
+^LH0,0
+^JMA
+^PR2,2
+~SD15
+^JUS
+^LRN
+^CI27
+^PA0,1,1,0
+^XZ
+^XA
+^MMT
+^PW679
+^LL200
+^LS0
+^FT393,150^A0B,42,43^FH\^CI28^FDRB  1^FS^CI27
+^FO404,89^GB8,61,4^FS
+^FT138,150^A0B,42,43^FH\^CI28^FDRB  1^FS^CI27
+^FO149,89^GB8,61,4^FS
+^FT245,35^A0R,42,43^FH\^CI28^FDRB  1^FS^CI27
+^FO226,32^GB8,61,4^FS
+^FT501,35^A0R,42,43^FH\^CI28^FDRB  1^FS^CI27
+^FO484,32^GB8,61,4^FS
+^LRY^FO2,1^GB676,0,198^FS^LRN
+^LRY^FO356,32^GB56,0,56^FS^LRN
+^LRY^FO101,32^GB56,0,56^FS^LRN
+^LRY^FO226,94^GB56,0,56^FS^LRN
+^LRY^FO484,94^GB56,0,56^FS^LRN
+^PQ1,0,1,Y
+^XZ

config/label_templates/st-ten-7/RB2.prn

@@ -0,0 +1,38 @@
+CT~~CD,~CC^~CT~
+^XA
+~TA000
+~JSN
+^LT0
+^MNW
+^MTT
+^PON
+^PMN
+^LH0,0
+^JMA
+^PR2,2
+~SD15
+^JUS
+^LRN
+^CI27
+^PA0,1,1,0
+^XZ
+^XA
+^MMT
+^PW679
+^LL200
+^LS0
+^FT393,150^A0B,42,43^FH\^CI28^FDRB  2^FS^CI27
+^FO404,89^GB8,61,4^FS
+^FT138,150^A0B,42,43^FH\^CI28^FDRB  2^FS^CI27
+^FO149,89^GB8,61,4^FS
+^FT245,35^A0R,42,43^FH\^CI28^FDRB  2^FS^CI27
+^FO226,32^GB8,61,4^FS
+^FT501,35^A0R,42,43^FH\^CI28^FDRB  2^FS^CI27
+^FO484,32^GB8,61,4^FS
+^LRY^FO2,1^GB676,0,198^FS^LRN
+^LRY^FO356,32^GB56,0,56^FS^LRN
+^LRY^FO101,32^GB56,0,56^FS^LRN
+^LRY^FO226,94^GB56,0,56^FS^LRN
+^LRY^FO484,94^GB56,0,56^FS^LRN
+^PQ1,0,1,Y
+^XZ

config/label_templates/st-ten-7/RM1.prn

@@ -0,0 +1,38 @@
+CT~~CD,~CC^~CT~
+^XA
+~TA000
+~JSN
+^LT0
+^MNW
+^MTT
+^PON
+^PMN
+^LH0,0
+^JMA
+^PR2,2
+~SD15
+^JUS
+^LRN
+^CI27
+^PA0,1,1,0
+^XZ
+^XA
+^MMT
+^PW679
+^LL200
+^LS0
+^FT139,151^A0B,42,43^FH\^CI28^FDRM  1^FS^CI27
+^FO149,85^GB8,66,4^FS
+^FT245,26^A0R,42,43^FH\^CI28^FDRM  1^FS^CI27
+^FO226,29^GB8,66,4^FS
+^FT397,151^A0B,42,43^FH\^CI28^FDRM  1^FS^CI27
+^FO407,85^GB8,66,4^FS
+^FT503,26^A0R,42,43^FH\^CI28^FDRM  1^FS^CI27
+^FO484,29^GB8,66,4^FS
+^LRY^FO2,1^GB676,0,198^FS^LRN
+^LRY^FO101,29^GB56,0,56^FS^LRN
+^LRY^FO226,95^GB56,0,56^FS^LRN
+^LRY^FO359,29^GB56,0,56^FS^LRN
+^LRY^FO484,95^GB56,0,56^FS^LRN
+^PQ1,0,1,Y
+^XZ

config/label_templates/st-ten-7/RM2.prn

@@ -0,0 +1,38 @@
+CT~~CD,~CC^~CT~
+^XA
+~TA000
+~JSN
+^LT0
+^MNW
+^MTT
+^PON
+^PMN
+^LH0,0
+^JMA
+^PR2,2
+~SD15
+^JUS
+^LRN
+^CI27
+^PA0,1,1,0
+^XZ
+^XA
+^MMT
+^PW679
+^LL200
+^LS0
+^FT139,151^A0B,42,43^FH\^CI28^FDRM  2^FS^CI27
+^FO149,85^GB8,66,4^FS
+^FT245,26^A0R,42,43^FH\^CI28^FDRM  2^FS^CI27
+^FO226,29^GB8,66,4^FS
+^FT397,151^A0B,42,43^FH\^CI28^FDRM  2^FS^CI27
+^FO407,85^GB8,66,4^FS
+^FT503,26^A0R,42,43^FH\^CI28^FDRM  2^FS^CI27
+^FO484,29^GB8,66,4^FS
+^LRY^FO2,1^GB676,0,198^FS^LRN
+^LRY^FO101,29^GB56,0,56^FS^LRN
+^LRY^FO226,95^GB56,0,56^FS^LRN
+^LRY^FO359,29^GB56,0,56^FS^LRN
+^LRY^FO484,95^GB56,0,56^FS^LRN
+^PQ1,0,1,Y
+^XZ

designer.sh

@@ -1,7 +1 @@
-#!/bin/bash -x
+pyqt5-tools designer
-cd "$(dirname "$0")"
-source "./venv/bin/activate" || source "./venv/Scripts/activate" || :
-#python3 -m pip install --upgrade qt5-tools
-#"$(python3 -c "import sys; print(sys.path[-1])")/qt5_applications/Qt/bin/designer" $*
-$(pwd)/venv/lib/python3.9/site-packages/qt5_applications/Qt/bin/designer $*
-#$(pwd)/venv/lib/python3.8/site-packages/qt5_applications/Qt/bin/designer $*

src/components/os_label_printer.py

@@ -34,8 +34,15 @@ class Os_Label_Printer(Component):
     def print_label(self, template, context=None):
         if context is None:
             context = {}
+        custom_label_folder=f"config/label_templates/{str(self.config.machine_id)}/"
+        standard_label_folder=f"config/label_templates/"
+        if os.path.exists(custom_label_folder):
+            label_folder = custom_label_folder
+        else:
+            label_folder = standard_label_folder
+        label_path = label_folder+str(template)
         # LOAD LABEL TEMPLATE
-        with open(f"config/label_templates/{str(template)}", "r", errors="surrogateescape", encoding='iso-8859-1') as f:
+        with open(label_path, "r", errors="surrogateescape", encoding='iso-8859-1') as f:
             label_file_contents = f.read()
         # LABEL PRINT
         #label = label.format(**context)
@@ -64,16 +71,14 @@ class Os_Label_Printer(Component):
                 label_file = "tmp/label.prn"
                 with open(label_file, "w", errors="surrogateescape") as f:
                     f.write(label_file_contents)
-                if self.platform == "windows":
+                if platform.system().lower() == "windows":
                     cmd = f'print /d:"{self.printer}" "{label_file}"'
-                elif self.platform == "cups":
-                    cmd = f'lp -d "{self.printer}" "{label_file}"'
                 else:
-                    raise NotImplementedError(f"platform {self.platform!r} is not supported")
+                    cmd = f'lp -d "{self.printer}" "{label_file}"'
                 if not self.simulate:
                     p = subprocess.run(cmd, stderr=subprocess.STDOUT, stdout=subprocess.PIPE, shell=True)  # unsafe
                     if p.returncode != 0:
-                        self.log.exception(f"failed to print: returncode: {p.returncode}\noutput:\n{p.stdout}")
+                        self.log.exception(f"failed to print: return code: {p.returncode}\noutput:\n{p.stdout}")
                         QMessageBox.critical(
                             None,
                             "Errore Stampante",

src/ui/rfid_recipe_selection/__init__.py

@@ -1 +0,0 @@
-from .rfid_recipe_selection import RFID_Recipe_Selection

src/ui/rfid_recipe_selection/rfid_recipe_selection.py

@@ -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)
-
-

src/ui/rfid_recipe_selection/rfid_recipe_selection.ui

@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Test_Connector</class>
- <widget class="QWidget" name="Test_Connector">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>1445</width>
-    <height>793</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Test Connector</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item row="2" column="0" alignment="Qt::AlignHCenter">
-    <widget class="QLabel" name="state_l">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>200</width>
-       <height>200</height>
-      </size>
-     </property>
-     <property name="font">
-      <font>
-       <pointsize>12</pointsize>
-      </font>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" alignment="Qt::AlignHCenter">
-    <widget class="QPlainTextEdit" name="barcode_input_l">
-     <property name="minimumSize">
-      <size>
-       <width>600</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>600</width>
-       <height>200</height>
-      </size>
-     </property>
-     <property name="font">
-      <font>
-       <pointsize>20</pointsize>
-      </font>
-     </property>
-     <property name="plainText">
-      <string>123
-456
-abc</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0" alignment="Qt::AlignHCenter">
-    <widget class="QPushButton" name="recipe_selection_b">
-     <property name="font">
-      <font>
-       <pointsize>20</pointsize>
-      </font>
-     </property>
-     <property name="text">
-      <string>TORNA ALLA TABELLA RICETTE</string>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

src/ui/test/test.py

@@ -128,6 +128,7 @@ class Test(Widget):
         # CONNECT CYCLE CONTROLS
         self.cancel_b.clicked.connect(self.fail_cycle)
         self.change_recipe_b.clicked.connect(self.change_recipe)
+        self.reset_count_b.clicked.connect(self.reset_count)
         for step_name, w in self.cycle_available_steps.items():
             if hasattr(w, "ok"):
                 # custom ok handlers should call next again
@@ -316,15 +317,24 @@ 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 PIECES DISPLAY
+        # UPDATE COUNT DISPLAY
+        self.updaate_count_display()
+
+    def count_reset(self):
+        # COUNT RESET
+        self.pieces["ok"] = 0
+        self.pieces["ko"] = 0
+        self.updaate_count_display()
+
+    def updaate_count_display(self):
         self.pieces_count_l.setText(f"{self.pieces['ok']} OK / {self.pieces['ko']} NOK / {sum(self.pieces.values())} TOT")
 
     def set_recipe(self, recipe=None):

src/ui/test/test.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1252</width>
-    <height>146</height>
+    <height>125</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -19,7 +19,6 @@
      <property name="font">
       <font>
        <pointsize>12</pointsize>
-       <weight>75</weight>
        <bold>true</bold>
       </font>
      </property>
@@ -52,40 +51,7 @@
       <property name="bottomMargin">
        <number>3</number>
       </property>
-      <item row="1" column="9">
+      <item row="1" column="12" rowspan="2">
-       <widget class="QLabel" name="label_7">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="font">
-         <font>
-          <pointsize>12</pointsize>
-          <weight>75</weight>
-          <bold>true</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>N. DISEGNO:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="4" rowspan="2">
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="1" column="11" rowspan="2">
        <spacer name="horizontalSpacer_3">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -101,174 +67,48 @@
         </property>
        </spacer>
       </item>
-      <item row="2" column="2">
+      <item row="2" column="10">
-       <widget class="QLabel" name="autotests_l">
+       <widget class="QLabel" name="label_6">
         <property name="font">
          <font>
           <pointsize>12</pointsize>
-          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
         <property name="text">
-         <string>PROSSIMO AUTOTEST:</string>
+         <string>OPERATORE:</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
         </property>
        </widget>
       </item>
-      <item row="1" column="7">
+      <item row="2" column="11">
-       <widget class="QLabel" name="label_9">
+       <widget class="QLabel" name="user_l">
         <property name="font">
          <font>
           <pointsize>12</pointsize>
-          <weight>75</weight>
-          <bold>true</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>PEZZI FATTI</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" rowspan="2">
-       <widget class="QPushButton" name="cancel_b">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>200</width>
-          <height>40</height>
-         </size>
-        </property>
-        <property name="font">
-         <font>
-          <pointsize>12</pointsize>
-          <weight>75</weight>
-          <bold>true</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>ANNULLA TEST</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" colspan="12">
-       <widget class="QLabel" name="machine_description_l">
-        <property name="font">
-         <font>
-          <pointsize>16</pointsize>
-          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
         <property name="text">
          <string>-</string>
         </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="5" rowspan="2">
-       <widget class="QLabel" name="time_l">
-        <property name="font">
-         <font>
-          <pointsize>12</pointsize>
-          <weight>75</weight>
-          <bold>true</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>12345
-567</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
        </widget>
       </item>
       <item row="1" column="10">
-       <widget class="QLabel" name="recipe_l">
+       <widget class="QLabel" name="label_7">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="minimumSize">
-         <size>
-          <width>150</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>20</width>
-          <height>16777215</height>
-         </size>
-        </property>
         <property name="font">
          <font>
           <pointsize>12</pointsize>
-          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
         <property name="text">
-         <string>-</string>
+         <string>N. DISEGNO:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="8" rowspan="2">
-       <spacer name="horizontalSpacer_4">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="2" column="7">
-       <widget class="QLabel" name="pieces_count_l">
-        <property name="font">
-         <font>
-          <pointsize>12</pointsize>
-          <weight>75</weight>
-          <bold>true</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>12345</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="9">
-       <widget class="QLabel" name="label_6">
-        <property name="font">
-         <font>
-          <pointsize>12</pointsize>
-          <weight>75</weight>
-          <bold>true</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>OPERATORE:</string>
         </property>
        </widget>
       </item>
@@ -295,7 +135,6 @@
         <property name="font">
          <font>
           <pointsize>12</pointsize>
-          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
@@ -304,17 +143,133 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="2">
+      <item row="2" column="2">
-       <widget class="QLabel" name="time_l_2">
+       <widget class="QLabel" name="autotests_l">
         <property name="font">
          <font>
           <pointsize>12</pointsize>
-          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
         <property name="text">
-         <string>ULTIMO AUTOTEST:</string>
+         <string>PROSSIMO AUTOTEST:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="4" rowspan="2">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="1" column="1" rowspan="2">
+       <widget class="QPushButton" name="cancel_b">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>200</width>
+          <height>40</height>
+         </size>
+        </property>
+        <property name="font">
+         <font>
+          <pointsize>12</pointsize>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>ANNULLA TEST</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="11">
+       <widget class="QLabel" name="recipe_l">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>150</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>20</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="font">
+         <font>
+          <pointsize>12</pointsize>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="7">
+       <widget class="QLabel" name="pieces_count_l">
+        <property name="font">
+         <font>
+          <pointsize>12</pointsize>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>12345</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" colspan="13">
+       <widget class="QLabel" name="machine_description_l">
+        <property name="font">
+         <font>
+          <pointsize>16</pointsize>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>-</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QLabel" name="last_at_l">
+        <property name="font">
+         <font>
+          <pointsize>12</pointsize>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>-</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
@@ -334,31 +289,62 @@
         </property>
        </spacer>
       </item>
-      <item row="2" column="10">
+      <item row="1" column="5" rowspan="2">
-       <widget class="QLabel" name="user_l">
+       <widget class="QLabel" name="time_l">
         <property name="font">
          <font>
           <pointsize>12</pointsize>
-          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
         <property name="text">
-         <string>-</string>
+         <string>12345
+567</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
         </property>
        </widget>
       </item>
-      <item row="1" column="3">
+      <item row="1" column="9" rowspan="2">
-       <widget class="QLabel" name="last_at_l">
+       <spacer name="horizontalSpacer_4">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="1" column="7">
+       <widget class="QLabel" name="label_9">
         <property name="font">
          <font>
           <pointsize>12</pointsize>
-          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
         <property name="text">
-         <string>-</string>
+         <string>PEZZI FATTI</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QLabel" name="time_l_2">
+        <property name="font">
+         <font>
+          <pointsize>12</pointsize>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>ULTIMO AUTOTEST:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
@@ -370,7 +356,6 @@
         <property name="font">
          <font>
           <pointsize>12</pointsize>
-          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
@@ -382,6 +367,21 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="8" rowspan="2">
+       <widget class="QPushButton" name="reset_cont_b">
+        <property name="font">
+         <font>
+          <family>DejaVu Sans</family>
+          <pointsize>11</pointsize>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>AZZERA
+CONTATORE</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>

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")