From 34a740e4e5bc94d2f1cc09d4cec2fd32673d33fc Mon Sep 17 00:00:00 2001 From: stten6 Date: Fri, 17 Feb 2023 17:38:03 +0100 Subject: [PATCH 1/2] stten6 ok --- config/machine_settings/defaults.ini | 4 ++-- config/machine_settings/st-ten-6.ini | 23 +++++++++++++------ .../csv_import/test_doppia_prova_tenuta.csv | 6 ++--- src/ui/recipe_selection/recipe_selection.py | 11 +++++---- .../recipe_spec_and_step_editor.py | 4 ++-- src/ui/steps_management/steps_management.py | 6 +++-- src/ui/test/test.py | 22 ++++++++++-------- 7 files changed, 45 insertions(+), 31 deletions(-) diff --git a/config/machine_settings/defaults.ini b/config/machine_settings/defaults.ini index 1c2529d..532cd6c 100644 --- a/config/machine_settings/defaults.ini +++ b/config/machine_settings/defaults.ini @@ -124,7 +124,7 @@ percentuale_minima_pressione_assestamento: 5 percentuale_massima_pressione_assestamento: 5 tempo_di_test: 10 pressione_di_test_delta_minimo: 30 -pressione_di_test: 15000 +pressione_di_test: 1111 pressione_di_test_delta_massimo: 30 tempo_svuotamento: 1 pressione_svuotamento: 100 @@ -138,7 +138,7 @@ percentuale_minima_pressione_assestamento_2: 5 percentuale_massima_pressione_assestamento_2: 5 tempo_di_test_2: 5 pressione_di_test_delta_minimo_2: 200 -pressione_di_test_2: 1000 +pressione_di_test_2: 2222 pressione_di_test_delta_massimo_2: 200 tempo_svuotamento_2: 1 pressione_svuotamento_2: 100 diff --git a/config/machine_settings/st-ten-6.ini b/config/machine_settings/st-ten-6.ini index a2a6ee5..62fa940 100644 --- a/config/machine_settings/st-ten-6.ini +++ b/config/machine_settings/st-ten-6.ini @@ -2,7 +2,7 @@ description = ST-TEN-6 DOPPIA PROVA PRESSIONE 6/20 BAR [hardware_config] -archive_synchronizer: absent +archive_synchronizer: present ; galaxy_camera: present uvc_camera: present label_printer: present @@ -27,13 +27,19 @@ recipe_name_field: codice_ricetta part_number_field: codice_prodotto label_template_field: modello_etichetta description_field: descrizione + +[recipes_defaults] +dimensione_lotto_abilitata: tempo_pre_riempimento: 0 pressione_pre_riempimento: 1000 -tempo_riempimento: 10 -tempo_assestamento: 12 +#tempo_riempimento: 10 +#tempo_assestamento: 12 +#tempo_di_test: 10 +tempo_riempimento: 2 +tempo_assestamento: 3 +tempo_di_test: 4 percentuale_minima_pressione_assestamento: 5 percentuale_massima_pressione_assestamento: 5 -tempo_di_test: 10 pressione_di_test_delta_minimo: 30 pressione_di_test: 7000 pressione_di_test_delta_massimo: 30 @@ -43,11 +49,14 @@ config_elettrovalvole: 0 prova_tenuta_abilitata_2: x tempo_pre_riempimento_2: 0 pressione_pre_riempimento_2: 1000 -tempo_riempimento_2: 10 -tempo_assestamento_2: 12 +#tempo_riempimento_2: 10 +#tempo_assestamento_2: 12 +#tempo_di_test_2: 10 +tempo_riempimento_2: 5 +tempo_assestamento_2: 6 +tempo_di_test_2: 7 percentuale_minima_pressione_assestamento_2: 5 percentuale_massima_pressione_assestamento_2: 5 -tempo_di_test_2: 10 pressione_di_test_delta_minimo_2: 30 pressione_di_test_2: 15000 pressione_di_test_delta_massimo_2: 30 diff --git a/src/test/csv_import/test_doppia_prova_tenuta.csv b/src/test/csv_import/test_doppia_prova_tenuta.csv index 643b1c3..7a7fa73 100644 --- a/src/test/csv_import/test_doppia_prova_tenuta.csv +++ b/src/test/csv_import/test_doppia_prova_tenuta.csv @@ -1,3 +1,3 @@ -codice_ricetta,codice_prodotto,cliente,descrizione,prova_tenuta_abilitata,prova_tenuta_abilitata_2,config_elettrovalvole,config_elettrovalvole_2 -5802820548,5802820548,IVECO,Tubo doppio,x,x,0,1 -5802820549,5802820549,IVECO,Tubo singolo,x,,0,1 +codice_ricetta,codice_prodotto,cliente,descrizione,prova_tenuta_abilitata,prova_tenuta_abilitata_2,config_elettrovalvole,config_elettrovalvole_2,modello_etichetta +5802820548,5802820548,IVECO,Tubo doppio,x,x,0,1,EtichettaR5_Montaggio_2prove.prn +5802820549,5802820549,IVECO,Tubo singolo,x,,0,1,EtichettaR5_Montaggio.prn diff --git a/src/ui/recipe_selection/recipe_selection.py b/src/ui/recipe_selection/recipe_selection.py index 7f1f1ea..6410378 100755 --- a/src/ui/recipe_selection/recipe_selection.py +++ b/src/ui/recipe_selection/recipe_selection.py @@ -91,8 +91,8 @@ class Recipe_Selection(Widget): "resistance": len(self.config.get("recipes_defaults", noner)["verifica_resistenza_connettore_abilitata"]) and "resistance" not in self.unsupported_steps, "screws": len(self.config.get("recipes_defaults", noner)["avvitatura_abilitata"]) and "screws" not in self.unsupported_steps, "instruction": len(self.config.get("recipes_defaults", noner)["istruzione_abilitata"]) and "instruction" not in self.unsupported_steps, - "leak_1": len(self.config.get("recipes_defaults", noner)["prova_tenuta_abilitata"]) and "leak" not in self.unsupported_steps, - "leak_2": len(self.config.get("recipes_defaults", noner)["prova_tenuta_abilitata_2"]) and "leak" not in self.unsupported_steps, + "leak_1": len(self.config.get("recipes_defaults", noner)["prova_tenuta_abilitata"]) and "leak_1" not in self.unsupported_steps, + "leak_2": len(self.config.get("recipes_defaults", noner)["prova_tenuta_abilitata_2"]) and "leak_2" not in self.unsupported_steps, "vision": len(self.config.get("recipes_defaults", noner)["test_visione_abilitato"]) and "vision" not in self.unsupported_steps, "print": len(self.config.get("recipes_defaults", noner)["stampa_etichetta_abilitata"]) and "print" not in self.unsupported_steps, "step_editors": step_defaults, @@ -297,7 +297,8 @@ class Recipe_Selection(Widget): recipe_is_new = True for step_name, step_spec in steps_specs.items(): step = steps[step_name] - step.type = re.sub(r"^(.*)_[0-9]+$", r"\1", step_name) + #step.type = re.sub(r"^(.*)_[0-9]+$", r"\1", step_name) + step.type = step_name step.spec = step_spec if recipe_is_new: step.save(force_insert=True) @@ -313,8 +314,8 @@ class Recipe_Selection(Widget): "resistance": len(row.get("verifica_resistenza_connettore_abilitata", defaults["verifica_resistenza_connettore_abilitata"])) and "resistance" not in self.unsupported_steps, "screws": len(row.get("avvitatura_abilitata", defaults["avvitatura_abilitata"])) and "screws" not in self.unsupported_steps, "instruction": len(row.get("istruzione_abilitata", defaults["istruzione_abilitata"])) and "instruction" not in self.unsupported_steps, - "leak_1": len(row.get("prova_tenuta_abilitata", defaults["prova_tenuta_abilitata"])) and "leak" not in self.unsupported_steps, - "leak_2": len(row.get("prova_tenuta_abilitata_2", defaults["prova_tenuta_abilitata_2"])) and "leak" not in self.unsupported_steps, + "leak_1": len(row.get("prova_tenuta_abilitata", defaults["prova_tenuta_abilitata"])) and "leak_1" not in self.unsupported_steps, + "leak_2": len(row.get("prova_tenuta_abilitata_2", defaults["prova_tenuta_abilitata_2"])) and "leak_2" not in self.unsupported_steps, "vision": len(row.get("test_visione_abilitato", defaults["test_visione_abilitato"])) and "vision" not in self.unsupported_steps, "print": len(row.get("stampa_etichetta_abilitata", defaults["stampa_etichetta_abilitata"])) and "print" not in self.unsupported_steps, "steps": [], # should be pks of the enabled steps diff --git a/src/ui/recipe_spec_and_step_editor/recipe_spec_and_step_editor.py b/src/ui/recipe_spec_and_step_editor/recipe_spec_and_step_editor.py index 70d08c8..bf30dac 100644 --- a/src/ui/recipe_spec_and_step_editor/recipe_spec_and_step_editor.py +++ b/src/ui/recipe_spec_and_step_editor/recipe_spec_and_step_editor.py @@ -59,14 +59,14 @@ class Recipe_Spec_And_Step_Editor(Editor): "tab": self.instruction_t, }, "leak_1": { - "type": "leak", + "type": "leak_1", "enable": self.leak_enabled_1_cb, "widget": "leak_editor_1_w", "editor": Leak_Step_Editor(), "tab": self.leak_1_t, }, "leak_2": { - "type": "leak", + "type": "leak_2", "enable": self.leak_enabled_2_cb, "widget": "leak_editor_2_w", "editor": Leak_Step_Editor(), diff --git a/src/ui/steps_management/steps_management.py b/src/ui/steps_management/steps_management.py index b5f3d2c..7a46c20 100644 --- a/src/ui/steps_management/steps_management.py +++ b/src/ui/steps_management/steps_management.py @@ -13,7 +13,8 @@ class Step_Spec_JEDECW(QPushButton, Cell): def __init__(self, action=None, readonly=True, autocomplete=None, field_name=None, field_alias=None, field=None, row_number=None, crud=None): self.editors = { "vision": Vision_Step_Editor(cell_widget=self), - "leak": Leak_Step_Editor(cell_widget=self), + "leak_1": Leak_Step_Editor(cell_widget=self), + "leak_2": Leak_Step_Editor(cell_widget=self), } self.editor = None self.editor_type = None @@ -75,7 +76,8 @@ class Steps_Management(Widget): fields_aliases=crud_aliases, autocomplete={ "type": [ - "leak", + "leak_1", + "leak_2", "vision", ], "spec": { diff --git a/src/ui/test/test.py b/src/ui/test/test.py index 2538cc1..ec25893 100755 --- a/src/ui/test/test.py +++ b/src/ui/test/test.py @@ -56,7 +56,8 @@ class Test(Widget): "instruction":{"digital_io"}, "screws": {"screwdriver", "tecna_t3", }, "resistance": {"multicomp", }, - "leak": {"tecna_t3", }, + "leak_1": {"tecna_t3", }, + "leak_2": {"tecna_t3", }, "vision": {("uvc_camera", "galaxy_camera", ), "vision", "vision_saver", }, # "neo_pixels", }, "print": {"label_printer", }, } @@ -84,7 +85,7 @@ class Test(Widget): "done": Test_Assembly(img_path=self.select_step_img("success"), text=u"COLLAUDO COMPLETATO", widget=None), "emergency": Test_Assembly(img_path=self.select_step_img("reset_emergency"), text=u"EMERGENZA INTERVENUTA - RIPRISTINARE PULSANTE E SELEZIONARE \"RESET EMERGENZA\" DAL MEN\u00d9 \"STRUMENTI\"", widget=None), "fail": Test_Assembly(img_path=self.select_step_img("fail"), text=u"CICLO INTERROTTO, PREMERE CONTINUA PER COMINCIARE UN NUOVO CICLO", widget=Test_Fail()), - "leak": Test_Assembly(img_path=None, text=None, widget=Test_Leak(components=self.components, recipe=self.recipe, step=self.step, pieces=self.pieces)), + "leak_1": Test_Assembly(img_path=None, text=None, widget=Test_Leak(components=self.components, recipe=self.recipe, step=self.step, pieces=self.pieces)), "leak_2": Test_Assembly(img_path=None, text=None, widget=Test_Leak(components=self.components, recipe=self.recipe, step=self.step, pieces=self.pieces)), "instruction": Test_Assembly(img_path=None, text=u"ESEGUIRE LE OPERAZIONI DI MONTAGGIO INDICATE IN FIGURA", widget=Test_Instructions(components=self.components, recipe=self.recipe,bench_name=self.config.machine_id, step=self.step,run_once=True)), "print": Test_Assembly(img_path=self.select_step_img("print"), text=u"STAMPA ETICHETTA IN CORSO", widget=None), @@ -357,7 +358,7 @@ class Test(Widget): }), ] if "resistance" not in self.unsupported_steps else []), *([ - Steps(type="leak", spec={ + Steps(type="leak_1", spec={ "pre_filling_time": 0, "pre_filling_pressure": 1000, "filling_time": 5, @@ -372,9 +373,9 @@ class Test(Widget): "flush_pressure": 100, "autotest": True, }), - ] if "leak" not in self.unsupported_steps else []), + ] if "leak_1" not in self.unsupported_steps else []), *([ - Steps(type="leak", spec={ + Steps(type="leak_1", spec={ "pre_filling_time": 0, "pre_filling_pressure": 1000, "filling_time": 5, @@ -389,7 +390,7 @@ class Test(Widget): "flush_pressure": 100, "autotest": False, }), - ] if "leak" not in self.unsupported_steps else []), + ] if "leak_1" not in self.unsupported_steps else []), Steps(type="done"), Steps(type="wait"), ] @@ -500,7 +501,7 @@ class Test(Widget): self.log.info("cycle printed already compiled label") # LABEL PRINT recipe = archived.test_data.get("recipe", {}) - leak_test_1 = archived.test_data.get("leak", {}).get("0", {}) + leak_test_1 = archived.test_data.get("leak_1", {}).get("0", {}) leak_test_1_step = leak_test_1.get("step", {}) leak_test_1_step_spec = leak_test_1_step.get("spec", {}) leak_test_1_results = leak_test_1.get("results", {}) @@ -595,8 +596,9 @@ class Test(Widget): # PRINT EXTRA LABELS IF NEEDED if "extra_label_printer" in self.components.keys(): - labels=printer_fields["extra_label"].split(",") - for label in labels: - self.components["extra_label_printer"].print_label(f"{label}.prn", context=context) + if len(printer_fields["extra_label"])>0: + labels=printer_fields["extra_label"].split(",") + for label in labels: + self.components["extra_label_printer"].print_label(f"{label}.prn", context=context) self.log.info(f"cycle printed: {context!r}") return compiled_label From 90915b16024113fdc89a81460dda7f43be9d1fcc Mon Sep 17 00:00:00 2001 From: stten5 Date: Fri, 17 Feb 2023 18:26:48 +0100 Subject: [PATCH 2/2] STTEN5 wip --- .../IVECO ETA30x16/ETA30x16_203dpi.nlbl | Bin 3279 -> 3273 bytes config/label_templates/ETA30x16_203dpi.prn | 2 +- config/machine_settings/st-ten-5.ini | 2 +- ...est importazione iveco daily elettrico.csv | 2 +- src/ui/test/test.py | 7 ++++--- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config/label_designs/IVECO ETA30x16/ETA30x16_203dpi.nlbl b/config/label_designs/IVECO ETA30x16/ETA30x16_203dpi.nlbl index 55d76a272368619e6adca109366e86ad19c986e0..48f52ff071330a9d1efc1e825e93fea4812ebbe3 100644 GIT binary patch literal 3273 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 NKfCr1C#nB!{{oe~)71a~ diff --git a/config/label_templates/ETA30x16_203dpi.prn b/config/label_templates/ETA30x16_203dpi.prn index fcbbc38..4612fb0 100644 --- a/config/label_templates/ETA30x16_203dpi.prn +++ b/config/label_templates/ETA30x16_203dpi.prn @@ -5,7 +5,7 @@ ^PW256 ^LL0144 ^LS0 -^FT160,125^BQN,2,3 +^FT148,125^BQN,2,4 ^FH\^FDLA,{PART}^FS ^FT19,40^A0N,23,21^FH\^FD{PART}^FS ^FT19,71^A0N,23,21^FH\^FDNum:{SN5}^FS diff --git a/config/machine_settings/st-ten-5.ini b/config/machine_settings/st-ten-5.ini index 26facc9..735d609 100644 --- a/config/machine_settings/st-ten-5.ini +++ b/config/machine_settings/st-ten-5.ini @@ -51,7 +51,7 @@ numero sensori presenza (sp):0 prova_tenuta_abilitata: x tempo_pre_riempimento: 0 -pressione_pre_riempimento: 1000 +pressione_pre_riempimento: 5000 tempo_riempimento: 5 tempo_assestamento: 10 percentuale_minima_pressione_assestamento: 5 diff --git a/src/test/csv_import/test importazione iveco daily elettrico.csv b/src/test/csv_import/test importazione iveco daily elettrico.csv index 39a2cca..35d3fb9 100644 --- a/src/test/csv_import/test importazione iveco daily elettrico.csv +++ b/src/test/csv_import/test importazione iveco daily elettrico.csv @@ -81,7 +81,7 @@ ,5803034022,1,priorità 1,,,, ,5803034026,1,priorità 1,,,, ,5803034027,1,priorità 1,,,, -,5803034028,1,priorità 1,,,, +,5803034028,1,priorità 1,"MB2,RB2",,, ,5803034770,1,priorità 1,,,, ,5803034771,1,priorità 1,,,, ,5803034772,1,priorità 1,,,, diff --git a/src/ui/test/test.py b/src/ui/test/test.py index 76620c5..9427d2a 100755 --- a/src/ui/test/test.py +++ b/src/ui/test/test.py @@ -586,8 +586,9 @@ class Test(Widget): # PRINT EXTRA LABELS IF NEEDED if "extra_label_printer" in self.components.keys(): - labels=printer_fields["extra_label"].split(",") - for label in labels: - self.components["extra_label_printer"].print_label(f"{label}.prn", context=context) + if len(printer_fields["extra_label"])>0: + labels=printer_fields["extra_label"].split(",") + for label in labels: + self.components["extra_label_printer"].print_label(f"{label}.prn", context=context) self.log.info(f"cycle printed: {context!r}") return compiled_label