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

Don't output slic3r:z attribute in SVG for raft layers

Browse source
This commit is contained in:
Alessandro Ranellucci 2015-01-30 18:45:30 +01:00
parent e2b1b52679
commit 8605969dc5
5 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/Slic3r/Print.pm
View file

@ -140,8 +140,11 @@ EOF
my @previous_layer_slices = (); my @previous_layer_slices = ();
for my $layer (@layers) { for my $layer (@layers) {
$layer_id++; $layer_id++;
# TODO: remove slic3r:z for raft layers if ($layer->slice_z == -1) {
printf $fh qq{ <g id="layer%d" slic3r:z="%s">\n}, $layer_id, unscale($layer->slice_z); printf $fh qq{ <g id="layer%d">\n}, $layer_id;
} else {
printf $fh qq{ <g id="layer%d" slic3r:z="%s">\n}, $layer_id, unscale($layer->slice_z);
}
my @current_layer_slices = (); my @current_layer_slices = ();
# sort slices so that the outermost ones come first # sort slices so that the outermost ones come first

2
lib/Slic3r/Print/SupportMaterial.pm
View file

@ -76,7 +76,7 @@ sub generate {
$i, # id $i, # id
($i == 0) ? $support_z->[$i] : ($support_z->[$i] - $support_z->[$i-1]), # height ($i == 0) ? $support_z->[$i] : ($support_z->[$i] - $support_z->[$i-1]), # height
$support_z->[$i], # print_z $support_z->[$i], # print_z
-1); # slice_z );
if ($i >= 1) { if ($i >= 1) {
$object->support_layers->[-2]->set_upper_layer($object->support_layers->[-1]); $object->support_layers->[-2]->set_upper_layer($object->support_layers->[-1]);
$object->support_layers->[-1]->set_lower_layer($object->support_layers->[-2]); $object->support_layers->[-1]->set_lower_layer($object->support_layers->[-2]);

2
xs/src/libslic3r/Print.hpp
View file

@ -126,7 +126,7 @@ class PrintObject
size_t support_layer_count() const; size_t support_layer_count() const;
void clear_support_layers(); void clear_support_layers();
SupportLayer* get_support_layer(int idx); SupportLayer* get_support_layer(int idx);
SupportLayer* add_support_layer(int id, coordf_t height, coordf_t print_z, coordf_t slice_z); SupportLayer* add_support_layer(int id, coordf_t height, coordf_t print_z);
void delete_support_layer(int idx); void delete_support_layer(int idx);
// methods for handling state // methods for handling state

5
xs/src/libslic3r/PrintObject.cpp
View file

@ -190,10 +190,9 @@ PrintObject::get_support_layer(int idx)
} }
SupportLayer* SupportLayer*
PrintObject::add_support_layer(int id, coordf_t height, coordf_t print_z, PrintObject::add_support_layer(int id, coordf_t height, coordf_t print_z)
coordf_t slice_z)
{ {
SupportLayer* layer = new SupportLayer(id, this, height, print_z, slice_z); SupportLayer* layer = new SupportLayer(id, this, height, print_z, -1);
support_layers.push_back(layer); support_layers.push_back(layer);
return layer; return layer;
} }

2
xs/xsp/Print.xsp
View file

@ -95,7 +95,7 @@ _constant()
size_t support_layer_count(); size_t support_layer_count();
void clear_support_layers(); void clear_support_layers();
Ref<SupportLayer> get_support_layer(int idx); Ref<SupportLayer> get_support_layer(int idx);
Ref<SupportLayer> add_support_layer(int id, coordf_t height, coordf_t print_z, coordf_t slice_z); Ref<SupportLayer> add_support_layer(int id, coordf_t height, coordf_t print_z);
void delete_support_layer(int idx); void delete_support_layer(int idx);
bool invalidate_state_by_config_options(std::vector<std::string> opt_keys); bool invalidate_state_by_config_options(std::vector<std::string> opt_keys);