juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-26 12:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

NEW: Official filament color selection approved

Browse Source 
- Add a filament picker dialog for official color selection
- Enable displaying multiple filament colors in the picker dialog and preview sidebar
- Introduce two new config options:
  - `filament_multi_colors`
  - `filament_color_types`
  to both the application config and the 3MF config

jira: STUDIO-12346

Change-Id: I66f8c1ec9147df4f5948c8a329c1737551280e63
(cherry picked from commit 522dc0bbca49033a1ba9725ca7f6c3ea729691a6)
This commit is contained in:
fei2.fang
2025-06-12 21:12:23 +08:00
committed by Noisyfox
parent 5a1dc90e8c
commit 9ee76e4775
17 changed files with 1369 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,7 +161,7 @@ private:
/* loaded info*/
std::string m_fila_path;
std::unordered_map<wxString, FilamentColorCodes*>* m_fila_id2colors_map; //
std::unordered_map<wxString, FilamentColorCodes*>* m_fila_id2colors_map; //
};
// EncodedFilaColorsInfo class holds a mapping of filament codes to specific filamet type
@@ -201,7 +201,7 @@ public:
public:
wxString GetFilaCode() const { return m_owner->GetFilaCode(); }
wxString GetFilaType() const { return m_owner->GetFilaType(); }
wxString GetFilaColorCode() const { return m_fila_color_code; } // eg. Q01B00
FilamentColor GetFilaColor() const { return m_fila_color; }