diff --git a/src/test/csv_import/Tabella Tubi riscaldati - COMPLETA rev09_27-10-2022.csv b/config/csv_import/Tabella Tubi riscaldati - COMPLETA rev09_27-10-2022.csv similarity index 100% rename from src/test/csv_import/Tabella Tubi riscaldati - COMPLETA rev09_27-10-2022.csv rename to config/csv_import/Tabella Tubi riscaldati - COMPLETA rev09_27-10-2022.csv diff --git a/src/test/csv_import/Tabella Tubi riscaldati - COMPLETA rev19_29-12-2022.csv b/config/csv_import/Tabella Tubi riscaldati - COMPLETA rev19_29-12-2022.csv similarity index 100% rename from src/test/csv_import/Tabella Tubi riscaldati - COMPLETA rev19_29-12-2022.csv rename to config/csv_import/Tabella Tubi riscaldati - COMPLETA rev19_29-12-2022.csv diff --git a/src/test/csv_import/Tabella Tubi riscaldati - COMPLETA rev19_29-12-2022.xlsx b/config/csv_import/Tabella Tubi riscaldati - COMPLETA rev19_29-12-2022.xlsx similarity index 100% rename from src/test/csv_import/Tabella Tubi riscaldati - COMPLETA rev19_29-12-2022.xlsx rename to config/csv_import/Tabella Tubi riscaldati - COMPLETA rev19_29-12-2022.xlsx diff --git a/src/test/csv_import/Tabella Tubi riscaldati - campi extra.csv b/config/csv_import/Tabella Tubi riscaldati - campi extra.csv similarity index 100% rename from src/test/csv_import/Tabella Tubi riscaldati - campi extra.csv rename to config/csv_import/Tabella Tubi riscaldati - campi extra.csv diff --git a/src/test/csv_import/Tabella_e_daily.csv b/config/csv_import/Tabella_e_daily.csv similarity index 100% rename from src/test/csv_import/Tabella_e_daily.csv rename to config/csv_import/Tabella_e_daily.csv diff --git a/src/test/csv_import/Tabella_e_dailyP345.csv b/config/csv_import/Tabella_e_dailyP345.csv similarity index 100% rename from src/test/csv_import/Tabella_e_dailyP345.csv rename to config/csv_import/Tabella_e_dailyP345.csv diff --git a/src/test/csv_import/Tabella_e_daily_p3.csv b/config/csv_import/Tabella_e_daily_p3.csv similarity index 100% rename from src/test/csv_import/Tabella_e_daily_p3.csv rename to config/csv_import/Tabella_e_daily_p3.csv diff --git a/src/test/csv_import/importazione da banco montaggio.csv b/config/csv_import/importazione da banco montaggio.csv similarity index 100% rename from src/test/csv_import/importazione da banco montaggio.csv rename to config/csv_import/importazione da banco montaggio.csv diff --git a/src/test/csv_import/importazione da banco montaggio.ods b/config/csv_import/importazione da banco montaggio.ods similarity index 100% rename from src/test/csv_import/importazione da banco montaggio.ods rename to config/csv_import/importazione da banco montaggio.ods diff --git a/src/test/csv_import/importazione da banco preformatura.csv b/config/csv_import/importazione da banco preformatura.csv similarity index 100% rename from src/test/csv_import/importazione da banco preformatura.csv rename to config/csv_import/importazione da banco preformatura.csv diff --git a/src/test/csv_import/st-ten-8.csv b/config/csv_import/st-ten-8.csv similarity index 72% rename from src/test/csv_import/st-ten-8.csv rename to config/csv_import/st-ten-8.csv index e6c1e1e..36d48b5 100644 --- a/src/test/csv_import/st-ten-8.csv +++ b/config/csv_import/st-ten-8.csv @@ -1,8 +1,8 @@ -codice_ricetta,cliente,codice_prodotto,descrizione,tempo_riempimento,tempo_assestamento,tempo_di_test,percentuale_minima_pressione_assestamento,percentuale_massima_pressione_assestamento,pressione_di_test_delta_minimo,pressione_di_test,pressione_di_test_delta_massimo,modello_etichetta -5803112815,IVECO,5803112815,Daily Automatico,5,10,10,5,5,30,5000,5,ETA30x16_203dpi.prn -5803112816,IVECO,5803112816,Daily Automatico,5,10,10,5,5,30,5000,5,ETA30x16_203dpi.prn -000746453 REV.5,FERRARI,000746453 REV.5,TUBO RITORNO OLIO,10,30,20,5,5,25,10000,5,ferrari_stten8.prn -MY83-6L701-AB,ASTON MARTIN,MY83-6L701-AB,TRANSMISSION OIL,5,10,10,5,5,30,7000,5,aston_martin.prn -MY83-6L694-AB,ASTON MARTIN,MY83-6L694-AB,TRANSMISSION OIL,5,10,10,5,5,30,7000,5,aston_martin.prn -MY83-6B747-BA,ASTON MARTIN,MY83-6B747-BA,ENGINE OIL,5,10,10,5,5,30,7000,5,aston_martin.prn -MY83-6B748-BA,ASTON MARTIN,MY83-6B748-BA,ENGINE OIL,5,10,10,5,5,30,7000,5,aston_martin.prn \ No newline at end of file +codice_ricetta,cliente,codice_prodotto,descrizione,tempo_riempimento,tempo_assestamento,tempo_di_test,percentuale_minima_pressione_assestamento,percentuale_massima_pressione_assestamento,pressione_di_test_delta_minimo,pressione_di_test,pressione_di_test_delta_massimo,modello_etichetta,richiedi_inserimento_scarto +5803112815,IVECO,5803112815,Daily Automatico,5,10,10,5,5,30,5000,5,ETA30x16_203dpi.prn,x +5803112816,IVECO,5803112816,Daily Automatico,5,10,10,5,5,30,5000,5,ETA30x16_203dpi.prn,x +000746453 REV.5,FERRARI,000746453 REV.5,TUBO RITORNO OLIO,10,30,20,5,5,25,10000,5,ferrari_stten8.prn, +MY83-6L701-AB,ASTON MARTIN,MY83-6L701-AB,TRANSMISSION OIL,5,10,10,5,5,30,7000,5,aston_martin.prn, +MY83-6L694-AB,ASTON MARTIN,MY83-6L694-AB,TRANSMISSION OIL,5,10,10,5,5,30,7000,5,aston_martin.prn, +MY83-6B747-BA,ASTON MARTIN,MY83-6B747-BA,ENGINE OIL,5,10,10,5,5,30,7000,5,aston_martin.prn, +MY83-6B748-BA,ASTON MARTIN,MY83-6B748-BA,ENGINE OIL,5,10,10,5,5,30,7000,5,aston_martin.prn, \ No newline at end of file diff --git a/src/test/csv_import/test.py b/config/csv_import/test.py similarity index 100% rename from src/test/csv_import/test.py rename to config/csv_import/test.py diff --git a/src/test/csv_import/test_doppia_prova_tenuta.csv b/config/csv_import/test_doppia_prova_tenuta.csv similarity index 100% rename from src/test/csv_import/test_doppia_prova_tenuta.csv rename to config/csv_import/test_doppia_prova_tenuta.csv diff --git a/src/test/csv_import/test_import_himatic my24.csv b/config/csv_import/test_import_himatic my24.csv similarity index 100% rename from src/test/csv_import/test_import_himatic my24.csv rename to config/csv_import/test_import_himatic my24.csv diff --git a/src/test/csv_import/test_import_himatic.csv b/config/csv_import/test_import_himatic.csv similarity index 100% rename from src/test/csv_import/test_import_himatic.csv rename to config/csv_import/test_import_himatic.csv diff --git a/src/test/csv_import/test_import_himatic.xlsx b/config/csv_import/test_import_himatic.xlsx similarity index 100% rename from src/test/csv_import/test_import_himatic.xlsx rename to config/csv_import/test_import_himatic.xlsx diff --git a/src/test/csv_import/test_import_leak_only.csv b/config/csv_import/test_import_leak_only.csv similarity index 100% rename from src/test/csv_import/test_import_leak_only.csv rename to config/csv_import/test_import_leak_only.csv diff --git a/src/test/csv_import/test_tecna_upload.csv b/config/csv_import/test_tecna_upload.csv similarity index 100% rename from src/test/csv_import/test_tecna_upload.csv rename to config/csv_import/test_tecna_upload.csv diff --git a/src/test/csv_import/tst.csv b/config/csv_import/tst.csv similarity index 100% rename from src/test/csv_import/tst.csv rename to config/csv_import/tst.csv diff --git a/config/machine_settings/defaults.ini b/config/machine_settings/defaults.ini index fd866a1..7461290 100644 --- a/config/machine_settings/defaults.ini +++ b/config/machine_settings/defaults.ini @@ -103,6 +103,7 @@ cliente: specificare cliente part_number: specificare part number dimensione_lotto_abilitata: x dimensione_lotto: 0 +richiedi_inserimento_scarto: verifica_connettore_abilitata: x connettore: SCRx verifica_codice_a_barre_abilitata: diff --git a/src/ui/count_step_editor/count_step_editor.py b/src/ui/count_step_editor/count_step_editor.py index f82bd21..509efb5 100644 --- a/src/ui/count_step_editor/count_step_editor.py +++ b/src/ui/count_step_editor/count_step_editor.py @@ -6,5 +6,6 @@ class Count_Step_Editor(Editor): super().__init__(action=action, cell_widget=cell_widget) self.spec.update({ "amount": self.amount_sb, - "warning_img": self.warning_img_le + "warning_img": self.warning_img_le, + "require_discard_piece": self.require_discard_piece_cb }) diff --git a/src/ui/count_step_editor/count_step_editor.ui b/src/ui/count_step_editor/count_step_editor.ui index 4b2f5b4..2fb9a38 100644 --- a/src/ui/count_step_editor/count_step_editor.ui +++ b/src/ui/count_step_editor/count_step_editor.ui @@ -6,14 +6,40 @@ 0 0 - 692 - 202 + 798 + 319 Count Step Editor + + + + + 10 + 50 + false + + + + Istruzioni operative + + + + + + Immagine warning iniziale + + + + + + + + + @@ -44,29 +70,30 @@ - - + + 10 50 + false false - Istruzioni operative + Contenitore di segregazione scarti - - - + + + + + Qt::RightToLeft + - Immagine warning iniziale + Richiedi inserimento pezzo di scarto dentro contenitore di segregazione - - - diff --git a/src/ui/recipe_selection/recipe_selection.py b/src/ui/recipe_selection/recipe_selection.py index 382722c..ba4de1a 100755 --- a/src/ui/recipe_selection/recipe_selection.py +++ b/src/ui/recipe_selection/recipe_selection.py @@ -185,6 +185,7 @@ class Recipe_Selection(Widget): "count": { "amount": row.get("dimensione_lotto", defaults["dimensione_lotto"]), "warning_img": row.get("immagine_warning", ""), + "require_discard_piece": row.get("richiedi_inserimento_scarto",defaults["richiedi_inserimento_scarto"]) }, "connector": { "connector": row.get("connettore", defaults["connettore"]), diff --git a/src/ui/test_fail/test_fail.py b/src/ui/test_fail/test_fail.py index 8d4bb6b..a602a68 100644 --- a/src/ui/test_fail/test_fail.py +++ b/src/ui/test_fail/test_fail.py @@ -22,11 +22,12 @@ class Test_Fail(Test_Test): if show is False: return show if "discard_box" in self.parent.config["hardware_config"].keys(): - if self.parent_assembly_widget is not None : - self.continue_b.setVisible(False) - self.discard_timer.start(100) - self.parent_assembly_widget().set_text(text="TEST KO - INSERIRE IL PEZZO COLLAUDATO NEL CONTENITORE DI SEGREGAZIONE SCARTI") - self.io_connection=self.components["digital_io"].out.connect(self.wait_discard) + if self.recipe["count"]["require_discard_piece"]: + if self.parent_assembly_widget is not None : + self.continue_b.setVisible(False) + self.discard_timer.start(100) + self.parent_assembly_widget().set_text(text="TEST KO - INSERIRE IL PEZZO COLLAUDATO NEL CONTENITORE DI SEGREGAZIONE SCARTI") + self.io_connection=self.components["digital_io"].out.connect(self.wait_discard) self.visualize() # TESTING