mirror of
https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git
synced 2025-08-15 23:15:54 +08:00
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into dev
This commit is contained in:
commit
9139ab3f7e
@ -3774,7 +3774,7 @@ void PrintConfigDef::init_sla_params()
|
|||||||
def->enum_labels.push_back(L("Slow"));
|
def->enum_labels.push_back(L("Slow"));
|
||||||
def->enum_labels.push_back(L("Fast"));
|
def->enum_labels.push_back(L("Fast"));
|
||||||
def->mode = comAdvanced;
|
def->mode = comAdvanced;
|
||||||
def->set_default_value(new ConfigOptionEnum<SLAMaterialSpeed>(slamsSlow));
|
def->set_default_value(new ConfigOptionEnum<SLAMaterialSpeed>(slamsFast));
|
||||||
}
|
}
|
||||||
|
|
||||||
void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &value)
|
void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &value)
|
||||||
|
@ -885,6 +885,10 @@ void Tab::on_roll_back_value(const bool to_sys /*= true*/)
|
|||||||
}
|
}
|
||||||
|
|
||||||
m_postpone_update_ui = false;
|
m_postpone_update_ui = false;
|
||||||
|
|
||||||
|
// When all values are rolled, then we hane to update whole tab in respect to the reverted values
|
||||||
|
update();
|
||||||
|
|
||||||
update_changed_ui();
|
update_changed_ui();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1148,6 +1152,13 @@ void Tab::on_value_change(const std::string& opt_key, const boost::any& value)
|
|||||||
if (opt_key == "extruders_count")
|
if (opt_key == "extruders_count")
|
||||||
wxGetApp().plater()->on_extruders_change(boost::any_cast<size_t>(value));
|
wxGetApp().plater()->on_extruders_change(boost::any_cast<size_t>(value));
|
||||||
|
|
||||||
|
if (m_postpone_update_ui) {
|
||||||
|
// It means that not all values are rolled to the system/last saved values jet.
|
||||||
|
// And call of the update() can causes a redundant check of the config values,
|
||||||
|
// see https://github.com/prusa3d/PrusaSlicer/issues/7146
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
update();
|
update();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user