From ad7e4d6de9437f5f6e707a8565eecc3de6039299 Mon Sep 17 00:00:00 2001 From: Stone Li Date: Mon, 1 Aug 2022 15:06:36 +0800 Subject: [PATCH] ENH: refine thumbnail of printing job on mac retina screen Change-Id: Ie71e586947e3914f8448a153d7e699471ddaccb9 Signed-off-by: Stone Li --- resources/images/monitor_placeholder.png | Bin 1796 -> 0 bytes resources/images/monitor_placeholder.svg | 16 ++++++++++++++++ src/slic3r/GUI/StatusPanel.cpp | 12 ++++++------ src/slic3r/GUI/StatusPanel.hpp | 4 ++-- 4 files changed, 24 insertions(+), 8 deletions(-) delete mode 100644 resources/images/monitor_placeholder.png create mode 100644 resources/images/monitor_placeholder.svg diff --git a/resources/images/monitor_placeholder.png b/resources/images/monitor_placeholder.png deleted file mode 100644 index ad2c9ef4df68f1d9f4a5411db964807141154db6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1796 zcmdUw`!^E|7{{mMl1mnn`%#WtlU9U|W~?T+-0!?B6}cQrOt~~#QB5Q5P%q1rT+>`< zD^aW7DVj0&%WRR^8Vgws+q~W%-#?)rzR%};zt7Ll^S$Ti9ef5d{hIOu0(Wkq6dNwCot^!efy3eCmSHPi5Gb@q{8K8uA>8Ug zNz301I`2j)=V#{RK-7Rh3p2*lRK(ZpT$x0#wzl^D;Gkc;4eLv*&hQThCnqDrV-)MB z<*2wgbBT0|yw*)7lVg&StPT~IFY)<@@K2tYfw5744b6r6sp@@bl1r}?2n5fyN3(%I zAP#0*Fd#{yM=y<5xs5_1?H~}yZO0%RI)mX%@FEN^vORl; zNOjE?%+~%m#(KCYi$B>UMv2g>s;c>fC$MRw|J!b%8#X`H8xLu}We4NfG1!C-{EXuKH#mPK20-@S9GPg57! zI2K1w8n}1gq!}i3b#;BFn`D`n2utTy;Z6Y=P0!{TboxSc;cRo8_W*;DgiYI2rZ#(g z#mHGz=UwzNQCONLUoKtnsTfP z#EA*PA@yTIds63Q86@E7oZ7vbBBP-By2y=n{HqiQD;~+6XJ_vX&+z6ac>wc7 z?I`2!J`^GB{C;d9G(vC*IS1+d$Pt*=M-<^}&W#@`9qE4_di6Ua71R+qk4_}Yb49i%%n!hAV!=GOg zT}^PC&qGy^5>?S`SH41WtSIxjK7o^~hDHR=^gVV2FzC5h#@@n8MhC-DTCSs>|N(H{a9I*0xjT>EVY diff --git a/resources/images/monitor_placeholder.svg b/resources/images/monitor_placeholder.svg new file mode 100644 index 0000000000..158a0b2b45 --- /dev/null +++ b/resources/images/monitor_placeholder.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index ab27b6ff68..1ed473357e 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -170,8 +170,8 @@ void StatusBasePanel::init_bitmaps() m_bitmap_fan_off = ScalableBitmap(this, "monitor_fan_off", 24); m_bitmap_speed = ScalableBitmap(this, "monitor_speed", 24); m_bitmap_speed_active = ScalableBitmap(this, "monitor_speed_active", 24); - m_thumbnail_placeholder = create_scaled_bitmap("monitor_placeholder", nullptr, 120); - m_thumbnail_sdcard = create_scaled_bitmap("monitor_sdcard_thumbnail", nullptr, 120); + m_thumbnail_placeholder = ScalableBitmap(this, "monitor_placeholder", 120); + m_thumbnail_sdcard = ScalableBitmap(this, "monitor_sdcard_thumbnail", 120); //m_bitmap_camera = create_scaled_bitmap("monitor_camera", nullptr, 18); m_bitmap_extruder = *cache.load_png("monitor_extruder", FromDIP(28), FromDIP(70), false, false); m_bitmap_sdcard_state_on = create_scaled_bitmap("sdcard_state_on", nullptr, 16); @@ -282,7 +282,7 @@ wxBoxSizer *StatusBasePanel::create_project_task_page(wxWindow *parent) m_printing_sizer = new wxBoxSizer(wxHORIZONTAL); m_printing_sizer->SetMinSize(wxSize(PAGE_MIN_WIDTH, -1)); - m_bitmap_thumbnail = new wxStaticBitmap(parent, wxID_ANY, m_thumbnail_placeholder, wxDefaultPosition, TASK_THUMBNAIL_SIZE, 0); + m_bitmap_thumbnail = new wxStaticBitmap(parent, wxID_ANY, m_thumbnail_placeholder.bmp(), wxDefaultPosition, TASK_THUMBNAIL_SIZE, 0); m_printing_sizer->Add(m_bitmap_thumbnail, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT | wxLEFT, FromDIP(12)); @@ -1148,7 +1148,7 @@ void StatusPanel::on_webrequest_state(wxWebRequestEvent &evt) case wxWebRequest::State_Completed: { wxImage img(*evt.GetResponse().GetStream()); img_list.insert(std::make_pair(m_request_url, img)); - wxImage resize_img = img.Scale(m_bitmap_thumbnail->GetSize().x, m_bitmap_thumbnail->GetSize().y); + wxImage resize_img = img.Scale(m_bitmap_thumbnail->GetSize().x, m_bitmap_thumbnail->GetSize().y, wxIMAGE_QUALITY_HIGH); m_bitmap_thumbnail->SetBitmap(resize_img); break; } @@ -1706,7 +1706,7 @@ void StatusPanel::update_sdcard_subtask(MachineObject *obj) if (!obj) return; if (!m_load_sdcard_thumbnail) { - m_bitmap_thumbnail->SetBitmap(m_thumbnail_sdcard); + m_bitmap_thumbnail->SetBitmap(m_thumbnail_sdcard.bmp()); m_load_sdcard_thumbnail = true; } } @@ -1721,7 +1721,7 @@ void StatusPanel::reset_printing_values() m_printing_stage_value->SetLabelText(""); m_staticText_progress_left->SetLabelText(NA_STR); m_staticText_progress_percent->SetLabelText(NA_STR); - m_bitmap_thumbnail->SetBitmap(m_thumbnail_placeholder); + m_bitmap_thumbnail->SetBitmap(m_thumbnail_placeholder.bmp()); m_start_loading_thumbnail = false; m_load_sdcard_thumbnail = false; this->Layout(); diff --git a/src/slic3r/GUI/StatusPanel.hpp b/src/slic3r/GUI/StatusPanel.hpp index 6ee29890a6..8430dcad3c 100644 --- a/src/slic3r/GUI/StatusPanel.hpp +++ b/src/slic3r/GUI/StatusPanel.hpp @@ -65,8 +65,8 @@ class StatusBasePanel : public wxScrolledWindow { protected: wxBitmap m_item_placeholder; - wxBitmap m_thumbnail_placeholder; - wxBitmap m_thumbnail_sdcard; + ScalableBitmap m_thumbnail_placeholder; + ScalableBitmap m_thumbnail_sdcard; wxBitmap m_bitmap_item_prediction; wxBitmap m_bitmap_item_cost; wxBitmap m_bitmap_item_print;