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

Finalized the experimental "synchronize support layers with object layers"

Browse Source 
feature (the support_material_synchronize_layers settings).
The feature is now enabled for the soluble supports only
(with support_material_contact_distance > 0).

Fixes https://github.com/prusa3d/Slic3r/issues/197
This commit is contained in:
bubnikv 2017-04-10 12:00:07 +02:00
parent 688fe3e2b2
commit 23be6233c8
3 changed files with 68 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Slic3r/GUI/Tab.pm
View File

@ -646,6 +646,7 @@ sub build {
{ {
my $optgroup = $page->new_optgroup('Raft'); my $optgroup = $page->new_optgroup('Raft');
$optgroup->append_single_option_line('raft_layers'); $optgroup->append_single_option_line('raft_layers');
# $optgroup->append_single_option_line('raft_contact_distance');
} }
{ {
my $optgroup = $page->new_optgroup('Options for support material and raft'); my $optgroup = $page->new_optgroup('Options for support material and raft');
@ -929,17 +930,20 @@ sub _update {
# perimeter_extruder uses the same logic as in Print::extruders() # perimeter_extruder uses the same logic as in Print::extruders()
$self->get_field('perimeter_extruder')->toggle($have_perimeters || $have_brim); $self->get_field('perimeter_extruder')->toggle($have_perimeters || $have_brim);
my $have_support_material = $config->support_material || $config->raft_layers > 0; my $have_raft = $config->raft_layers > 0;
my $have_support_material = $config->support_material || $have_raft;
my $have_support_interface = $config->support_material_interface_layers > 0; my $have_support_interface = $config->support_material_interface_layers > 0;
my $have_support_soluble = $have_support_material && $config->support_material_contact_distance == 0;
$self->get_field($_)->toggle($have_support_material) $self->get_field($_)->toggle($have_support_material)
for qw(support_material_threshold support_material_pattern support_material_with_sheath for qw(support_material_threshold support_material_pattern support_material_with_sheath
support_material_spacing support_material_synchronize_layers support_material_angle support_material_spacing support_material_angle
support_material_interface_layers dont_support_bridges support_material_interface_layers dont_support_bridges
support_material_extrusion_width support_material_contact_distance support_material_xy_spacing); support_material_extrusion_width support_material_contact_distance support_material_xy_spacing);
$self->get_field($_)->toggle($have_support_material && $have_support_interface) $self->get_field($_)->toggle($have_support_material && $have_support_interface)
for qw(support_material_interface_spacing support_material_interface_extruder for qw(support_material_interface_spacing support_material_interface_extruder
support_material_interface_speed support_material_interface_contact_loops); support_material_interface_speed support_material_interface_contact_loops);
$self->get_field('support_material_synchronize_layers')->toggle($have_support_soluble);
$self->get_field('perimeter_extrusion_width')->toggle($have_perimeters || $have_skirt || $have_brim); $self->get_field('perimeter_extrusion_width')->toggle($have_perimeters || $have_skirt || $have_brim);
$self->get_field('support_material_extruder')->toggle($have_support_material || $have_skirt); $self->get_field('support_material_extruder')->toggle($have_support_material || $have_skirt);
$self->get_field('support_material_speed')->toggle($have_support_material || $have_brim || $have_skirt); $self->get_field('support_material_speed')->toggle($have_support_material || $have_brim || $have_skirt);

127
xs/src/libslic3r/SupportMaterial.cpp
View File

@ -922,9 +922,6 @@ PrintObjectSupportMaterial::MyLayersPtr PrintObjectSupportMaterial::top_contact_
new_layer.print_z = m_slicing_params.first_print_layer_height; new_layer.print_z = m_slicing_params.first_print_layer_height;
new_layer.bottom_z = 0; new_layer.bottom_z = 0;
new_layer.height = m_slicing_params.first_print_layer_height; new_layer.height = m_slicing_params.first_print_layer_height;
} else if (this->synchronize_layers()) {
// Don't do anything special for the top contact surfaces in regard to synchronizing the layers.
// Bottom contact surfaces will be synchronized though.
} else { } else {
// Don't know the height of the top contact layer yet. The top contact layer is printed with a normal flow and // Don't know the height of the top contact layer yet. The top contact layer is printed with a normal flow and
// its height will be set adaptively later on. // its height will be set adaptively later on.
@ -1260,7 +1257,6 @@ PrintObjectSupportMaterial::MyLayersPtr PrintObjectSupportMaterial::raft_and_int
extremes.front()->layer_type == sltTopContact || // first extreme is a top contact layer extremes.front()->layer_type == sltTopContact || // first extreme is a top contact layer
extremes.front()->extreme_z() > m_slicing_params.first_print_layer_height - EPSILON))); extremes.front()->extreme_z() > m_slicing_params.first_print_layer_height - EPSILON)));
// bool synchronize = m_slicing_params.soluble_interface || this->synchronize_layers();
bool synchronize = this->synchronize_layers(); bool synchronize = this->synchronize_layers();
#ifdef _DEBUG #ifdef _DEBUG
@ -1328,73 +1324,70 @@ PrintObjectSupportMaterial::MyLayersPtr PrintObjectSupportMaterial::raft_and_int
continue; continue;
// The new layers shall be at least m_support_layer_height_min thick. // The new layers shall be at least m_support_layer_height_min thick.
assert(dist >= m_support_layer_height_min - EPSILON); assert(dist >= m_support_layer_height_min - EPSILON);
// Insert intermediate layers.
size_t n_layers_extra = size_t(ceil(dist / m_slicing_params.max_suport_layer_height));
assert(n_layers_extra > 0);
coordf_t step = dist / coordf_t(n_layers_extra);
if (! synchronize && extr1 != nullptr && extr1->layer_type == sltTopContact &&
extr1->print_z + this->m_support_layer_height_min > extr1->bottom_z + step) {
// The bottom extreme is a bottom of a top surface. Ensure that the gap
// between the 1st intermediate layer print_z and extr1->print_z is not too small.
assert(extr1->bottom_z + this->m_support_layer_height_min < extr1->print_z + EPSILON);
// Generate the first intermediate layer.
MyLayer &layer_new = layer_allocate(layer_storage, sltIntermediate);
layer_new.bottom_z = extr1->bottom_z;
layer_new.print_z = extr1z = extr1->print_z;
layer_new.height = extr1->height;
intermediate_layers.push_back(&layer_new);
dist = extr2z - extr1z;
n_layers_extra = size_t(ceil(dist / m_slicing_params.max_suport_layer_height));
if (n_layers_extra == 0)
continue;
// Continue printing the other layers up to extr2z.
step = dist / coordf_t(n_layers_extra);
}
if (! synchronize && ! m_slicing_params.soluble_interface && extr2->layer_type == sltTopContact) {
// This is a top interface layer, which does not have a height assigned yet. Do it now.
assert(extr2->height == 0.);
assert(extr1z > m_slicing_params.first_print_layer_height - EPSILON);
extr2->height = step;
extr2->bottom_z = extr2z = extr2->print_z - step;
if (-- n_layers_extra == 0)
continue;
}
coordf_t extr2z_large_steps = extr2z;
if (synchronize) { if (synchronize) {
// Synchronize support layers with the object layers. // Emit support layers synchronized with the object layers.
if (object.layers.front()->print_z - extr1z > m_slicing_params.max_suport_layer_height) { // Find the first object layer, which has its print_z in this support Z range.
// Generate the initial couple of layers before reaching the 1st object layer print_z level. while (idx_layer_object < object.layers.size() && object.layers[idx_layer_object]->print_z < extr1z + EPSILON)
extr2z_large_steps = object.layers.front()->print_z; ++ idx_layer_object;
dist = extr2z_large_steps - extr1z; // Emit all intermediate support layers synchronized with object layers up to extr2z.
assert(dist >= 0.); for (; idx_layer_object < object.layers.size() && object.layers[idx_layer_object]->print_z < extr2z + EPSILON; ++ idx_layer_object) {
MyLayer &layer_new = layer_allocate(layer_storage, sltIntermediate);
layer_new.print_z = object.layers[idx_layer_object]->print_z;
layer_new.height = object.layers[idx_layer_object]->height;
layer_new.bottom_z = layer_new.print_z - layer_new.height;
assert(intermediate_layers.empty() || intermediate_layers.back()->print_z < layer_new.print_z + EPSILON);
intermediate_layers.push_back(&layer_new);
}
} else {
// Insert intermediate layers.
size_t n_layers_extra = size_t(ceil(dist / m_slicing_params.max_suport_layer_height));
assert(n_layers_extra > 0);
coordf_t step = dist / coordf_t(n_layers_extra);
if (extr1 != nullptr && extr1->layer_type == sltTopContact &&
extr1->print_z + this->m_support_layer_height_min > extr1->bottom_z + step) {
// The bottom extreme is a bottom of a top surface. Ensure that the gap
// between the 1st intermediate layer print_z and extr1->print_z is not too small.
assert(extr1->bottom_z + this->m_support_layer_height_min < extr1->print_z + EPSILON);
// Generate the first intermediate layer.
MyLayer &layer_new = layer_allocate(layer_storage, sltIntermediate);
layer_new.bottom_z = extr1->bottom_z;
layer_new.print_z = extr1z = extr1->print_z;
layer_new.height = extr1->height;
intermediate_layers.push_back(&layer_new);
dist = extr2z - extr1z;
n_layers_extra = size_t(ceil(dist / m_slicing_params.max_suport_layer_height)); n_layers_extra = size_t(ceil(dist / m_slicing_params.max_suport_layer_height));
if (n_layers_extra == 0)
continue;
// Continue printing the other layers up to extr2z.
step = dist / coordf_t(n_layers_extra); step = dist / coordf_t(n_layers_extra);
} }
} if (! m_slicing_params.soluble_interface && extr2->layer_type == sltTopContact) {
// Take the largest allowed step in the Z axis until extr2z_large_steps is reached. // This is a top interface layer, which does not have a height assigned yet. Do it now.
for (size_t i = 0; i < n_layers_extra; ++ i) { assert(extr2->height == 0.);
MyLayer &layer_new = layer_allocate(layer_storage, sltIntermediate); assert(extr1z > m_slicing_params.first_print_layer_height - EPSILON);
if (i + 1 == n_layers_extra) { extr2->height = step;
// Last intermediate layer added. Align the last entered layer with extr2z_large_steps exactly. extr2->bottom_z = extr2z = extr2->print_z - step;
layer_new.bottom_z = (i == 0) ? extr1z : intermediate_layers.back()->print_z; if (-- n_layers_extra == 0)
layer_new.print_z = extr2z_large_steps; continue;
layer_new.height = layer_new.print_z - layer_new.bottom_z; }
} coordf_t extr2z_large_steps = extr2z;
else { // Take the largest allowed step in the Z axis until extr2z_large_steps is reached.
// Intermediate layer, not the last added. for (size_t i = 0; i < n_layers_extra; ++ i) {
layer_new.height = step; MyLayer &layer_new = layer_allocate(layer_storage, sltIntermediate);
layer_new.bottom_z = extr1z + i * step; if (i + 1 == n_layers_extra) {
layer_new.print_z = layer_new.bottom_z + step; // Last intermediate layer added. Align the last entered layer with extr2z_large_steps exactly.
} layer_new.bottom_z = (i == 0) ? extr1z : intermediate_layers.back()->print_z;
assert(intermediate_layers.empty() || intermediate_layers.back()->print_z <= layer_new.print_z); layer_new.print_z = extr2z_large_steps;
intermediate_layers.push_back(&layer_new); layer_new.height = layer_new.print_z - layer_new.bottom_z;
} }
if (synchronize) { else {
// Emit support layers synchronized with object layers. // Intermediate layer, not the last added.
extr1z = extr2z_large_steps; layer_new.height = step;
while (extr1z < extr2z) { layer_new.bottom_z = extr1z + i * step;
//while (idx_layer_object < object.layers.size() && object.layers[idx_layer_object].print_z < extr1z) layer_new.print_z = layer_new.bottom_z + step;
// idx_layer_object }
assert(intermediate_layers.empty() || intermediate_layers.back()->print_z <= layer_new.print_z);
intermediate_layers.push_back(&layer_new);
} }
} }
} }

2
xs/src/libslic3r/SupportMaterial.hpp
View File

@ -138,7 +138,7 @@ public:
bool has_support() const { return m_object_config->support_material.value; } bool has_support() const { return m_object_config->support_material.value; }
bool build_plate_only() const { return this->has_support() && m_object_config->support_material_buildplate_only.value; } bool build_plate_only() const { return this->has_support() && m_object_config->support_material_buildplate_only.value; }
bool synchronize_layers() const { return m_object_config->support_material_synchronize_layers.value; } bool synchronize_layers() const { return m_slicing_params.soluble_interface && m_object_config->support_material_synchronize_layers.value; }
bool has_contact_loops() const { return m_object_config->support_material_interface_contact_loops.value; } bool has_contact_loops() const { return m_object_config->support_material_interface_contact_loops.value; }
// Generate support material for the object. // Generate support material for the object.