From 3dfe33fbe1911354a506f9668253e15ac6a16e10 Mon Sep 17 00:00:00 2001 From: tao wang Date: Fri, 25 Aug 2023 14:39:46 +0800 Subject: [PATCH] ENH:optimize image config for different printers jira:[STUDIO-4051] Change-Id: Ibfcbc4c571a5c47eff95891e6f9079c3432e76a9 --- resources/images/extra_icon.svg | 502 ++++++++++++++++++ ...help2.png => input_access_code_p1p_cn.png} | Bin resources/images/input_access_code_p1p_en.png | Bin 0 -> 8770 bytes ...ode_cn.png => input_access_code_x1_cn.png} | Bin ...ode_en.png => input_access_code_x1_en.png} | Bin ...esscode_help1.png => lan_mode_help_x1.png} | Bin resources/printers/BL-P001.json | 4 +- resources/printers/BL-P002.json | 4 +- resources/printers/C11.json | 4 +- resources/printers/C12.json | 4 +- resources/printers/C13.json | 54 ++ resources/printers/N1.json | 2 + src/slic3r/GUI/AMSSetting.cpp | 9 +- src/slic3r/GUI/AMSSetting.hpp | 4 +- src/slic3r/GUI/ConnectPrinter.cpp | 22 +- src/slic3r/GUI/DeviceManager.cpp | 12 + src/slic3r/GUI/DeviceManager.hpp | 2 + src/slic3r/GUI/ReleaseNote.cpp | 4 +- src/slic3r/GUI/StatusPanel.cpp | 1 + src/slic3r/GUI/UpgradePanel.cpp | 2 +- 20 files changed, 616 insertions(+), 14 deletions(-) create mode 100644 resources/images/extra_icon.svg rename resources/images/{input_accesscode_help2.png => input_access_code_p1p_cn.png} (100%) create mode 100644 resources/images/input_access_code_p1p_en.png rename resources/images/{input_access_code_cn.png => input_access_code_x1_cn.png} (100%) rename resources/images/{input_access_code_en.png => input_access_code_x1_en.png} (100%) rename resources/images/{input_accesscode_help1.png => lan_mode_help_x1.png} (100%) create mode 100644 resources/printers/C13.json diff --git a/resources/images/extra_icon.svg b/resources/images/extra_icon.svg new file mode 100644 index 000000000..eec95433f --- /dev/null +++ b/resources/images/extra_icon.svg @@ -0,0 +1,502 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/input_accesscode_help2.png b/resources/images/input_access_code_p1p_cn.png similarity index 100% rename from resources/images/input_accesscode_help2.png rename to resources/images/input_access_code_p1p_cn.png diff --git a/resources/images/input_access_code_p1p_en.png b/resources/images/input_access_code_p1p_en.png new file mode 100644 index 0000000000000000000000000000000000000000..0bff847ce3ea19cfab7b6d5966a789e0cc182465 GIT binary patch literal 8770 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 wxBoxSizer *m_sizer_img = new wxBoxSizer(wxVERTICAL); - auto img = new wxStaticBitmap(m_panel_img, wxID_ANY, create_scaled_bitmap("ams_icon", nullptr, 126), wxDefaultPosition, wxDefaultSize); - m_sizer_img->Add(img, 0, wxALIGN_CENTER | wxTOP, 26); + m_am_img = new wxStaticBitmap(m_panel_img, wxID_ANY, create_scaled_bitmap("ams_icon", nullptr, 126), wxDefaultPosition, wxDefaultSize); + m_sizer_img->Add(m_am_img, 0, wxALIGN_CENTER | wxTOP, 26); m_sizer_img->Add(0, 0, 0, wxTOP, 18); m_panel_img->SetSizer(m_sizer_img); m_panel_img->Layout(); @@ -262,6 +262,11 @@ void AMSSetting::update_insert_material_read_mode(bool selected) Fit(); } +void AMSSetting::update_ams_img(std::string ams_icon_str) +{ + m_am_img->SetBitmap(create_scaled_bitmap(ams_icon_str, nullptr, 126)); +} + void AMSSetting::update_starting_read_mode(bool selected) { m_checkbox_starting_auto_read->SetValue(selected); diff --git a/src/slic3r/GUI/AMSSetting.hpp b/src/slic3r/GUI/AMSSetting.hpp index 0b227de29..4fddf4766 100644 --- a/src/slic3r/GUI/AMSSetting.hpp +++ b/src/slic3r/GUI/AMSSetting.hpp @@ -27,7 +27,8 @@ public: ~AMSSetting(); void create(); - void update_insert_material_read_mode(bool selected); + void update_insert_material_read_mode(bool selected); + void update_ams_img(std::string ams_icon_str); void update_starting_read_mode(bool selected); void update_remain_mode(bool selected); void update_switch_filament(bool selected); @@ -40,6 +41,7 @@ public: wxStaticText *append_text(wxString text); MachineObject *obj{nullptr}; bool ams_support_remain{false}; + wxStaticBitmap* m_am_img; int ams_id { 0 }; protected: diff --git a/src/slic3r/GUI/ConnectPrinter.cpp b/src/slic3r/GUI/ConnectPrinter.cpp index 8c9f79050..6b6497f65 100644 --- a/src/slic3r/GUI/ConnectPrinter.cpp +++ b/src/slic3r/GUI/ConnectPrinter.cpp @@ -117,14 +117,28 @@ void ConnectPrinterDialog::init_bitmap() { AppConfig *config = get_app_config(); std::string language = config->get("language"); - if (language == "zh_CN") { - m_diagram_bmp = create_scaled_bitmap("input_access_code_cn", nullptr, 190); + + if (m_obj) { + std::string img_str = DeviceManager::get_printer_diagram_img(m_obj->printer_type); + if(img_str.empty()){img_str = "input_access_code_x1"; } + + if (language == "zh_CN") { + m_diagram_bmp = create_scaled_bitmap(img_str+"_cn", nullptr, 190); + } + else { + m_diagram_bmp = create_scaled_bitmap(img_str+"_en", nullptr, 190); + } } else{ - m_diagram_bmp = create_scaled_bitmap("input_access_code_en", nullptr, 190); + if (language == "zh_CN") { + m_diagram_bmp = create_scaled_bitmap("input_access_code_x1_cn", nullptr, 190); + } + else { + m_diagram_bmp = create_scaled_bitmap("input_access_code_x1_en", nullptr, 190); + } } m_diagram_img = m_diagram_bmp.ConvertToImage(); - m_diagram_img.Rescale(FromDIP(340), FromDIP(190)); + m_diagram_img.Rescale(FromDIP(340), FromDIP(190)); } void ConnectPrinterDialog::set_machine_object(MachineObject* obj) diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index 2aec355d3..ca286b555 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -5162,6 +5162,18 @@ std::string DeviceManager::get_printer_thumbnail_img(std::string type_str) { return get_string_from_config(type_str, "printer_thumbnail_image"); } + +std::string DeviceManager::get_printer_diagram_img(std::string type_str) +{ + return get_string_from_config(type_str, "printer_connect_help_image"); +} + +std::string DeviceManager::get_printer_ams_img(std::string type_str) +{ + return get_string_from_config(type_str, "printer_use_ams_image"); +} + + bool DeviceManager::is_function_supported(std::string type_str, std::string function_name) { if (DeviceManager::function_table.contains("printers")) { diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp index 6bd2eaa06..18ce968cb 100644 --- a/src/slic3r/GUI/DeviceManager.hpp +++ b/src/slic3r/GUI/DeviceManager.hpp @@ -942,6 +942,8 @@ public: static std::string parse_printer_type(std::string type_str); static std::string get_printer_display_name(std::string type_str); static std::string get_printer_thumbnail_img(std::string type_str); + static std::string get_printer_diagram_img(std::string type_str); + static std::string get_printer_ams_img(std::string type_str); static PrinterArch get_printer_arch(std::string type_str); static std::string get_ftp_folder(std::string type_str); static bool is_function_supported(std::string type_str, std::string function_name); diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp index 313637d48..bab8a90a7 100644 --- a/src/slic3r/GUI/ReleaseNote.cpp +++ b/src/slic3r/GUI/ReleaseNote.cpp @@ -1080,9 +1080,9 @@ InputIpAddressDialog::InputIpAddressDialog(wxWindow* parent) m_tip3->SetMinSize(wxSize(FromDIP(352), -1)); m_tip3->SetMaxSize(wxSize(FromDIP(352), -1)); - m_img_help1 = new wxStaticBitmap(this, wxID_ANY, create_scaled_bitmap("input_accesscode_help1", this, 198), wxDefaultPosition, wxSize(FromDIP(352), FromDIP(198)), 0); + m_img_help1 = new wxStaticBitmap(this, wxID_ANY, create_scaled_bitmap("lan_mode_help_x1", this, 198), wxDefaultPosition, wxSize(FromDIP(352), FromDIP(198)), 0); - m_img_help2 = new wxStaticBitmap(this, wxID_ANY, create_scaled_bitmap("input_accesscode_help2", this, 118), wxDefaultPosition, wxSize(FromDIP(352), FromDIP(118)), 0); + m_img_help2 = new wxStaticBitmap(this, wxID_ANY, create_scaled_bitmap("input_access_code_p1p_en", this, 118), wxDefaultPosition, wxSize(FromDIP(352), FromDIP(118)), 0); m_img_help1->Hide(); m_img_help2->Hide(); diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index ad97f573f..730b8af1c 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -3130,6 +3130,7 @@ void StatusPanel::on_ams_setting_click(SimpleEvent &event) if (obj) { m_ams_setting_dlg->update_insert_material_read_mode(obj->ams_insert_flag); m_ams_setting_dlg->update_starting_read_mode(obj->ams_power_on_flag); + m_ams_setting_dlg->update_ams_img(DeviceManager::get_printer_ams_img(obj->printer_type)); std::string ams_id = m_ams_control->GetCurentShowAms(); if (obj->amsList.size() == 0) { /* wxString txt = _L("AMS settings are not supported for external spool"); diff --git a/src/slic3r/GUI/UpgradePanel.cpp b/src/slic3r/GUI/UpgradePanel.cpp index a165cb978..e0f71a099 100644 --- a/src/slic3r/GUI/UpgradePanel.cpp +++ b/src/slic3r/GUI/UpgradePanel.cpp @@ -309,7 +309,7 @@ void MachineInfoPanel::init_bitmaps() m_img_printer = ScalableBitmap(this, "printer_thumbnail", 160); m_img_monitor_ams = ScalableBitmap(this, "monitor_upgrade_ams", 200); m_img_ext = ScalableBitmap(this, "monitor_upgrade_ext", 200); - m_img_extra_ams = ScalableBitmap(this, "monitor_upgrade_ams", 200); + m_img_extra_ams = ScalableBitmap(this, "extra_icon", 160); upgrade_green_icon = ScalableBitmap(this, "monitor_upgrade_online", 5); upgrade_gray_icon = ScalableBitmap(this, "monitor_upgrade_offline", 5); upgrade_yellow_icon = ScalableBitmap(this, "monitor_upgrade_busy", 5);