diff --git a/config/machine_settings/defaults.ini b/config/machine_settings/defaults.ini index e5926e7..dee1d9a 100644 --- a/config/machine_settings/defaults.ini +++ b/config/machine_settings/defaults.ini @@ -2,18 +2,18 @@ description = INSERIRE NOME BANCO [hardware_config] -; archive_synchronizer: present +tecna_t3: present galaxy_camera: absent +digital_io: absent +; archive_synchronizer: present ; label_printer: present ; multicomp: present ; neo_pixels: present ; remote_api: present ; screwdriver: present -; tecna_t3: present ; uvc_camera: present ; vision_saver: present ; vision: present -digital_io: absent [galaxy_camera] horizontal_resolution: 2448 @@ -103,9 +103,9 @@ codice_a_barre: avvitatura_abilitata: viti: 0 istruzione_abilitata: -num_tape:0 -num_ring:0 -num_piece:0 +numero nastri (n):0 +numero sensori anello (sa):0 +numero sensori presenza (sp):0 verifica_resistenza_connettore_abilitata: x scala_resistenza: 500 diff --git a/config/machine_settings/st-ten-5.ini b/config/machine_settings/st-ten-5.ini index 92710cb..f412363 100644 --- a/config/machine_settings/st-ten-5.ini +++ b/config/machine_settings/st-ten-5.ini @@ -41,9 +41,9 @@ warning_img: dimensione_lotto_abilitata: istruzione_abilitata: x -num_tape:0 -num_ring:0 -num_piece:0 +numero nastri (n):0 +numero sensori anello (sa):0 +numero sensori presenza (sp):0 prova_tenuta_abilitata: x tempo_pre_riempimento: 0 diff --git a/src/ui/instruction_step_editor/instruction_step_editor.py b/src/ui/instruction_step_editor/instruction_step_editor.py index b5cc74c..ab723a9 100644 --- a/src/ui/instruction_step_editor/instruction_step_editor.py +++ b/src/ui/instruction_step_editor/instruction_step_editor.py @@ -6,6 +6,6 @@ class Instruction_Step_Editor(Editor): super().__init__(action=action, cell_widget=cell_widget) self.spec.update({ "num_tape": self.tape_sb, - "num_ring_sensor": self.ring_sb, - "num_piece_sensor": self.piece_sb, + "num_ring": self.ring_sb, + "num_piece": self.piece_sb, }) diff --git a/src/ui/recipe_selection/recipe_selection.py b/src/ui/recipe_selection/recipe_selection.py index 4099022..9203386 100755 --- a/src/ui/recipe_selection/recipe_selection.py +++ b/src/ui/recipe_selection/recipe_selection.py @@ -32,6 +32,7 @@ class Recipe_Selection(Widget): global noner super().__init__() self.config = config + self.defaults = self.config.get("recipes_defaults", noner) self.unsupported_steps = unsupported_steps session = Users.get_session() if session.is_admin: @@ -169,6 +170,10 @@ class Recipe_Selection(Widget): if self.selected is not None: self.ok.emit(self.crud.db.table_model.get_by_id(self.selected)) + def get_def(self,dict,key): + val=dict.get(key,self.defaults[key]) + return val if val != "" else self.defaults[key] + def read_steps(self, row, defaults=None): if defaults is None: global noner @@ -178,21 +183,11 @@ class Recipe_Selection(Widget): rcsv = row.get("r nominale", defaults["r nominale"]).replace(" ", "").replace(",", decsep).replace("Ω", "").replace("?", "") if rcsv == "": rcsv = "999" - trp=row.get("tolleranza_resistenza_pos", defaults["tolleranza_resistenza_pos"]) - if trp == "": - trp = defaults["tolleranza_resistenza_pos"] - trn=row.get("tolleranza_resistenza_neg", defaults["tolleranza_resistenza_neg"]) - if trn == "": - trn = defaults["tolleranza_resistenza_neg"] - tass=row.get("tempo_assestamento", defaults["tempo_assestamento"]) - if tass == "": - tass = defaults["tempo_assestamento"] - wimg=row.get("immagine_warning", "") print_template_field = self.config.get("recipe", {}).get("label_template_field", "modello_etichetta").strip() return { "count": { "amount": row.get("dimensione_lotto", defaults["dimensione_lotto"]), - "warning_img": wimg, + "warning_img": row.get("immagine_warning", ""), }, "connector": { "connector": row.get("connettore", defaults["connettore"]), @@ -203,27 +198,22 @@ class Recipe_Selection(Widget): "resistance": { "scale": float(row.get("scala_resistenza", defaults["scala_resistenza"])), "expected": float(rcsv), - "tolerance_pos": float(trp), - "tolerance_neg": float(trn), + "tolerance_pos": float(self.get_def(row,"tolleranza_resistenza_pos")), + "tolerance_neg": float(self.get_def(row,"tolleranza_resistenza_neg")), }, "screws": { "quantity": row.get("viti", defaults["viti"]) }, "instruction": { - "num_tape": row.get("num_tape", defaults["num_tape"]), - "num_piece": row.get("num_tape", defaults["num_piece"]), - "num_ring": row.get("num_tape", defaults["num_ring"]) + "num_tape": int(self.get_def(row,"numero nastri (n)")), + "num_piece": int(self.get_def(row,"numero sensori anello (sa)")), + "num_ring": int(self.get_def(row,"numero sensori presenza (sp)")) }, - # "instruction": { - # "num_tape": row.get("Numero nastri (N)", defaults["num_tape"]), - # "num_piece": row.get("Numero sensori anello (SA)", defaults["num_piece"]), - # "num_ring": row.get("Numero sensori presenza (SP)", defaults["num_ring"]) - # }, "leak_1": { "pre_filling_time": int(row.get("tempo_pre_riempimento", defaults["tempo_pre_riempimento"])), "pre_filling_pressure": int(row.get("pressione_pre_riempimento", defaults["pressione_pre_riempimento"])), "filling_time": int(row.get("tempo_riempimento", defaults["tempo_riempimento"])), - "settling_time": int(tass), + "settling_time": int(self.get_def(row,"tempo_assestamento")), "settling_pressure_min_percent": int(row.get("percentuale_minima_pressione_assestamento", defaults["percentuale_minima_pressione_assestamento"])), "settling_pressure_max_percent": int(row.get("percentuale_massima_pressione_assestamento", defaults["percentuale_massima_pressione_assestamento"])), "test_time": int(row.get("tempo_di_test", defaults["tempo_di_test"])), 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 a4479c4..dad8b65 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 @@ -56,7 +56,7 @@ class Recipe_Spec_And_Step_Editor(Editor): "enable": self.instruction_enabled_cb, "widget": "instruction_editor_w", "editor": Instruction_Step_Editor(), - "tab": self.screws_t, + "tab": self.instruction_t, }, "leak_1": { "type": "leak", diff --git a/src/ui/recipe_spec_and_step_editor/recipe_spec_and_step_editor.ui b/src/ui/recipe_spec_and_step_editor/recipe_spec_and_step_editor.ui index dfcb3e3..9a78cfa 100644 --- a/src/ui/recipe_spec_and_step_editor/recipe_spec_and_step_editor.ui +++ b/src/ui/recipe_spec_and_step_editor/recipe_spec_and_step_editor.ui @@ -255,7 +255,7 @@ Fasi di Test - + Montaggio