mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: object params variant crash 

Change-Id: Ia67b98c29a0cc97f8479911ffdefb942cb6c751f
Jira: none
This commit is contained in:
chunmao.guo 2024-12-06 14:05:50 +08:00 committed by lane.wei
parent e2330d1af7
commit 8bf65c0963
4 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libslic3r/Config.cpp
View File

@ -453,10 +453,12 @@ void ConfigBase::apply_only(const ConfigBase &other, const t_config_option_keys
// This is only possible if other is of DynamicConfig type.
if (auto n = opt_key.find('#'); n != std::string::npos) {
auto opt_key2 = opt_key.substr(0, n);
auto my_opt2 = dynamic_cast<ConfigOptionVectorBase*>(this->option(opt_key2, true));
auto my_opt2 = dynamic_cast<ConfigOptionVectorBase*>(this->option(opt_key2));
auto other_opt = other.option(opt_key2);
if (my_opt2 == nullptr && other_opt)
my_opt2 = dynamic_cast<ConfigOptionVectorBase*>(other_opt->clone());
if (my_opt2) {
int index = std::atoi(opt_key.c_str() + n + 1);
auto other_opt = other.option(opt_key2);
if (other_opt)
my_opt2->set_at(other_opt, index, index);
continue;

4
src/libslic3r/PrintConfig.cpp
View File

@ -430,6 +430,10 @@ std::vector<std::map<int, int>> get_extruder_ams_count(const std::vector<std::st
std::vector<std::map<int, int>> extruder_ams_counts;
for (const std::string& str : strs) {
std::map<int, int> ams_count_info;
if (str.empty()) {
extruder_ams_counts.emplace_back(ams_count_info);
continue;
}
std::vector<std::string> ams_infos;
boost::algorithm::split(ams_infos, str, boost::algorithm::is_any_of("|"));
for (const std::string& ams_info : ams_infos) {

2
src/slic3r/GUI/Field.cpp
View File

@ -923,7 +923,7 @@ void CheckBox::set_value(const boost::any& value, bool change_event)
{
m_disable_change_event = !change_event;
if (m_opt.nullable) {
m_is_na_val = boost::any_cast<unsigned char>(value) == ConfigOptionBoolsNullable::nil_value();
m_is_na_val = value.empty() || boost::any_cast<unsigned char>(value) == ConfigOptionBoolsNullable::nil_value();
if (!m_is_na_val)
m_last_meaningful_value = value;
dynamic_cast<::CheckBox*>(window)->SetValue(m_is_na_val ? false : boost::any_cast<unsigned char>(value) != 0); // BBS

18
src/slic3r/GUI/Tab.cpp
View File

@ -2548,7 +2548,9 @@ void TabPrintModel::update_model_config()
//update();
if (!m_null_keys.empty()) {
if (m_active_page) {
for (auto k : m_null_keys) {
auto null_keys = m_null_keys;
filter_diff_option(null_keys);
for (auto k : null_keys) {
auto f = m_active_page->get_field(k);
if (f)
f->set_value(boost::any(), false);
@ -2581,7 +2583,9 @@ void TabPrintModel::activate_selected_page(std::function<void()> throw_if_cancel
{
TabPrint::activate_selected_page(throw_if_canceled);
if (m_active_page) {
for (auto k : m_null_keys) {
auto null_keys = m_null_keys;
filter_diff_option(null_keys);
for (auto k : null_keys) {
auto f = m_active_page->get_field(k);
if (f)
f->set_value(boost::any(), false);
@ -2615,7 +2619,7 @@ void TabPrintModel::on_value_change(const std::string& opt_id, const boost::any&
bool set = true; // *m_config->option(k) != *m_prints.get_selected_preset().config.option(k) || inull != m_null_keys.end();
auto tab_opt = dynamic_cast<ConfigOptionVectorBase *>(m_config->option(opt_key));
static std::map<ConfigOptionType, ConfigOptionVectorBase const *> null_vecs {
{coBools, new ConfigOptionBoolsNullable(1, ConfigOptionBoolsNullable::nil_value())},
{coBools, new ConfigOptionBoolsNullable(std::initializer_list<unsigned char>{ConfigOptionBoolsNullable::nil_value()})},
{coInts, new ConfigOptionIntsNullable(1, ConfigOptionIntsNullable::nil_value())},
{coFloats, new ConfigOptionFloatsNullable(1, ConfigOptionFloatsNullable::nil_value())},
{coPercents, new ConfigOptionPercentsNullable(1, ConfigOptionPercentsNullable::nil_value())},
@ -2672,6 +2676,14 @@ void TabPrintModel::on_value_change(const std::string& opt_id, const boost::any&
void TabPrintModel::reload_config()
{
TabPrint::reload_config();
if (m_active_page) {
auto null_keys = m_null_keys;
filter_diff_option(null_keys);
for (auto k : null_keys) {
auto f = m_active_page->get_field(k);
if (f) f->set_value(boost::any(), false);
}
}
auto keys = m_config_manipulation.applying_keys();
bool super_changed = false;
for (auto & k : keys) {