GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-03 06:00:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed duplicated console log in manual control dialog; process Enter key in manual commands; append outgoing commands to log

Browse Source
This commit is contained in:
Alessandro Ranellucci 2017-03-25 13:57:43 +01:00 committed by GitHub
parent 5f9adf8922
commit 67f0fe3344
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/Slic3r/GUI/Controller/ManualControlDialog.pm
View File

@ -1,5 +1,3 @@
# A printer "Controller" -> "ManualControlDialog" subtab, opened per 3D printer connected?
package Slic3r::GUI::Controller::ManualControlDialog; package Slic3r::GUI::Controller::ManualControlDialog;
use strict; use strict;
use warnings; use warnings;
@ -9,7 +7,7 @@ use Scalar::Util qw(looks_like_number);
use Slic3r::Geometry qw(PI X Y unscale); use Slic3r::Geometry qw(PI X Y unscale);
use Wx qw(:dialog :id :misc :sizer :choicebook :button :bitmap :textctrl use Wx qw(:dialog :id :misc :sizer :choicebook :button :bitmap :textctrl
wxBORDER_NONE wxTAB_TRAVERSAL); wxBORDER_NONE wxTAB_TRAVERSAL);
use Wx::Event qw(EVT_CLOSE EVT_BUTTON); use Wx::Event qw(EVT_CLOSE EVT_BUTTON EVT_TEXT_ENTER);
use base qw(Wx::Dialog Class::Accessor); use base qw(Wx::Dialog Class::Accessor);
__PACKAGE__->mk_accessors(qw(sender writer config2 x_homed y_homed)); __PACKAGE__->mk_accessors(qw(sender writer config2 x_homed y_homed));
@ -163,6 +161,7 @@ sub new {
return; return;
} }
my $cmd = $self->writer->set_temperature($self->config2->{temperature}); my $cmd = $self->writer->set_temperature($self->config2->{temperature});
$self->GetParent->append_to_log(">> $cmd\n");
$self->sender->send($cmd, 1); $self->sender->send($cmd, 1);
}); });
$optgroup->append_line($line); $optgroup->append_line($line);
@ -182,6 +181,7 @@ sub new {
return; return;
} }
my $cmd = $self->writer->set_bed_temperature($self->config2->{bed_temperature}); my $cmd = $self->writer->set_bed_temperature($self->config2->{bed_temperature});
$self->GetParent->append_to_log(">> $cmd\n");
$self->sender->send($cmd, 1); $self->sender->send($cmd, 1);
}); });
$optgroup->append_line($line); $optgroup->append_line($line);
@ -189,19 +189,12 @@ sub new {
} }
{ {
my $box = Wx::StaticBox->new($self, -1, "Console"); my $box = Wx::StaticBox->new($self, -1, "Send manual command");
my $sbsizer = Wx::StaticBoxSizer->new($box, wxVERTICAL); my $sbsizer = Wx::StaticBoxSizer->new($box, wxVERTICAL);
$right_sizer->Add($sbsizer, 1, wxEXPAND, 0); $right_sizer->Add($sbsizer, 1, wxEXPAND | wxALL, 10);
my $log = $self->{log_textctrl} = Wx::TextCtrl->new($self, -1, "", wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE | wxBORDER_NONE);
$log->SetBackgroundColour($self->GetBackgroundColour);
$log->SetFont($Slic3r::GUI::small_font);
$log->SetEditable(0);
$sbsizer->Add($self->{log_textctrl}, 1, wxEXPAND, 0);
my $cmd_sizer = Wx::BoxSizer->new(wxHORIZONTAL); my $cmd_sizer = Wx::BoxSizer->new(wxHORIZONTAL);
my $cmd_textctrl = Wx::TextCtrl->new($self, -1, ''); my $cmd_textctrl = Wx::TextCtrl->new($self, -1, '', wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
$cmd_sizer->Add($cmd_textctrl, 1, wxEXPAND, 0); $cmd_sizer->Add($cmd_textctrl, 1, wxEXPAND, 0);
my $btn = Wx::Button->new($self, -1, my $btn = Wx::Button->new($self, -1,
@ -212,13 +205,17 @@ sub new {
} }
$cmd_sizer->Add($btn, 0, wxEXPAND | wxLEFT, 5); $cmd_sizer->Add($btn, 0, wxEXPAND | wxLEFT, 5);
EVT_BUTTON($self, $btn, sub { my $do_send = sub {
return if $cmd_textctrl->GetValue eq ''; my $cmd = $cmd_textctro->GetValue;
$self->sender->send($cmd_textctrl->GetValue, 1); return if cmd eq '';
$self->GetParent->append_to_log(">> $cmd\n");
$self->sender->send($cmd, 1);
$cmd_textctrl->SetValue(''); $cmd_textctrl->SetValue('');
}); };
EVT_BUTTON($self, $btn, $do_send);
EVT_TEXT_ENTER($self, $cmd_textctrl, $do_send);
$sbsizer->Add($cmd_sizer, 0, wxEXPAND | wxTOP, 2); $sbsizer->Add($cmd_sizer, 0, wxEXPAND | wxTOP, 5);
} }
my $main_sizer = Wx::BoxSizer->new(wxHORIZONTAL); my $main_sizer = Wx::BoxSizer->new(wxHORIZONTAL);
@ -239,12 +236,6 @@ sub new {
return $self; return $self;
} }
sub update_log {
my ($self, $log) = @_;
$self->{log_textctrl}->SetValue($log);
}
sub abs_xy_move { sub abs_xy_move {
my ($self, $pos) = @_; my ($self, $pos) = @_;