From 42e9ec90bef32c5443b6fbb4d00bcb1cffd8677e Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Sat, 25 Mar 2017 13:59:29 +0100 Subject: [PATCH] Updated log method calls --- lib/Slic3r/GUI/Controller/PrinterPanel.pm | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/lib/Slic3r/GUI/Controller/PrinterPanel.pm b/lib/Slic3r/GUI/Controller/PrinterPanel.pm index 53850a69ec..6a28e2ace9 100644 --- a/lib/Slic3r/GUI/Controller/PrinterPanel.pm +++ b/lib/Slic3r/GUI/Controller/PrinterPanel.pm @@ -43,9 +43,7 @@ sub new { $self->print_completed; } } - $self->{log_textctrl}->AppendText("$_\n") for @{$self->sender->purge_log}; - $self->{manual_control_dialog}->update_log($self->{log_textctrl}->GetValue) - if $self->{manual_control_dialog}; + $self->append_to_log("$_\n") for @{$self->sender->purge_log}; { my $temp = $self->sender->getT; if ($temp eq '') { @@ -272,6 +270,12 @@ sub new { return $self; } +sub append_to_log { + my ($self, $text) = @_; + + $self->{log_textctrl}->AppendText($text); +} + sub is_connected { my ($self) = @_; return $self->sender && $self->sender->is_connected; @@ -409,9 +413,9 @@ sub print_job { $self->Layout; $self->set_status('Printing...'); - $self->{log_textctrl}->AppendText(sprintf "=====\n"); - $self->{log_textctrl}->AppendText(sprintf "Printing %s\n", $job->name); - $self->{log_textctrl}->AppendText(sprintf "Print started at %s\n", $self->_timestamp); + $self->append_to_log(sprintf "=====\n"); + $self->append_to_log(sprintf "Printing %s\n", $job->name); + $self->append_to_log(sprintf "Print started at %s\n", $self->_timestamp); } sub print_completed { @@ -426,7 +430,7 @@ sub print_completed { $self->Layout; $self->set_status('Print completed.'); - $self->{log_textctrl}->AppendText(sprintf "Print completed at %s\n", $self->_timestamp); + $self->append_to_log(sprintf "Print completed at %s\n", $self->_timestamp); $self->reload_jobs; } @@ -479,7 +483,7 @@ sub reload_jobs { $self->{gauge}->Disable; $self->{gauge}->Hide; $self->set_status('Print was aborted.'); - $self->{log_textctrl}->AppendText(sprintf "Print aborted at %s\n", $self->_timestamp); + $self->append_to_log(sprintf "Print aborted at %s\n", $self->_timestamp); }); $panel->on_resume_print(sub { my ($job) = @_;