-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bugfix: first layer extrusion width was computed on general layer hei…
…ght rather than first layer height. #465
- Loading branch information
Showing
2 changed files
with
14 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,9 +3,12 @@ use Moo; | |
|
||
use Slic3r::Geometry qw(PI); | ||
|
||
has 'width' => (is => 'rw'); | ||
has 'min_spacing' => (is => 'rw'); | ||
has 'spacing' => (is => 'rw'); | ||
has 'width' => (is => 'rw'); | ||
has 'min_spacing' => (is => 'rw'); | ||
has 'spacing' => (is => 'rw'); | ||
has 'layer_height' => (is => 'lazy', builder => 1); | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
alranel
Author
Member
|
||
|
||
sub _build_layer_height { $Slic3r::layer_height } | ||
|
||
sub calculate { | ||
my $self = shift; | ||
|
@@ -14,20 +17,20 @@ sub calculate { | |
my ($flow_width, $min_flow_spacing, $flow_spacing); | ||
if ($extrusion_width) { | ||
$flow_width = $extrusion_width =~ /^(\d+(?:\.\d+)?)%$/ | ||
? ($Slic3r::layer_height * $1 / 100) | ||
? ($self->layer_height * $1 / 100) | ||
: $extrusion_width; | ||
} else { | ||
# here we calculate a sane default by matching the flow speed (at the nozzle) | ||
# and the feed rate | ||
my $volume = ($Slic3r::nozzle_diameter**2) * PI/4; | ||
my $shape_threshold = $Slic3r::nozzle_diameter * $Slic3r::layer_height | ||
+ ($Slic3r::layer_height**2) * PI/4; | ||
my $shape_threshold = $Slic3r::nozzle_diameter * $self->layer_height | ||
+ ($self->layer_height**2) * PI/4; | ||
if ($volume >= $shape_threshold) { | ||
# rectangle with semicircles at the ends | ||
$flow_width = (($Slic3r::nozzle_diameter**2) * PI + ($Slic3r::layer_height**2) * (4 - PI)) / (4 * $Slic3r::layer_height); | ||
$flow_width = (($Slic3r::nozzle_diameter**2) * PI + ($self->layer_height**2) * (4 - PI)) / (4 * $self->layer_height); | ||
} else { | ||
# rectangle with squished semicircles at the ends | ||
$flow_width = $Slic3r::nozzle_diameter * ($Slic3r::nozzle_diameter/$Slic3r::layer_height - 4/PI + 1); | ||
$flow_width = $Slic3r::nozzle_diameter * ($Slic3r::nozzle_diameter/$self->layer_height - 4/PI + 1); | ||
} | ||
|
||
my $min_flow_width = $Slic3r::nozzle_diameter * 1.05; | ||
|
@@ -36,9 +39,9 @@ sub calculate { | |
$flow_width = $min_flow_width if $flow_width < $min_flow_width; | ||
} | ||
|
||
if ($flow_width >= ($Slic3r::nozzle_diameter + $Slic3r::layer_height)) { | ||
if ($flow_width >= ($Slic3r::nozzle_diameter + $self->layer_height)) { | ||
# rectangle with semicircles at the ends | ||
$min_flow_spacing = $flow_width - $Slic3r::layer_height * (1 - PI/4); | ||
$min_flow_spacing = $flow_width - $self->layer_height * (1 - PI/4); | ||
} else { | ||
# rectangle with shrunk semicircles at the ends | ||
$min_flow_spacing = $flow_width * (1 - PI/4) + $Slic3r::nozzle_diameter * PI/4; | ||
|
Lazy initialization is no good here, since it caches the value - thus, changing $Slic3r::layer_height from the GUI will not be reflected by $self->layer_height.