From 575c4b1daa7eaa1e8f6d40aa8f621100f9a30cb8 Mon Sep 17 00:00:00 2001 From: germano2239 Date: Thu, 17 Nov 2022 17:26:11 +0100 Subject: [PATCH 1/5] std label tbt --- .../label_designs/STANDARD/EtichettaR5.nlbl | Bin 0 -> 4469 bytes config/label_templates/EtichettaR5.prn | 76 +++++++++--------- 2 files changed, 38 insertions(+), 38 deletions(-) create mode 100644 config/label_designs/STANDARD/EtichettaR5.nlbl diff --git a/config/label_designs/STANDARD/EtichettaR5.nlbl b/config/label_designs/STANDARD/EtichettaR5.nlbl new file mode 100644 index 0000000000000000000000000000000000000000..0769605046d05a8a5ebbb245c083f4510d887674 GIT binary patch literal 4469 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 IWPfk}11{@Zb^rhX literal 0 HcmV?d00001 diff --git a/config/label_templates/EtichettaR5.prn b/config/label_templates/EtichettaR5.prn index 3924cc2..cf1999f 100644 --- a/config/label_templates/EtichettaR5.prn +++ b/config/label_templates/EtichettaR5.prn @@ -1,42 +1,42 @@ CT~~CD,~CC^~CT~ -^LR -^XA~TA000~JSN^LT0^MNW^MTT^PON^PMN^LH0,0^JMA^PR4,4~SD15^JUS^LRN^CI0^XZ +^XA +~TA000 +~JSN +^LT0 +^MNW +^MTT +^PON +^PMN +^LH0,0 +^JMA +^PR2,2 +~SD20 +^JUS +^LRN +^CI27 +^PA0,1,1,0 +^XZ ^XA ^MMT -^PW352 -^LL1071 +^PW320 +^LL1119 ^LS0 -^FT32,94^A0N,23,24^FH\^FDNumero Disegno^FS -^FT39,240^A0N,20,19^FH\^FD{PART}{MO}{YY}{SN5}^FS -^FT39,291^A0N,20,19^FH\^FDN. Pezzo:^FS -^FT36,318^A0N,20,19^FH\^FD{DATETIME}^FS -^FT42,359^A0N,20,19^FH\^FDTurno:^FS -^FT44,386^A0N,20,19^FH\^FDStazione^FS -^FT41,413^A0N,20,19^FH\^FDOperatore:^FS -^FT32,520^A0N,20,19^FH\^FDPress Max (bar)^FS -^FT32,547^A0N,20,19^FH\^FDPress Min (bar)^FS -^FT32,574^A0N,20,19^FH\^FDCaduta (bar)^FS -^FT34,628^A0N,20,19^FH\^FDT Riempimento (sec)^FS -^FT34,655^A0N,20,19^FH\^FDT Stabilizzazione (sec)^FS -^FT34,682^A0N,20,19^FH\^FDT Prova (sec)^FS -^FT34,709^A0N,20,19^FH\^FDCaduta Tollerata^FS -^FT34,736^A0N,20,19^FH\^FDmax (Bar)^FS -^FT34,763^A0N,20,19^FH\^FDPress Min Prova (Bar)^FS -^FT136,291^A0N,20,19^FH\^FD{SN}^FS -^FT145,359^A0N,20,19^FH\^FD{SHIFT}^FS -^FT138,413^A0N,20,19^FH\^FD{OPERATOR}^FS -^FT184,520^A0N,20,19^FH\^FD{PMAX}^FS -^FT184,547^A0N,20,19^FH\^FD{PMIN}^FS -^FT185,574^A0N,20,19^FH\^FD{RESLEAK}^FS -^FT257,628^A0N,20,19^FH\^FD{TFILL}^FS -^FT257,655^A0N,20,19^FH\^FD{TSET}^FS -^FT257,682^A0N,20,19^FH\^FD{TTEST}^FS -^FT257,736^A0N,20,19^FH\^FD{PMAX}^FS -^FT257,763^A0N,20,19^FH\^FD{PMIN}^FS -^FT138,386^A0N,20,19^FH\^FD{STATION}^FS -^BY80,80^FT42,196^BXN,5,200,0,0,1,~ -^FH\^FD{PART}{MO}{YY}{SN5}^FS -^FT56,906^A0N,36,36^FH\^FD{RESULT_L2}^FS -^FT56,868^A0N,36,36^FH\^FD{RESULT_L1}^FS -^FO32,454^GB292,0,8^FS -^PQ1,0,1,Y^XZ +^FT33,86^A0N,45,46^FH\^CI28^FDERRECINQUE^FS^CI27 +^BY2,3,56^FT44,310^BCN,,N,N +^FH\^FD>:{PART}^FS +^FT15,347^A0N,31,30^FH\^CI28^FDPart number:^FS^CI27 +^FT15,427^A0N,31,30^FH\^CI28^FD{PART}^FS^CI27 +^FT17,136^A0N,17,18^FH\^CI28^FDVia Meucci 31/A - 10079 Mappano(TO)^FS^CI27 +^FT53,193^A0N,39,38^FH\^CI28^FDFPT^FS^CI27 +^FT53,235^A0N,39,38^FH\^CI28^FDLEAK TEST^FS^CI27 +^FT15,387^A0N,31,30^FH\^CI28^FD{DESCRIPTION}^FS^CI27 +^FT15,740^A0N,31,30^FH\^CI28^FDSequential number:^FS^CI27 +^FT15,779^A0N,31,30^FH\^CI28^FD{SN5}^FS^CI27 +^FT15,856^A0N,17,18^FH\^CI28^FD{DD}/{MM}/{YY}^FS^CI27 +^FT161,856^A0N,17,18^FH\^CI28^FD{HH}:{MI}:{SS}^FS^CI27 +^FT17,1081^A0N,31,30^FH\^CI28^FDESITO:^FS^CI27 +^FT143,1081^A0N,31,30^FH\^CI28^FDCONFORME^FS^CI27 +^FT15,934^A0N,25,25^FH\^CI28^FDOperatore^FS^CI27 +^FT15,967^A0N,25,25^FH\^CI28^FD{OPERATOR}^FS^CI27 +^PQ1,0,1,Y +^XZ From 348595bd1009a10d893f4ba8c095b4c6fe958056 Mon Sep 17 00:00:00 2001 From: germano Date: Tue, 22 Nov 2022 20:03:39 +0100 Subject: [PATCH 2/5] csv_extract_resistance.py --- src/scripts/csv_extract_resistance.py | 34 +++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 src/scripts/csv_extract_resistance.py diff --git a/src/scripts/csv_extract_resistance.py b/src/scripts/csv_extract_resistance.py new file mode 100644 index 0000000..ba7bb5e --- /dev/null +++ b/src/scripts/csv_extract_resistance.py @@ -0,0 +1,34 @@ +import csv +import json + +file="data-1669138089418" +with open(f"tmp/{file}.csv",) as csv_file: + csv_reader = csv.reader(csv_file, delimiter=',') + + with open(f'tmp/{file}_out.csv', 'w') as csv_out: + + # create the csv writer + writer = csv.writer(csv_out) + + line_count = 0 + for row in csv_reader: + if line_count == 0: + print(f'Column names are {", ".join(row)}') + row.append("res misurata") + row.append("res attesa") + line_count += 1 + writer.writerow(row) + else: + data=json.loads(row[1]) + if "resistance" in data.keys(): + res=data["resistance"]["0"]["results"]["result"] + exp=data["resistance"]["0"]["step"]["spec"]["expected"] + resstr=f'{res:.3f}' + expstr = f'{exp:.3f}' + print(f'res={resstr} exp={expstr}') + line_count += 1 + row.append(resstr) + row.append(expstr) + writer.writerow(row) + + print(f'Processed {line_count} lines.') \ No newline at end of file From a8b2c6f7c8eb2034154b4ab094d605b25299c492 Mon Sep 17 00:00:00 2001 From: germano Date: Tue, 22 Nov 2022 23:06:24 +0100 Subject: [PATCH 3/5] fix --- src/scripts/csv_extract_resistance.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/csv_extract_resistance.py b/src/scripts/csv_extract_resistance.py index ba7bb5e..1d58420 100644 --- a/src/scripts/csv_extract_resistance.py +++ b/src/scripts/csv_extract_resistance.py @@ -8,7 +8,7 @@ with open(f"tmp/{file}.csv",) as csv_file: with open(f'tmp/{file}_out.csv', 'w') as csv_out: # create the csv writer - writer = csv.writer(csv_out) + writer = csv.writer(csv_out, lineterminator="\n") line_count = 0 for row in csv_reader: From 39cb67382465d7a345f42579fa6b4c5ac27f268b Mon Sep 17 00:00:00 2001 From: gg Date: Tue, 29 Nov 2022 16:54:01 +0100 Subject: [PATCH 4/5] support non avx cpu, csv_extract_resistance.py --- .gitignore | 1 + runme_custom.sh | 4 ++++ src/components/__init__.py | 5 ++++- src/main.py | 11 ++++++++--- 4 files changed, 17 insertions(+), 4 deletions(-) create mode 100755 runme_custom.sh diff --git a/.gitignore b/.gitignore index d3a72f2..0de428e 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ __pycache__/ /src/lib/db/*imports*/ /tmp/ /venv*/ +runme_custom.sh diff --git a/runme_custom.sh b/runme_custom.sh new file mode 100755 index 0000000..bd9a5cb --- /dev/null +++ b/runme_custom.sh @@ -0,0 +1,4 @@ +#!/bin/bash -e +cd "$(dirname "$0")" +source "./venv/bin/activate" || source "./venv/Scripts/activate" || : +python -O "./src/main.py" --no-edgetpu --no-tflite $* diff --git a/src/components/__init__.py b/src/components/__init__.py index b19b0f1..16f3aa6 100644 --- a/src/components/__init__.py +++ b/src/components/__init__.py @@ -1,3 +1,5 @@ +import sys + from .archive_synchronizer import ArchiveSynchronizer from .consumer import Consumer from .galaxy_camera import GalaxyCamera @@ -11,5 +13,6 @@ from .tecna_marposs_provaset_t3 import TecnaMarpossProvasetT3 from .tecna_screwdriver import TecnaScrewdriver from .test_component import TestComponent from .uvc_camera import UVCCamera -from .vision import Vision +if "--vision" in sys.argv: + from .vision import Vision from .vision_saver import VisionSaver diff --git a/src/main.py b/src/main.py index c23e80a..9cb7b16 100644 --- a/src/main.py +++ b/src/main.py @@ -55,13 +55,16 @@ try: from components import (ArchiveSynchronizer, GalaxyCamera, Multicomp730424, NeoPixels, Os_Label_Printer, RemoteAPI, TecnaMarpossProvasetT3, TecnaScrewdriver, - UVCCamera, Vision, VisionSaver) + UVCCamera, VisionSaver) from lib.db import Users from lib.helpers import ConfigReader from PyQt5.QtCore import QObject, QThread, pyqtSignal from PyQt5.QtWidgets import QApplication, QMessageBox from ui import About, Archive, Login, Main_Window, Test, Users_Management + if "--vision" in sys.argv: + from components import Vision + class Main(QObject): do = pyqtSignal(dict) @@ -87,9 +90,11 @@ try: "screwdriver": {"c": TecnaScrewdriver, "k": {"paused": True}}, "tecna_t3": {"c": TecnaMarpossProvasetT3, "k": {"paused": True}}, "uvc_camera": {"c": UVCCamera, "k": {"paused": True}}, - "vision_saver": {"c": VisionSaver, "t": False}, - "vision": {"c": Vision, "k": {"paused": True}}, + "vision_saver": {"c": VisionSaver, "t": False} } + if "--vision" in sys.argv: + self.components_specs["vision"] = {"c": Vision, "k": {"paused": True}} + for component_name in list(self.components_specs): if self.config.get("hardware_config", {}).get(component_name, None) != "present": self.components_specs.pop(component_name, None) From 8d5464110be0bb6c0f7c38062d3e3f7987057661 Mon Sep 17 00:00:00 2001 From: gg Date: Tue, 29 Nov 2022 16:54:12 +0100 Subject: [PATCH 5/5] support non avx cpu, csv_extract_resistance.py --- src/scripts/csv_extract_resistance.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/csv_extract_resistance.py b/src/scripts/csv_extract_resistance.py index 1d58420..3323b01 100644 --- a/src/scripts/csv_extract_resistance.py +++ b/src/scripts/csv_extract_resistance.py @@ -1,7 +1,7 @@ import csv import json -file="data-1669138089418" +file="data" with open(f"tmp/{file}.csv",) as csv_file: csv_reader = csv.reader(csv_file, delimiter=',')