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

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

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;