3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 09:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

FIX:add multi-color goes wrong in multi-plate case

Browse source 
1.new: forbidden add multicolor from preview slider if a plate uses multiple filaments in prepare
2.fix: cannot change color from preview slider if a plate uses different color with another plate.

Change-Id: I28dee0e158fab121dc888590c4cc7554900504be
This commit is contained in:
liz.li 2022-08-29 15:19:02 +08:00 • committed by Lane.Wei
parent 2d33f3ce90
commit 8e1fd89430
3 changed files with 40 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/slic3r/GUI/IMSlider.cpp
View file

@ -521,6 +521,11 @@ Info IMSlider::GetTicksValues() const
void IMSlider::SetTicksValues(const Info &custom_gcode_per_print_z)
{
if (!m_can_change_color) {
m_ticks.erase_all_ticks_with_code(ToolChange);
return;
}
if (m_values.empty()) {
m_ticks.mode = m_mode;
return;
@ -584,7 +589,7 @@ void IMSlider::SetDrawMode(bool is_sequential_print)
dmRegular;
}
void IMSlider::SetModeAndOnlyExtruder(const bool is_one_extruder_printed_model, const int only_extruder)
void IMSlider::SetModeAndOnlyExtruder(const bool is_one_extruder_printed_model, const int only_extruder, bool can_change_color)
{
m_mode = !is_one_extruder_printed_model ? MultiExtruder : only_extruder < 0 ? SingleExtruder : MultiAsSingle;
if (!m_ticks.mode || (m_ticks.empty() && m_ticks.mode != m_mode)) m_ticks.mode = m_mode;
@ -593,6 +598,8 @@ void IMSlider::SetModeAndOnlyExtruder(const bool is_one_extruder_printed_model,
UseDefaultColors(m_mode == SingleExtruder);
m_is_wipe_tower = m_mode != SingleExtruder;
m_can_change_color = can_change_color;
}
void IMSlider::SetExtruderColors( const std::vector<std::string>& extruder_colors)
@ -1252,7 +1259,10 @@ void IMSlider::render_menu()
//BBS render this menu item only when extruder_num > 1
if (extruder_num > 1) {
if (begin_menu(_u8L("Change Filament").c_str())) {
if (!m_can_change_color) {
begin_menu(_u8L("Change Filament").c_str(), false);
}
else if (begin_menu(_u8L("Change Filament").c_str())) {
for (int i = 0; i < extruder_num; i++) {
std::array<float, 4> rgba = decode_color_to_float_array(colors[i]);
ImU32 icon_clr = IM_COL32(rgba[0] * 255.0f, rgba[1] * 255.0f, rgba[2] * 255.0f, rgba[3] * 255.0f);