From 0e763dd3000a07c7444a4453fef17e327712d2d7 Mon Sep 17 00:00:00 2001 From: tao wang Date: Sat, 18 Jan 2025 21:55:19 +0800 Subject: [PATCH] ENH:Optimize translation Change-Id: Ic45baaa974af044a1bc166faf6e27ca5ee4e155b (cherry picked from commit 4a8304486789965c85a498d72250ea84088730a8) --- src/slic3r/GUI/FilamentMapPanel.cpp | 4 +- src/slic3r/GUI/Plater.cpp | 2 +- src/slic3r/GUI/SelectMachine.cpp | 56 ++++++++++++++------------- src/slic3r/GUI/SyncAmsInfoDialog.cpp | 2 +- src/slic3r/GUI/Widgets/FanControl.cpp | 2 +- 5 files changed, 35 insertions(+), 31 deletions(-) diff --git a/src/slic3r/GUI/FilamentMapPanel.cpp b/src/slic3r/GUI/FilamentMapPanel.cpp index b16beaca8d..e85cc1e2fb 100644 --- a/src/slic3r/GUI/FilamentMapPanel.cpp +++ b/src/slic3r/GUI/FilamentMapPanel.cpp @@ -32,8 +32,8 @@ FilamentMapManualPanel::FilamentMapManualPanel(wxWindow *p auto drag_sizer = new wxBoxSizer(wxHORIZONTAL); - m_left_panel = new DragDropPanel(this, wxT("Left Nozzle:"), false); - m_right_panel = new DragDropPanel(this, wxT("Right Nozzle:"), false); + m_left_panel = new DragDropPanel(this, _L("Left Nozzle"), false); + m_right_panel = new DragDropPanel(this, _L("Right Nozzle"), false); m_switch_btn = new ScalableButton(this, wxID_ANY, "switch_filament_maps"); for (size_t idx = 0; idx < m_filament_map.size(); ++idx) { diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 0c845c354a..175f2b7afa 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -1607,7 +1607,7 @@ Sidebar::Sidebar(Plater *parent) p->left_extruder = new ExtruderGroup(p->m_panel_printer_content, 0, _L("Left Nozzle")); p->right_extruder = new ExtruderGroup(p->m_panel_printer_content, 1, _L("Right Nozzle")); - p->single_extruder = new ExtruderGroup(p->m_panel_printer_content, -1, "Nozzle"); + p->single_extruder = new ExtruderGroup(p->m_panel_printer_content, -1, _L("Nozzle")); p->vsizer_printer = new wxBoxSizer(wxVERTICAL); p->layout_printer(true, true); diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 2dd341d753..08c808fb9c 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -499,8 +499,8 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) m_filament_panel->Hide(); m_statictext_ams_msg = new Label(this, wxEmptyString); - m_statictext_ams_msg->SetMinSize(wxSize(FromDIP(600), -1)); - m_statictext_ams_msg->SetMaxSize(wxSize(FromDIP(600), -1)); + m_statictext_ams_msg->SetMinSize(wxSize(FromDIP(645), -1)); + m_statictext_ams_msg->SetMaxSize(wxSize(FromDIP(645), -1)); m_statictext_ams_msg->SetFont(::Label::Body_13); m_statictext_ams_msg->Hide(); @@ -525,7 +525,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) }); m_mapping_sugs_sizer = new wxBoxSizer(wxHORIZONTAL); - auto m_img_mapping_sugs = new wxStaticBitmap(this, wxID_ANY, create_scaled_bitmap("warning", this, 16), wxDefaultPosition, wxSize(FromDIP(16), FromDIP(16))); + //auto m_img_mapping_sugs = new wxStaticBitmap(this, wxID_ANY, create_scaled_bitmap("warning", this, 16), wxDefaultPosition, wxSize(FromDIP(16), FromDIP(16))); auto m_txt_mapping_sugs = new Label(this, wxEmptyString); m_txt_mapping_sugs->SetFont(::Label::Body_13); m_txt_mapping_sugs->SetForegroundColour(wxColour(0xFF, 0x6F, 0x00)); @@ -533,11 +533,11 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) m_txt_mapping_sugs->SetMaxSize(wxSize(FromDIP(580), -1)); m_txt_mapping_sugs->SetBackgroundColour(*wxWHITE); m_txt_mapping_sugs->SetLabel(_L("Your filament grouping method is not optimal.")); - m_mapping_sugs_sizer->Add(m_img_mapping_sugs, 0, wxALIGN_CENTER, 0); + //m_mapping_sugs_sizer->Add(m_img_mapping_sugs, 0, wxALIGN_CENTER, 0); m_mapping_sugs_sizer->Add(m_txt_mapping_sugs, 0, wxALIGN_CENTER, 0); m_change_filament_times_sizer = new wxBoxSizer(wxHORIZONTAL); - auto m_img_change_filament_times = new wxStaticBitmap(this, wxID_ANY, create_scaled_bitmap("warning", this, 16), wxDefaultPosition, wxSize(FromDIP(16), FromDIP(16))); + //auto m_img_change_filament_times = new wxStaticBitmap(this, wxID_ANY, create_scaled_bitmap("warning", this, 16), wxDefaultPosition, wxSize(FromDIP(16), FromDIP(16))); m_txt_change_filament_times = new Label(this, wxEmptyString); m_txt_change_filament_times->SetFont(::Label::Body_13); m_txt_change_filament_times->SetMinSize(wxSize(FromDIP(580), -1)); @@ -545,8 +545,8 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) m_txt_change_filament_times->SetForegroundColour(wxColour(0xFF, 0x6F, 0x00)); m_txt_change_filament_times->SetBackgroundColour(*wxWHITE); m_txt_change_filament_times->SetLabel(wxEmptyString); - m_change_filament_times_sizer->Add(m_img_change_filament_times, 0, wxTOP, FromDIP(2)); - m_change_filament_times_sizer->Add(m_txt_change_filament_times, 0, wxTOP, FromDIP(2)); + //m_change_filament_times_sizer->Add(m_img_change_filament_times, 0, wxTOP, FromDIP(2)); + m_change_filament_times_sizer->Add(m_txt_change_filament_times, 0, wxTOP, 0); /*Advanced Options*/ wxBoxSizer* sizer_split_options = new wxBoxSizer(wxHORIZONTAL); @@ -1558,7 +1558,7 @@ void SelectMachineDialog::update_ams_status_msg(wxString msg, bool is_warning) if (str_new != str_old) { if (m_statictext_ams_msg->GetLabel() != msg) { m_statictext_ams_msg->SetLabel(msg); - m_statictext_ams_msg->Wrap(FromDIP(600)); + m_statictext_ams_msg->Wrap(FromDIP(645)); m_statictext_ams_msg->Show(); Layout(); Fit(); @@ -1822,8 +1822,8 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vectorget_preset_printer_model_name(target_model_id)); target_print_name.Replace(wxT("Bambu Lab "), wxEmptyString); - msg_text = wxString::Format(_L("The selected printer (%s) is incompatible with the chosen printer profile in the slicer (%s)."), sourcet_print_name, target_print_name); - + msg_text = wxString::Format(_L("The selected printer (%s) is incompatible with the print file configuration (%s). Please adjust the printer preset in the prepare page or choose a compatible printer on this page."), sourcet_print_name, target_print_name); + update_print_status_msg(msg_text, true, true); } catch (...){} @@ -1873,7 +1873,7 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vectordev_id, obj); m_check_flag = false; - - /*check nozzle & filament is it the best*/ - if (obj->m_extder_data.total_extder_count > 1) { - auto stats = m_plater->get_partplate_list().get_current_fff_print().statistics_by_extruder(); - auto best = stats.stats_by_multi_extruder_best; - auto curr = stats.stats_by_multi_extruder_curr; - - if (curr.filament_flush_weight > best.filament_flush_weight) { - m_link_edit_nozzle->Show(true); - m_mapping_sugs_sizer->Show(true); - } - } } else { BOOST_LOG_TRIVIAL(error) << "on_selection_changed dev_id not found"; return; @@ -3066,22 +3054,38 @@ void SelectMachineDialog::update_filament_change_count() } int hand_changes_count = 0; + auto saving_weight = 0; + for (auto fi : filament_ids) { for (auto counts : gcode_result->filament_change_count_map) { if (counts.first.first == fi || counts.first.second == fi) { hand_changes_count += counts.second; } } } - if (hand_changes_count > 0) { + /*check nozzle & filament is it the best*/ + if (obj->m_extder_data.total_extder_count > 1) { + auto stats = m_plater->get_partplate_list().get_current_fff_print().statistics_by_extruder(); + auto best = stats.stats_by_multi_extruder_best; + auto curr = stats.stats_by_multi_extruder_curr; + + if (curr.filament_flush_weight > best.filament_flush_weight) { + m_link_edit_nozzle->Show(true); + m_mapping_sugs_sizer->Show(true); + saving_weight = curr.filament_flush_weight - best.filament_flush_weight; + } + } + + if (hand_changes_count > 0 || saving_weight > 0) { m_change_filament_times_sizer->Show(true); m_txt_change_filament_times->Show(true); - if (obj->m_extder_data.total_extder_count > 1) { + /*if (obj->m_extder_data.total_extder_count > 1) { m_txt_change_filament_times->SetLabel(wxString::Format(_L("It is not recommended to use AMS and external filaments simultaneously on the same nozzle. Otherwise, you will need to manually change filaments %d times for this print."), hand_changes_count)); } else { m_txt_change_filament_times->SetLabel(wxString::Format(_L("It is not recommended to use AMS and external filaments simultaneously. Otherwise, you will need to manually change filaments %d times for this print."), hand_changes_count)); - } + }*/ + m_txt_change_filament_times->SetLabel(wxString::Format(_L("Cost %dg filament and %d changes more than optimal grouping."), saving_weight, hand_changes_count)); m_txt_change_filament_times->Wrap(FromDIP(580)); m_txt_change_filament_times->Layout(); } diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.cpp b/src/slic3r/GUI/SyncAmsInfoDialog.cpp index ef15460bf1..77e8aa6aea 100644 --- a/src/slic3r/GUI/SyncAmsInfoDialog.cpp +++ b/src/slic3r/GUI/SyncAmsInfoDialog.cpp @@ -4464,7 +4464,7 @@ FinishSyncAmsDialog::FinishSyncAmsDialog(wxWindow *parent, InputInfo &input_info image_sizer->AddStretchSpacer(); text_sizer->Add(image_sizer); text_sizer->AddSpacer(FromDIP(5)); - auto finish_text = new wxStaticText(this, wxID_ANY, _L("Successfully synchronized color and type of filament in AMS.")); + auto finish_text = new wxStaticText(this, wxID_ANY, _L("Successfully synchronized color and type of filament from printer.")); finish_text->Wrap(win_width - 40); finish_text->SetForegroundColour(wxColour(255, 255, 255, 255)); text_sizer->Add(finish_text, 0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL, 0); diff --git a/src/slic3r/GUI/Widgets/FanControl.cpp b/src/slic3r/GUI/Widgets/FanControl.cpp index e523aec238..b689de252e 100644 --- a/src/slic3r/GUI/Widgets/FanControl.cpp +++ b/src/slic3r/GUI/Widgets/FanControl.cpp @@ -229,7 +229,7 @@ void FanOperate::set_fan_speeds(int g) bool FanOperate::check_printing_state() { if (m_obj && m_obj->is_in_printing()) { - MessageDialog msg_wingow(nullptr, _L("Changed fan speed during pringing may affect print quality, please choose carefully."), "", wxICON_WARNING | wxCANCEL | wxOK); + MessageDialog msg_wingow(nullptr, _L("Changing fan speed during pringing may affect print quality, please choose carefully."), "", wxICON_WARNING | wxCANCEL | wxOK); msg_wingow.SetButtonLabel(wxID_OK, _L("Change Anyway")); if (msg_wingow.ShowModal() == wxID_CANCEL) { return false; } }