viewit/OrcaSlicer-KX
5
1
Fork 1
Code Issues Pull Requests Actions 7 Packages Projects Releases 7 Wiki Activity

ENH: update filament color file; the color name may be empty; using set instead of unordered_set

Browse Source 
jira: [STUDIO-12346]
Change-Id: If83835fea7108babd2b19c26394ad0429493f394
(cherry picked from commit 85b07c170cd0e30f75dfab8ef68b02b0468c9f92)
This commit is contained in:
xin.zhang
2025-06-30 17:55:49 +08:00
committed by Noisyfox
parent cdacea941e
commit 3987b57073
3 changed files with 37 additions and 1841 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/slic3r/GUI/EncodedFilament.hpp
View File

@@ -20,17 +20,6 @@ class FilamentColorCode;
class FilamentColorCodes;
class FilamentColorCodeQuery;
// Hasher
struct FilamentColorHasher
{
std::size_t operator()(const wxColour& c) const noexcept {
return (static_cast<std::size_t>(c.Red()) << 24) ^
(static_cast<std::size_t>(c.Green()) << 16) ^
(static_cast<std::size_t>(c.Blue()) << 8) ^
(static_cast<std::size_t>(c.Alpha()));
}
};
// Represents a color in HSV format
struct ColourHSV
{
@@ -66,6 +55,19 @@ inline ColourHSV wxColourToHSV(const wxColour& c)
return { h, s, v };
}
// FilamentColorSorter
struct wxColorSorter
{
std::size_t operator()(const wxColour& lhs_it, const wxColour& rhs_it) const noexcept {
ColourHSV ha = wxColourToHSV(lhs_it);
ColourHSV hb = wxColourToHSV(rhs_it);
if (ha.h != hb.h) return ha.h < hb.h;
if (ha.s != hb.s) return ha.s < hb.s;
if (ha.v != hb.v) return ha.v < hb.v;
return false;
}
};
struct FilamentColor
{
enum class ColorType : char
@@ -76,7 +78,7 @@ struct FilamentColor
};
ColorType m_color_type = ColorType::SINGLE_CLR; // default to single color
std::unordered_set<wxColour, FilamentColorHasher> m_colors;
std::set<wxColour, wxColorSorter> m_colors;
public:
size_t ColorCount() const noexcept { return m_colors.size(); }
@@ -182,7 +184,6 @@ public:
public:
void AddColorCode(FilamentColorCode* code);
void RemoveColorCode(FilamentColorCode* code);
private:
wxString m_fila_id;//eg. 54600
@@ -196,7 +197,7 @@ class FilamentColorCode
public:
FilamentColorCode() = delete;
FilamentColorCode(const wxString& color_code, FilamentColorCodes* owner, FilamentColor&& color, std::unordered_map<wxString, wxString>&& name_map);
~FilamentColorCode();
~FilamentColorCode() {};
public:
wxString GetFilaCode() const { return m_owner->GetFilaCode(); }