From 7c74711d60ff894f9dda9cd43e661b7cd3b3b051 Mon Sep 17 00:00:00 2001 From: tao wang Date: Fri, 15 Mar 2024 17:51:45 +0800 Subject: [PATCH] ENH:rename some img files jira:[STUDIO-6512] Change-Id: I69872533cccda37b94384bc219cc35c5dec9310b --- resources/images/hum_level1_dark.svg | 6 +++--- resources/images/hum_level1_light.svg | 6 +++--- resources/images/hum_level2_dark.svg | 6 +++--- resources/images/hum_level2_light.svg | 6 +++--- resources/images/hum_level4_dark.svg | 6 +++--- resources/images/hum_level4_light.svg | 6 +++--- resources/images/hum_level5_dark.svg | 6 +++--- resources/images/hum_level5_light.svg | 6 +++--- src/slic3r/GUI/AmsMappingPopup.cpp | 4 ++-- src/slic3r/GUI/Widgets/AMSControl.cpp | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/resources/images/hum_level1_dark.svg b/resources/images/hum_level1_dark.svg index d7ef458e0..16511f4f5 100644 --- a/resources/images/hum_level1_dark.svg +++ b/resources/images/hum_level1_dark.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/resources/images/hum_level1_light.svg b/resources/images/hum_level1_light.svg index 4121832f9..37870888f 100644 --- a/resources/images/hum_level1_light.svg +++ b/resources/images/hum_level1_light.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/resources/images/hum_level2_dark.svg b/resources/images/hum_level2_dark.svg index 4dc749ccb..66951ad47 100644 --- a/resources/images/hum_level2_dark.svg +++ b/resources/images/hum_level2_dark.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/resources/images/hum_level2_light.svg b/resources/images/hum_level2_light.svg index 299c1506c..4d62440ae 100644 --- a/resources/images/hum_level2_light.svg +++ b/resources/images/hum_level2_light.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/resources/images/hum_level4_dark.svg b/resources/images/hum_level4_dark.svg index 66951ad47..4dc749ccb 100644 --- a/resources/images/hum_level4_dark.svg +++ b/resources/images/hum_level4_dark.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/resources/images/hum_level4_light.svg b/resources/images/hum_level4_light.svg index 4d62440ae..299c1506c 100644 --- a/resources/images/hum_level4_light.svg +++ b/resources/images/hum_level4_light.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/resources/images/hum_level5_dark.svg b/resources/images/hum_level5_dark.svg index 16511f4f5..d7ef458e0 100644 --- a/resources/images/hum_level5_dark.svg +++ b/resources/images/hum_level5_dark.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/resources/images/hum_level5_light.svg b/resources/images/hum_level5_light.svg index 37870888f..4121832f9 100644 --- a/resources/images/hum_level5_light.svg +++ b/resources/images/hum_level5_light.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp index 3ce91fdf2..0dd487e7e 100644 --- a/src/slic3r/GUI/AmsMappingPopup.cpp +++ b/src/slic3r/GUI/AmsMappingPopup.cpp @@ -1600,11 +1600,11 @@ AmsHumidityLevelList::AmsHumidityLevelList(wxWindow* parent) background_img = ScalableBitmap(this, "humidity_list_background", 104); - for (int i = 1; i <= 5; i++) { + for (int i = 5; i > 0; i--) { hum_level_img_light.push_back(ScalableBitmap(this, ("hum_level" + std::to_string(i) + "_light"), 54)); } - for (int i = 1; i <= 5; i++) { + for (int i = 5; i > 5; i--) { hum_level_img_dark.push_back(ScalableBitmap(this, ("hum_level" + std::to_string(i) + "_dark"), 54)); } diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp index 794212738..bc7fcdbcd 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.cpp +++ b/src/slic3r/GUI/Widgets/AMSControl.cpp @@ -1576,7 +1576,7 @@ void AMSRoad::doRender(wxDC &dc) if (m_amsinfo.ams_humidity >= 1 && m_amsinfo.ams_humidity <= 5) { - int hum_index = 6 - m_amsinfo.ams_humidity - 1; + int hum_index = m_amsinfo.ams_humidity - 1; if (wxGetApp().dark_mode()) { hum_index += 5; }