From 565732a0278c2b463fb6252a87d6e4662ae7c33f Mon Sep 17 00:00:00 2001 From: SoftFever Date: Thu, 16 Nov 2023 19:07:40 +0800 Subject: [PATCH] remove print_flow_ratio from profiles and hide it from process setting. It should be only displayed for parts --- .../0.20mm Standard @Flashforge AD5M 0.4 Nozzle.json | 1 - .../0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle.json | 1 - .../0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle.json | 1 - .../profiles/InfiMech/process/fdm_process_common.json | 1 - .../profiles/Kingroon/process/fdm_process_common.json | 1 - src/slic3r/GUI/ParamsPanel.cpp | 9 +++++++++ 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M 0.4 Nozzle.json b/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M 0.4 Nozzle.json index 74e5f5e683..0663eba47d 100644 --- a/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M 0.4 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M 0.4 Nozzle.json @@ -106,7 +106,6 @@ "gcode_label_objects": "0", "exclude_object": "0", "wall_generator": "classic", - "print_flow_ratio": "0.98", "only_one_wall_top": "1", "slow_down_layers": "1", "small_perimeter_speed": "50%", diff --git a/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle.json b/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle.json index 6399ffd9c6..322c90ab02 100644 --- a/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle.json @@ -106,7 +106,6 @@ "gcode_label_objects": "0", "exclude_object": "0", "wall_generator": "classic", - "print_flow_ratio": "0.98", "only_one_wall_top": "1", "slow_down_layers": "1", "small_perimeter_speed": "50%", diff --git a/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle.json b/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle.json index 9d22f3d680..0d17e029f1 100644 --- a/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle.json @@ -113,7 +113,6 @@ "prime_tower_brim_width": "3", "prime_tower_width": "35", "prime_volume": "45", - "print_flow_ratio": "1", "print_sequence": "by layer", "print_settings_id": "0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle", "raft_contact_distance": "0.1", diff --git a/resources/profiles/InfiMech/process/fdm_process_common.json b/resources/profiles/InfiMech/process/fdm_process_common.json index 712e5ae1e2..23eb9cf92e 100644 --- a/resources/profiles/InfiMech/process/fdm_process_common.json +++ b/resources/profiles/InfiMech/process/fdm_process_common.json @@ -104,7 +104,6 @@ "prime_tower_brim_width": "3", "prime_tower_width": "35", "prime_volume": "45", - "print_flow_ratio": "0.95", "print_sequence": "by layer", "raft_contact_distance": "0.1", diff --git a/resources/profiles/Kingroon/process/fdm_process_common.json b/resources/profiles/Kingroon/process/fdm_process_common.json index 8c78142556..cfe9b4199d 100644 --- a/resources/profiles/Kingroon/process/fdm_process_common.json +++ b/resources/profiles/Kingroon/process/fdm_process_common.json @@ -96,7 +96,6 @@ "prime_tower_brim_width": "3", "prime_tower_width": "60", "prime_volume": "45", - "print_flow_ratio": "1", "print_sequence": "by layer", "print_settings_id": "", "raft_contact_distance": "0.1", diff --git a/src/slic3r/GUI/ParamsPanel.cpp b/src/slic3r/GUI/ParamsPanel.cpp index 606baf8c24..725c5fde06 100644 --- a/src/slic3r/GUI/ParamsPanel.cpp +++ b/src/slic3r/GUI/ParamsPanel.cpp @@ -591,6 +591,15 @@ void ParamsPanel::set_active_tab(wxPanel* tab) wxString title = cur_tab->type() == Preset::TYPE_FILAMENT ? _L("Filament settings") : _L("Printer settings"); dialog->SetTitle(title); } + + auto tab_print = dynamic_cast(m_tab_print); + if (cur_tab == m_tab_print) { + if (tab_print) + tab_print->toggle_line("print_flow_ratio", false); + } else { + if (tab_print) + tab_print->toggle_line("print_flow_ratio", false); + } } bool ParamsPanel::is_active_and_shown_tab(wxPanel* tab)