3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed problem with changing extruders color

Browse source
This commit is contained in:
YuSanka 2018-03-02 13:41:37 +01:00
parent 0ec68eb35b
commit 2a378f6590
2 changed files with 53 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
xs/src/slic3r/GUI/GUI.cpp
View file

@ -407,7 +407,7 @@ void change_opt_value(DynamicPrintConfig& config, t_config_option_key opt_key, b
} }
case coPercents: case coPercents:
case coFloats:{ case coFloats:{
double& val = config.opt_float(opt_key, 0); double& val = config.opt_float(opt_key, opt_index);
val = boost::any_cast<double>(value); val = boost::any_cast<double>(value);
break; break;
} }
@ -422,7 +422,7 @@ void change_opt_value(DynamicPrintConfig& config, t_config_option_key opt_key, b
} }
else{ else{
ConfigOptionStrings* vec_new = new ConfigOptionStrings{ boost::any_cast<std::string>(value) }; ConfigOptionStrings* vec_new = new ConfigOptionStrings{ boost::any_cast<std::string>(value) };
config.option<ConfigOptionStrings>(opt_key)->set_at(vec_new, opt_index, opt_index); config.option<ConfigOptionStrings>(opt_key)->set_at(vec_new, opt_index, 0);
} }
} }
break; break;
@ -431,14 +431,14 @@ void change_opt_value(DynamicPrintConfig& config, t_config_option_key opt_key, b
break; break;
case coBools:{ case coBools:{
ConfigOptionBools* vec_new = new ConfigOptionBools{ boost::any_cast<bool>(value) }; ConfigOptionBools* vec_new = new ConfigOptionBools{ boost::any_cast<bool>(value) };
config.option<ConfigOptionBools>(opt_key)->set_at(vec_new, opt_index, opt_index); config.option<ConfigOptionBools>(opt_key)->set_at(vec_new, opt_index, 0);
break;} break;}
case coInt: case coInt:
config.set_key_value(opt_key, new ConfigOptionInt(boost::any_cast<int>(value))); config.set_key_value(opt_key, new ConfigOptionInt(boost::any_cast<int>(value)));
break; break;
case coInts:{ case coInts:{
ConfigOptionInts* vec_new = new ConfigOptionInts{ boost::any_cast<int>(value) }; ConfigOptionInts* vec_new = new ConfigOptionInts{ boost::any_cast<int>(value) };
config.option<ConfigOptionInts>(opt_key)->set_at(vec_new, opt_index, opt_index); config.option<ConfigOptionInts>(opt_key)->set_at(vec_new, opt_index, 0);
} }
break; break;
case coEnum:{ case coEnum:{

61
xs/src/slic3r/GUI/Tab.cpp
View file

@ -153,6 +153,7 @@ void Tab::load_config(DynamicPrintConfig config)
{ {
bool modified = 0; bool modified = 0;
boost::any value; boost::any value;
int opt_index = 0;
for(auto opt_key : m_config->diff(config)) { for(auto opt_key : m_config->diff(config)) {
switch ( config.def()->get(opt_key)->type ){ switch ( config.def()->get(opt_key)->type ){
case coFloatOrPercent: case coFloatOrPercent:
@ -167,29 +168,65 @@ void Tab::load_config(DynamicPrintConfig config)
case coString: case coString:
value = config.opt_string(opt_key); value = config.opt_string(opt_key);
break; break;
case coPercents: case coPercents:{
value = config.option<ConfigOptionPercents>(opt_key)->values.at(0); for (int i = 0; i < config.option<ConfigOptionPercents>(opt_key)->values.size(); i++)
if (config.option<ConfigOptionPercents>(opt_key)->values[i] !=
m_config->option<ConfigOptionPercents>(opt_key)->values[i]){
value = config.option<ConfigOptionPercents>(opt_key)->values[i];
opt_index = i;
break; break;
case coFloats: }
value = config.opt_float(opt_key, 0); }
break; break;
case coStrings: case coFloats:{
for (int i = 0; i < config.option<ConfigOptionFloats>(opt_key)->values.size(); i++)
if (config.option<ConfigOptionFloats>(opt_key)->values[i] !=
m_config->option<ConfigOptionFloats>(opt_key)->values[i]){
value = config.option<ConfigOptionFloats>(opt_key)->values[i];
opt_index = i;
break;
}
}
break;
case coStrings:{
if (config.option<ConfigOptionStrings>(opt_key)->values.empty()) if (config.option<ConfigOptionStrings>(opt_key)->values.empty())
value = ""; value = "";
else else{
value = config.opt_string(opt_key, static_cast<unsigned int>(0)); for (int i = 0; i < config.option<ConfigOptionStrings>(opt_key)->values.size(); i++)
if (config.option<ConfigOptionStrings>(opt_key)->values[i] !=
m_config->option<ConfigOptionStrings>(opt_key)->values[i]){
value = config.option<ConfigOptionStrings>(opt_key)->values[i];
opt_index = i;
break;
}
}
}
break; break;
case coBool: case coBool:
value = config.opt_bool(opt_key); value = config.opt_bool(opt_key);
break; break;
case coBools: case coBools:{
value = config.opt_bool(opt_key, 0); for (int i = 0; i < config.option<ConfigOptionBools>(opt_key)->values.size(); i++)
if (config.option<ConfigOptionBools>(opt_key)->values[i] !=
m_config->option<ConfigOptionBools>(opt_key)->values[i]){
value = config.option<ConfigOptionBools>(opt_key)->values[i];
opt_index = i;
break;
}
}
break; break;
case coInt: case coInt:
value = config.opt_int(opt_key); value = config.opt_int(opt_key);
break; break;
case coInts: case coInts:{
value = config.opt_int(opt_key, 0); for (int i = 0; i < config.option<ConfigOptionInts>(opt_key)->values.size(); i++)
if (config.option<ConfigOptionInts>(opt_key)->values[i] !=
m_config->option<ConfigOptionInts>(opt_key)->values[i]){
value = config.option<ConfigOptionInts>(opt_key)->values[i];
opt_index = i;
break;
}
}
break; break;
case coEnum:{ case coEnum:{
if (opt_key.compare("external_fill_pattern") == 0 || if (opt_key.compare("external_fill_pattern") == 0 ||
@ -210,7 +247,7 @@ void Tab::load_config(DynamicPrintConfig config)
default: default:
break; break;
} }
change_opt_value(*m_config, opt_key, value); change_opt_value(*m_config, opt_key, value, opt_index);
modified = 1; modified = 1;
} }
if (modified) { if (modified) {