From ed13861cfda06236ddf85f1e53cfc40e06e6be11 Mon Sep 17 00:00:00 2001 From: "xin.zhang" Date: Mon, 9 Jun 2025 15:27:35 +0800 Subject: [PATCH] NEW: add images for O1S JIRA: [STUDIO-11919] Change-Id: I43f39dbd87514fea5ad8f43dbadb142cec1cfd46 (cherry picked from commit 9bc62966fbb2a931cafe16290b17f087cf1450d6) --- resources/images/ext_image_o1s.svg | 245 +++++++ resources/images/printer_thumbnail_o1s.svg | 647 ++++++++++++++++++ .../images/printer_thumbnail_o1s_dark.svg | 647 ++++++++++++++++++ resources/printers/O1S.json | 4 +- src/slic3r/GUI/StatusPanel.cpp | 5 + 5 files changed, 1546 insertions(+), 2 deletions(-) create mode 100644 resources/images/ext_image_o1s.svg create mode 100644 resources/images/printer_thumbnail_o1s.svg create mode 100644 resources/images/printer_thumbnail_o1s_dark.svg diff --git a/resources/images/ext_image_o1s.svg b/resources/images/ext_image_o1s.svg new file mode 100644 index 0000000000..220d89fc53 --- /dev/null +++ b/resources/images/ext_image_o1s.svg @@ -0,0 +1,245 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/printer_thumbnail_o1s.svg b/resources/images/printer_thumbnail_o1s.svg new file mode 100644 index 0000000000..e25c359020 --- /dev/null +++ b/resources/images/printer_thumbnail_o1s.svg @@ -0,0 +1,647 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/printer_thumbnail_o1s_dark.svg b/resources/images/printer_thumbnail_o1s_dark.svg new file mode 100644 index 0000000000..e25c359020 --- /dev/null +++ b/resources/images/printer_thumbnail_o1s_dark.svg @@ -0,0 +1,647 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/printers/O1S.json b/resources/printers/O1S.json index c090e773f5..be8e6e40e8 100644 --- a/resources/printers/O1S.json +++ b/resources/printers/O1S.json @@ -50,10 +50,10 @@ "model_id": "O1S", "compatible_machine": [], "printer_type": "O1S", - "printer_thumbnail_image": "printer_thumbnail", + "printer_thumbnail_image": "printer_thumbnail_o1s", "printer_connect_help_image": "input_access_code_x1", "printer_use_ams_image": "ams_icon", - "printer_ext_image": ["ext_image_default"], + "printer_ext_image": ["ext_image_o1s"], "use_ams_type": "generic", "printer_arch": "core_xy", "printer_series": "series_o", diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index bf487ce6b9..ab04e247b2 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -2085,6 +2085,11 @@ void StatusBasePanel::expand_filament_loading(wxMouseEvent& e) m_filament_load_img->SetBitmap(create_scaled_bitmap("filament_load_o_series_left", this, load_img_size)); } } + else + { + //TODO + m_filament_load_img->SetBitmap(create_scaled_bitmap("filament_load_o_series_right", this, load_img_size)); + } } }