3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-07 22:14:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' of https://github.com/alexrj/Slic3r into release_candidate_1_3

Browse source
This commit is contained in:
Vojtech Bubnik 2016-06-03 17:45:05 +02:00
commit 7649a1df41
22 changed files with 205 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/Slic3r/GUI/Controller/ManualControlDialog.pm
View file

@ -87,7 +87,8 @@ sub new {
$bed_sizer->Add($sizer, 1, wxEXPAND, 0);
}
$bed_sizer->AddSpacer(0);
# XYZ home button
$move_button->($bed_sizer, 'XYZ', 'house', 1, wxTOP, sub { $self->home(undef) });
# X buttons
{
@ -180,10 +181,11 @@ sub rel_move {
sub home {
my ($self, $axis) = @_;
$axis //= '';
$self->sender->send(sprintf("G28 %s", $axis), 1);
$self->{canvas}->set_pos(undef);
$self->x_homed if $axis eq 'X';
$self->y_homed if $axis eq 'Y';
$self->x_homed(1) if $axis eq 'X';
$self->y_homed(1) if $axis eq 'Y';
}
1;

3
lib/Slic3r/Print/GCode.pm
View file

@ -75,7 +75,8 @@ sub BUILD {
}
}
}
@mm3_per_mm = grep $_ != 0, @mm3_per_mm;
# filter out 0-width segments
@mm3_per_mm = grep $_ > 0.000001, @mm3_per_mm;
if (@mm3_per_mm) {
my $min_mm3_per_mm = min(@mm3_per_mm);
# In order to honor max_print_speed we need to find a target volumetric