ENH:preview slider forbidden adding color-change when open spiral vase
Change-Id: I99cf950c301a0b4f455b039972f144d8f14880f8
This commit is contained in:
parent
971c7f358e
commit
40a6fb2fe8
|
@ -299,6 +299,10 @@ void IMSlider::SetModeAndOnlyExtruder(const bool is_one_extruder_printed_model,
|
||||||
m_is_wipe_tower = false;
|
m_is_wipe_tower = false;
|
||||||
else
|
else
|
||||||
m_is_wipe_tower = m_mode != SingleExtruder;
|
m_is_wipe_tower = m_mode != SingleExtruder;
|
||||||
|
|
||||||
|
auto config = wxGetApp().preset_bundle->full_config();
|
||||||
|
m_is_spiral_vase = config.option<ConfigOptionBool>("spiral_mode")->value;
|
||||||
|
|
||||||
m_can_change_color = can_change_color;
|
m_can_change_color = can_change_color;
|
||||||
|
|
||||||
// close opened menu window after reslice
|
// close opened menu window after reslice
|
||||||
|
@ -1157,7 +1161,7 @@ void IMSlider::render_menu()
|
||||||
|
|
||||||
//BBS render this menu item only when extruder_num > 1
|
//BBS render this menu item only when extruder_num > 1
|
||||||
if (extruder_num > 1) {
|
if (extruder_num > 1) {
|
||||||
if (!m_can_change_color || m_draw_mode == dmSequentialFffPrint) {
|
if (!m_can_change_color || m_draw_mode == dmSequentialFffPrint || m_is_spiral_vase) {
|
||||||
begin_menu(_u8L("Change Filament").c_str(), false);
|
begin_menu(_u8L("Change Filament").c_str(), false);
|
||||||
}
|
}
|
||||||
else if (begin_menu(_u8L("Change Filament").c_str())) {
|
else if (begin_menu(_u8L("Change Filament").c_str())) {
|
||||||
|
|
|
@ -186,6 +186,7 @@ private:
|
||||||
bool m_enable_action_icon = true;
|
bool m_enable_action_icon = true;
|
||||||
bool m_enable_cog_icon = false;
|
bool m_enable_cog_icon = false;
|
||||||
bool m_is_wipe_tower = false; // This flag indicates that there is multiple extruder print with wipe tower
|
bool m_is_wipe_tower = false; // This flag indicates that there is multiple extruder print with wipe tower
|
||||||
|
bool m_is_spiral_vase = false;
|
||||||
bool m_display_lower = true;
|
bool m_display_lower = true;
|
||||||
bool m_display_higher = true;
|
bool m_display_higher = true;
|
||||||
int m_selected_tick_value = -1;
|
int m_selected_tick_value = -1;
|
||||||
|
|
Loading…
Reference in New Issue