Put skirt outside brim to avoid conflicts. #2157

This commit is contained in:
Alessandro Ranellucci 2014-07-24 23:43:19 +02:00
parent 86bad17abb
commit 7aaf27c0c7
4 changed files with 6 additions and 11 deletions

View file

@ -47,7 +47,7 @@ sub new {
my ($parent) = @_;
my $self = $class->SUPER::new($parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
$self->{config} = Slic3r::Config->new_from_defaults(qw(
bed_shape complete_objects extruder_clearance_radius skirts skirt_distance
bed_shape complete_objects extruder_clearance_radius skirts skirt_distance brim_width
));
$self->{model} = Slic3r::Model->new;
$self->{print} = Slic3r::Print->new;

View file

@ -166,7 +166,7 @@ sub repaint {
if (@{$self->{objects}} && $self->{config}->skirts) {
my @points = map @{$_->contour}, map @$_, map @{$_->instance_thumbnails}, @{$self->{objects}};
if (@points >= 3) {
my ($convex_hull) = @{offset([convex_hull(\@points)], scale($self->{config}->skirt_distance), 1, JT_ROUND, scale(0.1))};
my ($convex_hull) = @{offset([convex_hull(\@points)], scale max($self->{config}->brim_width + $self->{config}->skirt_distance), 1, JT_ROUND, scale(0.1))};
$dc->SetPen($self->{skirt_pen});
$dc->SetBrush($self->{transparent_brush});
$dc->DrawPolygon($self->scaled_points_to_pixel($convex_hull, 1), 0, 0);