Commit Graph

8 Commits

Author SHA1 Message Date
Bastien Nocera
902b215eb1 FIX: Fix missing std::set declaration
/run/build/BambuStudio/src/slic3r/GUI/EncodedFilament.hpp: At global scope:
/run/build/BambuStudio/src/slic3r/GUI/EncodedFilament.hpp:81:10: error: ‘set’ in namespace ‘std’ does not name a template type
   81 |     std::set<wxColour, wxColorSorter> m_colors;
      |          ^~~
/run/build/BambuStudio/src/slic3r/GUI/EncodedFilament.hpp:13:1: note: ‘std::set’ is defined in header ‘<set>’; this is probably fixable by adding ‘#include <set>’
   12 | #include <chrono>
  +++ |+#include <set>
   13 |

(cherry picked from commit 9d86c8c15e69158d386596bd860b99b61b2c2e61)
2025-10-01 15:47:44 +08:00
Bastien Nocera
46abd03bde FIX: Fix missing fmod declaration
/run/build/BambuStudio/src/slic3r/GUI/EncodedFilament.hpp: In function ‘Slic3r::ColourHSV Slic3r::wxColourToHSV(const wxColour&)’:
/run/build/BambuStudio/src/slic3r/GUI/EncodedFilament.hpp:41:25: error: ‘fmod’ was not declared in this scope
   41 |             h = 60.0 * (fmod(((g - b) / delta), 6.0));
      |                         ^~~~

(cherry picked from commit 625b661f292fdac9b337365b6792c959f6df59ff)
2025-10-01 15:47:37 +08:00
xin.zhang
025294894a FIX: skip the color codes with undefined color syntax
jira: [STUDIO-13037]
Change-Id: Ic733a2b67df49556c16f4392ecf61d95471e9aa8
(cherry picked from commit 6658f522166e432b383669903a0b30ee15cf6cdc)
2025-09-28 14:59:12 +08:00
xin.zhang
2be0569e3d ENH: update filament color file; the color name may be empty; using set instead of unordered_set
jira: [STUDIO-12346]
Change-Id: If83835fea7108babd2b19c26394ad0429493f394
(cherry picked from commit 85b07c170cd0e30f75dfab8ef68b02b0468c9f92)
2025-09-28 14:57:36 +08:00
fei2.fang
9ee76e4775 NEW: Official filament color selection approved
- 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)
2025-09-28 14:17:52 +08:00
xin.zhang
1635ce28d6 FIX: the sort function of FilamentColor
jira: [STUDIO-12965]
Change-Id: Iadd8342f3b67877e8b41c28d87f5150528f340a9
(cherry picked from commit b56ca2f5f619bbafd5473416ab9bf599d2a05e7e)
2025-09-28 13:08:09 +08:00
noisyfox
69d5b4ae48 Fix build error when PCH is not used 2025-09-25 20:33:50 +08:00
xin.zhang
88eae5d217 ENH: supporting encoded filament color
jira: [STUDIO-12346]
Change-Id: I7f5ce7806acb6fdeb3e3d9db52a0b96e5fadd759
(cherry picked from commit a7bdc2707d3825327258965c90c33836a7da628b)
2025-09-25 17:36:29 +08:00