ENH: skip_object: set enable_skip to false when only one object in plate
Single object doesn't need to support skip JIRA: no-jira Change-Id: Ic42488b80b09a451286d68f8f2348eade879eed8
This commit is contained in:
parent
4207c8b3d0
commit
4bcb70f079
|
@ -1443,7 +1443,7 @@ namespace DoExport {
|
||||||
output((boost::format("; thumbnail begin %dx%d %d\n") % data.width % data.height % encoded.size()).str().c_str());
|
output((boost::format("; thumbnail begin %dx%d %d\n") % data.width % data.height % encoded.size()).str().c_str());
|
||||||
|
|
||||||
unsigned int row_count = 0;
|
unsigned int row_count = 0;
|
||||||
//BBS: optimize performance ,reduce too much memeory operation
|
//BBS: optimize performance ,reduce too much memeory operation
|
||||||
size_t current_index = 0;
|
size_t current_index = 0;
|
||||||
while(current_index<encoded.size()){
|
while(current_index<encoded.size()){
|
||||||
output((boost::format("; %s\n") % encoded.substr(current_index, max_row_length)).str().c_str());
|
output((boost::format("; %s\n") % encoded.substr(current_index, max_row_length)).str().c_str());
|
||||||
|
@ -1675,6 +1675,7 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
|
||||||
file.write_format(";%s\n", GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Total_Layer_Number_Placeholder).c_str());
|
file.write_format(";%s\n", GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Total_Layer_Number_Placeholder).c_str());
|
||||||
//BBS: judge whether support skipping, if yes, list all label_object_id with sorted order here
|
//BBS: judge whether support skipping, if yes, list all label_object_id with sorted order here
|
||||||
if (print.num_object_instances() <= g_max_label_object && //Don't support too many objects on one plate
|
if (print.num_object_instances() <= g_max_label_object && //Don't support too many objects on one plate
|
||||||
|
(print.num_object_instances() > 1) && //Don't support skipping single object
|
||||||
print.calib_params().mode == CalibMode::Calib_None) { //Don't support skipping in cali mode
|
print.calib_params().mode == CalibMode::Calib_None) { //Don't support skipping in cali mode
|
||||||
m_enable_label_object = true;
|
m_enable_label_object = true;
|
||||||
m_label_objects_ids.clear();
|
m_label_objects_ids.clear();
|
||||||
|
@ -3072,7 +3073,7 @@ GCode::LayerResult GCode::process_layer(
|
||||||
|
|
||||||
if (print.calib_mode() == CalibMode::Calib_PA_Tower) {
|
if (print.calib_mode() == CalibMode::Calib_PA_Tower) {
|
||||||
gcode += writer().set_pressure_advance(print.calib_params().start + static_cast<int>(print_z) * print.calib_params().step);
|
gcode += writer().set_pressure_advance(print.calib_params().start + static_cast<int>(print_z) * print.calib_params().step);
|
||||||
}
|
}
|
||||||
else if (print.calib_mode() == CalibMode::Calib_Temp_Tower) {
|
else if (print.calib_mode() == CalibMode::Calib_Temp_Tower) {
|
||||||
auto offset = static_cast<unsigned int>(print_z / 10.001) * 5;
|
auto offset = static_cast<unsigned int>(print_z / 10.001) * 5;
|
||||||
gcode += writer().set_temperature(print.calib_params().start - offset);
|
gcode += writer().set_temperature(print.calib_params().start - offset);
|
||||||
|
|
Loading…
Reference in New Issue