From 1fff5a624ceaa80bfb278fea9015618366f3d79b Mon Sep 17 00:00:00 2001
From: Scott Mudge <mail@scottmudge.com>
Date: Thu, 28 Jan 2021 16:03:12 -0500
Subject: [PATCH] Add border to filament color in combo box to improve
visibility of light filaments.
---
src/slic3r/GUI/BitmapCache.cpp | 26 +++++++++++++++++++++++++-
src/slic3r/GUI/BitmapCache.hpp | 4 ++--
src/slic3r/GUI/PresetComboBoxes.cpp | 4 ++--
3 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/src/slic3r/GUI/BitmapCache.cpp b/src/slic3r/GUI/BitmapCache.cpp
index c553f3728..f6562b299 100644
--- a/src/slic3r/GUI/BitmapCache.cpp
+++ b/src/slic3r/GUI/BitmapCache.cpp
@@ -338,7 +338,7 @@ wxBitmap* BitmapCache::load_svg(const std::string &bitmap_name, unsigned target_
}
//we make scaled solid bitmaps only for the cases, when its will be used with scaled SVG icon in one output bitmap
-wxBitmap BitmapCache::mksolid(size_t width, size_t height, unsigned char r, unsigned char g, unsigned char b, unsigned char transparency, bool suppress_scaling/* = false*/)
+wxBitmap BitmapCache::mksolid(size_t width, size_t height, unsigned char r, unsigned char g, unsigned char b, unsigned char transparency, bool suppress_scaling/* = false*/, size_t border_width /*= 0*/)
{
double scale = suppress_scaling ? 1.0f : m_scale;
width *= scale;
@@ -354,6 +354,30 @@ wxBitmap BitmapCache::mksolid(size_t width, size_t height, unsigned char r, unsi
*imgdata ++ = b;
*imgalpha ++ = transparency;
}
+
+ // Add border, make white/light spools easier to see
+ if (border_width > 0) {
+
+ // Restrict to width of image
+ if (border_width > height) border_width = height - 1;
+ if (border_width > width) border_width = width - 1;
+
+ auto px_data = (uint8_t*)image.GetData();
+ auto a_data = (uint8_t*)image.GetAlpha();
+
+ for (size_t x = 0; x < width; ++x) {
+ for (size_t y = 0; y < height; ++y) {
+ if (x < border_width || y < border_width ||
+ x >= (width - border_width) || y >= (height - border_width)) {
+ const size_t idx = (x + y * width);
+ const size_t idx_rgb = (x + y * width) * 3;
+ px_data[idx_rgb] = px_data[idx_rgb + 1] = px_data[idx_rgb + 2] = 0u;
+ a_data[idx] = 255u;
+ }
+ }
+ }
+ }
+
return wxImage_to_wxBitmap_with_alpha(std::move(image), scale);
}
diff --git a/src/slic3r/GUI/BitmapCache.hpp b/src/slic3r/GUI/BitmapCache.hpp
index 429b7dfd9..629733b52 100644
--- a/src/slic3r/GUI/BitmapCache.hpp
+++ b/src/slic3r/GUI/BitmapCache.hpp
@@ -35,8 +35,8 @@ public:
// Load svg from resources/icons. bitmap_key is given without the .svg suffix. SVG will be rasterized to provided height/width.
wxBitmap* load_svg(const std::string &bitmap_key, unsigned width = 0, unsigned height = 0, const bool grayscale = false, const bool dark_mode = false);
- wxBitmap mksolid(size_t width, size_t height, unsigned char r, unsigned char g, unsigned char b, unsigned char transparency, bool suppress_scaling = false);
- wxBitmap mksolid(size_t width, size_t height, const unsigned char rgb[3], bool suppress_scaling = false) { return mksolid(width, height, rgb[0], rgb[1], rgb[2], wxALPHA_OPAQUE, suppress_scaling); }
+ wxBitmap mksolid(size_t width, size_t height, unsigned char r, unsigned char g, unsigned char b, unsigned char transparency, bool suppress_scaling = false, size_t border_width = 0);
+ wxBitmap mksolid(size_t width, size_t height, const unsigned char rgb[3], bool suppress_scaling = false, size_t border_width = 0) { return mksolid(width, height, rgb[0], rgb[1], rgb[2], wxALPHA_OPAQUE, suppress_scaling, border_width); }
wxBitmap mkclear(size_t width, size_t height) { return mksolid(width, height, 0, 0, 0, wxALPHA_TRANSPARENT); }
static bool parse_color(const std::string& scolor, unsigned char* rgb_out);
diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp
index 38d45f172..e3ef37c0c 100644
--- a/src/slic3r/GUI/PresetComboBoxes.cpp
+++ b/src/slic3r/GUI/PresetComboBoxes.cpp
@@ -427,10 +427,10 @@ wxBitmap* PresetComboBox::get_bmp( std::string bitmap_key, bool wide_icons, con
unsigned char rgb[3];
// Paint the color bars.
bitmap_cache().parse_color(filament_rgb, rgb);
- bmps.emplace_back(bitmap_cache().mksolid(is_single_bar ? wide_icon_width : norm_icon_width, icon_height, rgb));
+ bmps.emplace_back(bitmap_cache().mksolid(is_single_bar ? wide_icon_width : norm_icon_width, icon_height, rgb, false, 1));
if (!is_single_bar) {
bitmap_cache().parse_color(extruder_rgb, rgb);
- bmps.emplace_back(bitmap_cache().mksolid(thin_icon_width, icon_height, rgb));
+ bmps.emplace_back(bitmap_cache().mksolid(thin_icon_width, icon_height, rgb, false, 1));
}
// Paint a lock at the system presets.
bmps.emplace_back(bitmap_cache().mkclear(space_icon_width, icon_height));