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

Remember manual control settings

Browse Source
This commit is contained in:
Alessandro Ranellucci 2017-03-09 21:37:56 +01:00
parent 782dda46a2
commit 6d371884a1
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@ 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));
sub new { sub new {
my ($class, $parent, $config, $sender) = @_; my ($class, $parent, $config, $sender, $manual_control_config) = @_;
my $self = $class->SUPER::new($parent, -1, "Manual Control", wxDefaultPosition, my $self = $class->SUPER::new($parent, -1, "Manual Control", wxDefaultPosition,
[500,400], wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER); [500,400], wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);
@ -23,12 +23,7 @@ sub new {
$self->writer(Slic3r::GCode::Writer->new); $self->writer(Slic3r::GCode::Writer->new);
$self->writer->config->apply_dynamic($config); $self->writer->config->apply_dynamic($config);
$self->config2({ $self->config2($manual_control_config);
xy_travel_speed => 130,
z_travel_speed => 10,
temperature => '',
bed_temperature => '',
});
my $bed_sizer = Wx::FlexGridSizer->new(2, 3, 1, 1); my $bed_sizer = Wx::FlexGridSizer->new(2, 3, 1, 1);
$bed_sizer->AddGrowableCol(1, 1); $bed_sizer->AddGrowableCol(1, 1);

10
lib/Slic3r/GUI/Controller/PrinterPanel.pm
View File

@ -9,7 +9,7 @@ use Wx::Event qw(EVT_BUTTON EVT_MOUSEWHEEL EVT_TIMER EVT_SCROLLWIN);
use base qw(Wx::Panel Class::Accessor); use base qw(Wx::Panel Class::Accessor);
__PACKAGE__->mk_accessors(qw(printer_name config sender jobs __PACKAGE__->mk_accessors(qw(printer_name config sender jobs
printing status_timer temp_timer)); printing status_timer temp_timer manual_control_config));
use constant CONNECTION_TIMEOUT => 3; # seconds use constant CONNECTION_TIMEOUT => 3; # seconds
use constant STATUS_TIMER_INTERVAL => 1000; # milliseconds use constant STATUS_TIMER_INTERVAL => 1000; # milliseconds
@ -21,6 +21,12 @@ sub new {
$self->printer_name($printer_name || 'Printer'); $self->printer_name($printer_name || 'Printer');
$self->config($config); $self->config($config);
$self->manual_control_config({
xy_travel_speed => 130,
z_travel_speed => 10,
temperature => '',
bed_temperature => '',
});
$self->jobs([]); $self->jobs([]);
# set up the timer that polls for updates # set up the timer that polls for updates
@ -171,7 +177,7 @@ sub new {
$left_sizer->Add($btn, 0, wxTOP, 15); $left_sizer->Add($btn, 0, wxTOP, 15);
EVT_BUTTON($self, $btn, sub { EVT_BUTTON($self, $btn, sub {
my $dlg = Slic3r::GUI::Controller::ManualControlDialog->new my $dlg = Slic3r::GUI::Controller::ManualControlDialog->new
($self, $self->config, $self->sender); ($self, $self->config, $self->sender, $self->manual_control_config);
$dlg->ShowModal; $dlg->ShowModal;
}); });
} }