juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 02:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX:gcode viewer color arrangement recommendation

Browse Source 
1.Limit of four filaments per row

2.Fix incorrect data

3.Add filament id display

4.Optimised layout

Change-Id: I9ac3701c99597a5ed243dac0e3e371cf9aca4066
(cherry picked from commit 3321277f86dfeb9de80b40c320e20dd5f33eab51)
This commit is contained in:
Mack
2024-07-08 16:01:19 +08:00
committed by Noisyfox
parent c376677537
commit d7029d383f
4 changed files with 48 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/slic3r/GUI/GCodeViewer.hpp
View File

@@ -709,6 +709,13 @@ public:
std::vector<bool> m_tool_visibles;
};
struct ExtruderFilament
{
std::string type;
std::string hex_color;
unsigned char filament_id;
};
enum class EViewType : unsigned char
{
FeatureType = 0,
@@ -740,9 +747,9 @@ private:
std::vector<size_t> m_ssid_to_moveid_map;
//BBS: extruder dispensing filament
//std::pair<TYPE, CLOUR>
std::vector<std::pair<std::string, std::string>> m_left_extruder_filament;
std::vector<std::pair<std::string, std::string>> m_right_extruder_filament;
std::vector<ExtruderFilament> m_left_extruder_filament;
std::vector<ExtruderFilament> m_right_extruder_filament;
size_t m_nozzle_nums;
std::vector<TBuffer> m_buffers{ static_cast<size_t>(EMoveType::Extrude) };
// bounding box of toolpaths