wellton/CuraEngine
1
0
Fork 0
Código Issues Pull Requests Ações Pacotes Projetos Versões Wiki Atividade

refactor: handle layer plans outside of buffer (CURA-3339)

Ver Código-Fonte 
allocation is handled outside buffer
writing gcode is handled outside buffer
buffer processing is handled separately from adding to the buffer
Esse commit está contido em:
Tim Kuipers
2017-02-17 11:37:12 +01:00
pai 79cb7850e9
commit 5a48d86bd7
4 arquivos alterados com 68 adições e 36 exclusões
Baixar Arquivo de Patch Baixar Arquivo de Diff Expandir todos os arquivos Colapsar todos os arquivos
src/FffGcodeWriter.cpp
+42 -20
Ver Arquivo
@@ -68,7 +68,6 @@ void FffGcodeWriter::writeGCode(SliceDataStorage& storage, TimeKeeper& time_keep
gcode.writeLayerCountComment(total_layers);
{ // calculate the mesh order for each extruder
int extruder_count = storage.meshgroup->getExtruderCount();
mesh_order_per_extruder.reserve(extruder_count);
@@ -89,7 +88,15 @@ void FffGcodeWriter::writeGCode(SliceDataStorage& storage, TimeKeeper& time_keep
for (unsigned int layer_nr = process_layer_starting_layer_nr; layer_nr < total_layers; layer_nr++)
{
planner_state = processLayer(storage, layer_nr, total_layers);
GCodePlanner& gcode_layer = processLayer(storage, layer_nr, total_layers);
layer_plan_buffer.push(gcode_layer);
planner_state = gcode_layer.getPlanningState();
GCodePlanner* to_be_written = layer_plan_buffer.processBuffer();
if (to_be_written)
{
to_be_written->writeGCode(gcode);
delete to_be_written;
}
}
Progress::messageProgressStage(Progress::Stage::FINISH, &time_keeper);
@@ -296,7 +303,7 @@ void FffGcodeWriter::processRaft(const SliceDataStorage& storage, unsigned int t
int layer_height = train->getSettingInMicrons("raft_base_thickness");
z += layer_height;
int64_t comb_offset = train->getSettingInMicrons("raft_base_line_spacing");
GCodePlanner& gcode_layer = layer_plan_buffer.emplace_back(storage, layer_nr, z, layer_height, planner_state, fan_speed_layer_time_settings_per_extruder, combing_mode, comb_offset, train->getSettingBoolean("travel_avoid_other_parts"), train->getSettingInMicrons("travel_avoid_distance"));
GCodePlanner& gcode_layer = *new GCodePlanner(storage, layer_nr, z, layer_height, planner_state, fan_speed_layer_time_settings_per_extruder, combing_mode, comb_offset, train->getSettingBoolean("travel_avoid_other_parts"), train->getSettingInMicrons("travel_avoid_distance"));
gcode_layer.setIsInside(true);
gcode_layer.setExtruder(extruder_nr);
@@ -320,10 +327,17 @@ void FffGcodeWriter::processRaft(const SliceDataStorage& storage, unsigned int t
ensureAllExtrudersArePrimed(storage, gcode_layer, layer_nr);
}
planner_state = gcode_layer.getPlanningState();
gcode_layer.processFanSpeedAndMinimalLayerTime();
gcode_layer.overrideFanSpeeds(train->getSettingInPercentage("raft_base_fan_speed"));
layer_plan_buffer.push(gcode_layer);
planner_state = gcode_layer.getPlanningState();
GCodePlanner* to_be_written = layer_plan_buffer.processBuffer();
if (to_be_written)
{
to_be_written->writeGCode(gcode);
delete to_be_written;
}
}
{ // raft interface layer
@@ -331,7 +345,7 @@ void FffGcodeWriter::processRaft(const SliceDataStorage& storage, unsigned int t
int layer_height = train->getSettingInMicrons("raft_interface_thickness");
z += layer_height;
int64_t comb_offset = train->getSettingInMicrons("raft_interface_line_spacing");
GCodePlanner& gcode_layer = layer_plan_buffer.emplace_back(storage, layer_nr, z, layer_height, planner_state, fan_speed_layer_time_settings_per_extruder, combing_mode, comb_offset, train->getSettingBoolean("travel_avoid_other_parts"), train->getSettingInMicrons("travel_avoid_distance"));
GCodePlanner& gcode_layer = *new GCodePlanner(storage, layer_nr, z, layer_height, planner_state, fan_speed_layer_time_settings_per_extruder, combing_mode, comb_offset, train->getSettingBoolean("travel_avoid_other_parts"), train->getSettingInMicrons("travel_avoid_distance"));
gcode_layer.setIsInside(true);
gcode_layer.setExtruder(extruder_nr); // reset to extruder number, because we might have primed in the last layer
@@ -348,10 +362,17 @@ void FffGcodeWriter::processRaft(const SliceDataStorage& storage, unsigned int t
infill_comp.generate(raft_polygons, raftLines);
gcode_layer.addLinesByOptimizer(raftLines, &gcode_layer.configs_storage.raft_interface_config, SpaceFillType::Lines);
planner_state = gcode_layer.getPlanningState();
gcode_layer.processFanSpeedAndMinimalLayerTime();
gcode_layer.overrideFanSpeeds(train->getSettingInPercentage("raft_interface_fan_speed"));
layer_plan_buffer.push(gcode_layer);
planner_state = gcode_layer.getPlanningState();
GCodePlanner* to_be_written = layer_plan_buffer.processBuffer();
if (to_be_written)
{
to_be_written->writeGCode(gcode);
delete to_be_written;
}
}
int layer_height = train->getSettingInMicrons("raft_surface_thickness");
@@ -361,7 +382,7 @@ void FffGcodeWriter::processRaft(const SliceDataStorage& storage, unsigned int t
const int layer_nr = initial_raft_layer_nr + 2 + raftSurfaceLayer - 1; // 2: 1 base layer, 1 interface layer
z += layer_height;
const int64_t comb_offset = train->getSettingInMicrons("raft_surface_line_spacing");
GCodePlanner& gcode_layer = layer_plan_buffer.emplace_back(storage, layer_nr, z, layer_height, planner_state, fan_speed_layer_time_settings_per_extruder, combing_mode, comb_offset, train->getSettingBoolean("travel_avoid_other_parts"), train->getSettingInMicrons("travel_avoid_distance"));
GCodePlanner& gcode_layer = *new GCodePlanner(storage, layer_nr, z, layer_height, planner_state, fan_speed_layer_time_settings_per_extruder, combing_mode, comb_offset, train->getSettingBoolean("travel_avoid_other_parts"), train->getSettingInMicrons("travel_avoid_distance"));
gcode_layer.setIsInside(true);
if (CommandSocket::isInstantiated())
@@ -376,14 +397,21 @@ void FffGcodeWriter::processRaft(const SliceDataStorage& storage, unsigned int t
infill_comp.generate(raft_polygons, raft_lines);
gcode_layer.addLinesByOptimizer(raft_lines, &gcode_layer.configs_storage.raft_surface_config, SpaceFillType::Lines);
planner_state = gcode_layer.getPlanningState();
gcode_layer.processFanSpeedAndMinimalLayerTime();
gcode_layer.overrideFanSpeeds(train->getSettingInPercentage("raft_surface_fan_speed"));
layer_plan_buffer.push(gcode_layer);
planner_state = gcode_layer.getPlanningState();
GCodePlanner* to_be_written = layer_plan_buffer.processBuffer();
if (to_be_written)
{
to_be_written->writeGCode(gcode);
delete to_be_written;
}
}
}
GCodePlanner::PlanningState FffGcodeWriter::processLayer(const SliceDataStorage& storage, int layer_nr, unsigned int total_layers) const
GCodePlanner& FffGcodeWriter::processLayer(const SliceDataStorage& storage, int layer_nr, unsigned int total_layers) const
{
Progress::messageProgress(Progress::Stage::EXPORT, std::max(0, layer_nr) + 1, total_layers);
logDebug("GcodeWriter processing layer %i of %i\n", layer_nr, total_layers);
@@ -442,8 +470,7 @@ GCodePlanner::PlanningState FffGcodeWriter::processLayer(const SliceDataStorage&
int64_t comb_offset_from_outlines = max_inner_wall_width * 2;
LayerPlanBuffer& _layer_plan_buffer = *const_cast<LayerPlanBuffer*>(&layer_plan_buffer); // TODO: resolve const_cast!
GCodePlanner& gcode_layer = _layer_plan_buffer.emplace_back(storage, layer_nr, z, layer_thickness, planner_state, fan_speed_layer_time_settings_per_extruder, getSettingAsCombingMode("retraction_combing"), comb_offset_from_outlines, avoid_other_parts, avoid_distance);
GCodePlanner& gcode_layer = *new GCodePlanner(storage, layer_nr, z, layer_thickness, planner_state, fan_speed_layer_time_settings_per_extruder, getSettingAsCombingMode("retraction_combing"), comb_offset_from_outlines, avoid_other_parts, avoid_distance);
if (include_helper_parts && layer_nr == 0)
{ // process the skirt or the brim of the starting extruder.
@@ -532,12 +559,7 @@ GCodePlanner::PlanningState FffGcodeWriter::processLayer(const SliceDataStorage&
gcode_layer.processFanSpeedAndMinimalLayerTime();
GCodePlanner::PlanningState planner_state {
gcode_layer.getLastPosition()
, gcode_layer.getExtruder()
, gcode_layer.getIsInsideMesh()
};
return planner_state;
return gcode_layer;
}
bool FffGcodeWriter::getExtrudersNeedPrimeDuringFirstLayer() const
src/FffGcodeWriter.h
+2 -2
Ver Arquivo
@@ -218,9 +218,9 @@ private:
* \param[in] storage where the slice data is stored.
* \param layer_nr The index of the layer to write the gcode of.
* \param total_layers The total number of layers.
* \return The planning state after planning the layer
* \return The layer plans
*/
GCodePlanner::PlanningState processLayer(const SliceDataStorage& storage, int layer_nr, unsigned int total_layers) const;
GCodePlanner& processLayer(const SliceDataStorage& storage, int layer_nr, unsigned int total_layers) const;
/*!
* Whether the extruders need to be primed separately just before they are used.
src/LayerPlanBuffer.cpp
+5 -5
Ver Arquivo
@@ -17,7 +17,7 @@ void LayerPlanBuffer::flush()
}
while (!buffer.empty())
{
buffer.front().writeGCode(gcode);
buffer.front()->writeGCode(gcode);
if (CommandSocket::isInstantiated())
{
CommandSocket::getInstance()->flushGcode();
@@ -324,7 +324,7 @@ void LayerPlanBuffer::insertFinalPrintTempCommand(std::vector<ExtruderPlan*>& ex
void LayerPlanBuffer::insertTempCommands()
{
if (buffer.back().extruder_plans.size() == 0 || (buffer.back().extruder_plans.size() == 1 && buffer.back().extruder_plans[0].paths.size() == 0))
if (buffer.back()->extruder_plans.size() == 0 || (buffer.back()->extruder_plans.size() == 1 && buffer.back()->extruder_plans[0].paths.size() == 0))
{ // disregard empty layer
buffer.pop_back();
return;
@@ -332,9 +332,9 @@ void LayerPlanBuffer::insertTempCommands()
std::vector<ExtruderPlan*> extruder_plans;
extruder_plans.reserve(buffer.size() * 2);
for (GCodePlanner& layer_plan : buffer)
for (GCodePlanner* layer_plan : buffer)
{
for (ExtruderPlan& extr_plan : layer_plan.extruder_plans)
for (ExtruderPlan& extr_plan : layer_plan->extruder_plans)
{
extruder_plans.push_back(&extr_plan);
}
@@ -342,7 +342,7 @@ void LayerPlanBuffer::insertTempCommands()
// insert commands for all extruder plans on this layer
GCodePlanner& layer_plan = buffer.back();
GCodePlanner& layer_plan = *buffer.back();
for (unsigned int extruder_plan_idx = 0; extruder_plan_idx < layer_plan.extruder_plans.size(); extruder_plan_idx++)
{
unsigned int overall_extruder_plan_idx = extruder_plans.size() - layer_plan.extruder_plans.size() + extruder_plan_idx;
src/LayerPlanBuffer.h
+19 -9
Ver Arquivo
@@ -42,7 +42,7 @@ class LayerPlanBuffer : SettingsMessenger
std::vector<bool> extruder_used_in_meshgroup; //!< For each extruder whether it has already been planned once in this meshgroup. This is used to see whether we should heat to the initial_print_temp or to the printing_temperature
public:
std::list<GCodePlanner> buffer; //!< The buffer containing several layer plans (GCodePlanner) before writing them to gcode.
std::list<GCodePlanner*> buffer; //!< The buffer containing several layer plans (GCodePlanner) before writing them to gcode.
LayerPlanBuffer(SettingsBaseVirtual* settings, GCodeExport& gcode)
: SettingsMessenger(settings)
@@ -54,29 +54,39 @@ public:
{
preheat_config.setConfig(settings);
}
/*!
* Place a new layer plan (GcodePlanner) by constructing it with the given arguments.
* Pop back the oldest layer plan is it exceeds the buffer size and write it to gcode.
* Push a new layer plan into the buffer
*/
template<typename... Args>
GCodePlanner& emplace_back(Args&&... constructor_args)
void push(GCodePlanner& layer_plan)
{
buffer.push_back(&layer_plan);
}
/*!
* Process all layers in the buffer
* This inserts the temperature commands to start warming for a given layer in earlier layers
*
* Pop out the earliest layer in the buffer if the buffer size is exceeded
* \return A nullptr or the popped gcode_layer
*/
GCodePlanner* processBuffer()
{
if (buffer.size() > 0)
{
insertTempCommands(); // insert preheat commands of the just completed layer plan (not the newly emplaced one)
}
buffer.emplace_back(constructor_args...);
if (buffer.size() > buffer_size)
{
buffer.front().writeGCode(gcode);
GCodePlanner* ret = buffer.front();
if (CommandSocket::isInstantiated())
{
CommandSocket::getInstance()->flushGcode();
}
buffer.pop_front();
return ret;
}
return buffer.back();
return nullptr;
}
/*!