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

Fixed missing default_region_config values exported into the g-code.

Browse Source
This commit is contained in:
bubnikv 2017-06-14 15:16:43 +02:00
parent 3e82eb7010
commit c431bf5982
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xs/src/libslic3r/GCode.cpp
View File

@ -666,10 +666,14 @@ bool GCode::do_export(FILE *file, Print &print)
// Append full config. // Append full config.
fprintf(file, "\n"); fprintf(file, "\n");
for (const std::string &key : print.config.keys()) {
fprintf(file, "; %s = %s\n", key.c_str(), print.config.serialize(key).c_str()); StaticPrintConfig *configs[] = { &print.config, &print.default_object_config, &print.default_region_config };
for (const std::string &key : print.default_object_config.keys()) for (size_t i = 0; i < sizeof(configs) / sizeof(configs[0]); ++ i) {
fprintf(file, "; %s = %s\n", key.c_str(), print.default_object_config.serialize(key).c_str()); StaticPrintConfig *cfg = configs[i];
for (const std::string &key : cfg->keys())
fprintf(file, "; %s = %s\n", key.c_str(), cfg->serialize(key).c_str());
}
}
return true; return true;
} }
@ -1062,6 +1066,8 @@ void GCode::process_layer(
copies = print_object->_shifted_copies; copies = print_object->_shifted_copies;
else else
copies.push_back(print_object->_shifted_copies[single_object_idx]); copies.push_back(print_object->_shifted_copies[single_object_idx]);
// Sort the copies by the closest point starting with the current print position.
for (const Point &copy : copies) { for (const Point &copy : copies) {
// When starting a new object, use the external motion planner for the first travel move. // When starting a new object, use the external motion planner for the first travel move.
std::pair<const PrintObject*, Point> this_object_copy(print_object, copy); std::pair<const PrintObject*, Point> this_object_copy(print_object, copy);