GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-13 07:39:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

skirt & brim per object if "complete individual objects"

Browse Source 
add skirt & brim to the arrange method (wrongly added to the merge commit)
 todo: fix the verify method.
This commit is contained in:
supermerill 2019-03-06 01:05:30 +01:00
parent 12a7143882
commit 3bf48193de
3 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/libslic3r/Print.cpp
View File

@ -1481,7 +1481,13 @@ void Print::process()
m_skirt.clear();
if (this->has_skirt()) {
this->set_status(88, "Generating skirt");
this->_make_skirt();
if (config().complete_objects){
for (PrintObject *obj : m_objects){
this->_make_skirt({ obj });
}
} else {
this->_make_skirt(m_objects);
}
}
this->set_done(psSkirt);
}
@ -1489,10 +1495,20 @@ void Print::process()
m_brim.clear();
if (m_config.brim_width > 0) {
this->set_status(88, "Generating brim");
if (config().brim_ears)
this->_make_brim_ears();
else
this->_make_brim();
if (config().complete_objects){
for (PrintObject *obj : m_objects){
if (config().brim_ears)
this->_make_brim_ears({ obj });
else
this->_make_brim({ obj });
}
} else {
if (config().brim_ears)
this->_make_brim_ears(m_objects);
else
this->_make_brim(m_objects);
}
}
this->set_done(psBrim);
}
@ -1529,7 +1545,7 @@ void Print::export_gcode(const std::string &path_template, GCodePreviewData *pre
gcode.do_export(this, path.c_str(), preview_data);
}
void Print::_make_skirt()
void Print::_make_skirt(const PrintObjectPtrs &objects)
{
// First off we need to decide how tall the skirt must be.
// The skirt_height option from config is expressed in layers, but our
@ -1542,7 +1558,7 @@ void Print::_make_skirt()
// prepended to the first 'n' layers (with 'n' = skirt_height).
// $skirt_height_z in this case is the highest possible skirt height for safety.
coordf_t skirt_height_z = 0.;
for (const PrintObject *object : m_objects) {
for (const PrintObject *object : objects) {
size_t skirt_layers = this->has_infinite_skirt() ?
object->layer_count() :
std::min(size_t(m_config.skirt_height.value), object->layer_count());
@ -1551,7 +1567,7 @@ void Print::_make_skirt()
// Collect points from all layers contained in skirt height.
Points points;
for (const PrintObject *object : m_objects) {
for (const PrintObject *object : objects) {
Points object_points;
// Get object layers up to skirt_height_z.
for (const Layer *layer : object->m_layers) {
@ -1667,11 +1683,11 @@ void Print::_make_skirt()
m_skirt.reverse();
}
void Print::_make_brim() {
void Print::_make_brim(const PrintObjectPtrs &objects) {
// Brim is only printed on first layer and uses perimeter extruder.
Flow flow = this->brim_flow();
Polygons islands;
for (PrintObject *object : m_objects) {
for (PrintObject *object : objects) {
Polygons object_islands;
for (ExPolygon &expoly : object->m_layers.front()->slices.expolygons)
object_islands.push_back(expoly.contour);
@ -1704,11 +1720,11 @@ void Print::_make_brim() {
extrusion_entities_append_loops(m_brim.entities, std::move(loops), erSkirt, float(flow.mm3_per_mm()), float(flow.width), float(this->skirt_first_layer_height()));
}
void Print::_make_brim_ears() {
void Print::_make_brim_ears(const PrintObjectPtrs &objects) {
Flow flow = this->brim_flow();
Points pt_ears;
Polygons islands;
for (PrintObject *object : m_objects) {
for (PrintObject *object : objects) {
Polygons object_islands;
for (ExPolygon &expoly : object->m_layers.front()->slices.expolygons)
object_islands.push_back(expoly.contour);

6
src/libslic3r/Print.hpp
View File

@ -365,9 +365,9 @@ protected:
private:
bool invalidate_state_by_config_options(const std::vector<t_config_option_key> &opt_keys);
void _make_skirt();
void _make_brim();
void _make_brim_ears();
void _make_skirt(const PrintObjectPtrs &objects);
void _make_brim(const PrintObjectPtrs &objects);
void _make_brim_ears(const PrintObjectPtrs &objects);
void _make_wipe_tower();
void _simplify_slices(double distance);

5
src/libslic3r/PrintConfig.cpp
View File

@ -3435,7 +3435,6 @@ double PrintConfig::min_object_distance(const ConfigBase *config)
{
double base_dist = config->option("duplicate_distance")->getFloat();
if (config->option("complete_objects")->getBool()){
std::cout << "min distance: complete objects\n";
std::vector<double> vals = dynamic_cast<const ConfigOptionFloats*>(config->option("nozzle_diameter"))->values;
double max_nozzle_diam = 0;
for (double val : vals) max_nozzle_diam = std::fmax(max_nozzle_diam, val);
@ -3443,23 +3442,19 @@ double PrintConfig::min_object_distance(const ConfigBase *config)
// min object distance is max(duplicate_distance, clearance_radius)
double extruder_clearance_radius = config->option("extruder_clearance_radius")->getFloat();
if (extruder_clearance_radius > base_dist){
std::cout << "min distance: set for extruder_clearance_radius: " << base_dist << " + " << extruder_clearance_radius << " + " << max_nozzle_diam << "\n";
base_dist = extruder_clearance_radius + max_nozzle_diam;
}
//add brim width
if (config->option("brim_width")->getFloat() > 0){
std::cout << "min distance: add for brim_width: " << base_dist << " += " << (config->option("brim_width")->getFloat()) << "\n";
base_dist += config->option("brim_width")->getFloat();
}
//add the skirt
if (config->option("skirts")->getInt() > 0){
//add skirt dist
std::cout << "min distance: set for skirt_distance: " << base_dist << " += " << config->option("skirt_distance")->getFloat() << "\n";
double dist_skirt = config->option("skirt_distance")->getFloat();
if (dist_skirt > config->option("brim_width")->getFloat())
base_dist += dist_skirt - config->option("brim_width")->getFloat();
//add skirt width
std::cout << "min distance: add for skirts: " << base_dist << " += " << (max_nozzle_diam*config->option("skirts")->getInt()*1.5) << "\n";
base_dist += max_nozzle_diam * config->option("skirts")->getInt() * 1.5;
}
}