3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make preset placeholders available in Quick Slice too. #921

Browse source
This commit is contained in:
Alessandro Ranellucci 2013-04-28 23:26:50 +02:00
parent bde730a611
commit f7153d67d0
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/Slic3r/GUI/Plater.pm
View file

@ -525,7 +525,7 @@ sub export_gcode {
} }
# get config before spawning the thread because ->config needs GetParent and it's not available there # get config before spawning the thread because ->config needs GetParent and it's not available there
my $print = $self->_init_print; my $print = $self->skeinpanel->init_print;
# select output file # select output file
$self->{output_file} = $main::opt{output}; $self->{output_file} = $main::opt{output};
@ -582,21 +582,6 @@ sub export_gcode {
} }
} }
sub _init_print {
my $self = shift;
my %extra_variables = ();
if ($self->skeinpanel->{mode} eq 'expert') {
$extra_variables{"${_}_preset"} = $self->skeinpanel->{options_tabs}{$_}->current_preset->{name}
for qw(print filament printer);
}
return Slic3r::Print->new(
config => $self->skeinpanel->config,
extra_variables => { %extra_variables },
);
}
sub export_gcode2 { sub export_gcode2 {
my $self = shift; my $self = shift;
my ($print, $output_file, %params) = @_; my ($print, $output_file, %params) = @_;
@ -687,7 +672,7 @@ sub _get_export_file {
my $output_file = $main::opt{output}; my $output_file = $main::opt{output};
{ {
$output_file = $self->_init_print->expanded_output_filepath($output_file, $self->{objects}[0]->input_file); $output_file = $self->skeinpanel->init_print->expanded_output_filepath($output_file, $self->{objects}[0]->input_file);
$output_file =~ s/\.gcode$/$suffix/i; $output_file =~ s/\.gcode$/$suffix/i;
my $dlg = Wx::FileDialog->new($self, "Save $format file as:", dirname($output_file), my $dlg = Wx::FileDialog->new($self, "Save $format file as:", dirname($output_file),
basename($output_file), &Slic3r::GUI::SkeinPanel::MODEL_WILDCARD, wxFD_SAVE | wxFD_OVERWRITE_PROMPT); basename($output_file), &Slic3r::GUI::SkeinPanel::MODEL_WILDCARD, wxFD_SAVE | wxFD_OVERWRITE_PROMPT);

17
lib/Slic3r/GUI/SkeinPanel.pm
View file

@ -122,7 +122,7 @@ sub do_slice {
$Slic3r::GUI::Settings->{recent}{skein_directory} = dirname($input_file); $Slic3r::GUI::Settings->{recent}{skein_directory} = dirname($input_file);
Slic3r::GUI->save_settings; Slic3r::GUI->save_settings;
my $print = Slic3r::Print->new(config => $config); my $print = $self->init_print;
$print->add_model(Slic3r::Model->read_from_file($input_file)); $print->add_model(Slic3r::Model->read_from_file($input_file));
$print->validate; $print->validate;
@ -189,6 +189,21 @@ sub do_slice {
Slic3r::GUI::catch_error($self, sub { $process_dialog->Destroy if $process_dialog }); Slic3r::GUI::catch_error($self, sub { $process_dialog->Destroy if $process_dialog });
} }
sub init_print {
my $self = shift;
my %extra_variables = ();
if ($self->{mode} eq 'expert') {
$extra_variables{"${_}_preset"} = $self->{options_tabs}{$_}->current_preset->{name}
for qw(print filament printer);
}
return Slic3r::Print->new(
config => $self->config,
extra_variables => { %extra_variables },
);
}
sub export_config { sub export_config {
my $self = shift; my $self = shift;