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

Fix of preceding commit.

Browse source
This commit is contained in:
bubnikv 2017-10-17 19:41:04 +02:00
parent b9d57483d8
commit af51220f34
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xs/src/libslic3r/Print.cpp
View file

@ -847,9 +847,7 @@ void Print::_make_skirt()
extruders_e_per_mm.reserve(set_extruders.size()); extruders_e_per_mm.reserve(set_extruders.size());
for (auto &extruder_id : set_extruders) { for (auto &extruder_id : set_extruders) {
extruders.push_back(extruder_id); extruders.push_back(extruder_id);
GCodeConfig config; extruders_e_per_mm.push_back(Extruder((unsigned int)extruder_id, &this->config).e_per_mm(mm3_per_mm));
config.apply(this->config, true);
extruders_e_per_mm.push_back(Extruder((unsigned int)extruder_id, &config).e_per_mm(mm3_per_mm));
} }
} }

11
xs/src/perlglue.cpp
View file

@ -65,7 +65,7 @@ SV* ConfigBase__as_hash(ConfigBase* THIS)
{ {
HV* hv = newHV(); HV* hv = newHV();
for (auto &key : THIS->keys()) for (auto &key : THIS->keys())
(void)hv_store(hv, key.c_str(), key.length(), ConfigBase__get(THIS, *it), 0); (void)hv_store(hv, key.c_str(), key.length(), ConfigBase__get(THIS, key), 0);
return newRV_noinc((SV*)hv); return newRV_noinc((SV*)hv);
} }
@ -74,7 +74,7 @@ SV* ConfigBase__get(ConfigBase* THIS, const t_config_option_key &opt_key)
ConfigOption* opt = THIS->option(opt_key); ConfigOption* opt = THIS->option(opt_key);
return (opt == nullptr) ? return (opt == nullptr) ?
&PL_sv_undef : &PL_sv_undef :
ConfigOption_to_SV(*opt, *THIS->def->get(opt_key)); ConfigOption_to_SV(*opt, *THIS->def()->get(opt_key));
} }
SV* ConfigOption_to_SV(const ConfigOption &opt, const ConfigOptionDef &def) SV* ConfigOption_to_SV(const ConfigOption &opt, const ConfigOptionDef &def)
@ -152,7 +152,7 @@ SV* ConfigBase__get_at(ConfigBase* THIS, const t_config_option_key &opt_key, siz
ConfigOption* opt = THIS->option(opt_key); ConfigOption* opt = THIS->option(opt_key);
if (opt == NULL) return &PL_sv_undef; if (opt == NULL) return &PL_sv_undef;
const ConfigOptionDef* def = THIS->def->get(opt_key); const ConfigOptionDef* def = THIS->def()->get(opt_key);
switch (def->type) { switch (def->type) {
case coFloats: case coFloats:
case coPercents: case coPercents:
@ -179,7 +179,8 @@ bool ConfigBase__set(ConfigBase* THIS, const t_config_option_key &opt_key, SV* v
ConfigOption* opt = THIS->option(opt_key, true); ConfigOption* opt = THIS->option(opt_key, true);
if (opt == NULL) CONFESS("Trying to set non-existing option"); if (opt == NULL) CONFESS("Trying to set non-existing option");
const ConfigOptionDef* def = THIS->def->get(opt_key); const ConfigOptionDef* def = THIS->def()->get(opt_key);
switch (def->type) {
case coFloat: case coFloat:
if (!looks_like_number(value)) if (!looks_like_number(value))
return false; return false;
@ -307,7 +308,7 @@ void ConfigBase__set_ifndef(ConfigBase* THIS, const t_config_option_key &opt_key
bool StaticConfig__set(StaticConfig* THIS, const t_config_option_key &opt_key, SV* value) bool StaticConfig__set(StaticConfig* THIS, const t_config_option_key &opt_key, SV* value)
{ {
const ConfigOptionDef* optdef = THIS->def->get(opt_key); const ConfigOptionDef* optdef = THIS->def()->get(opt_key);
if (optdef->shortcut.empty()) if (optdef->shortcut.empty())
return ConfigBase__set(THIS, opt_key, value); return ConfigBase__set(THIS, opt_key, value);
for (const t_config_option_key &key : optdef->shortcut) for (const t_config_option_key &key : optdef->shortcut)