PublicCodeMirror/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-05-21 17:39:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

Make quick_slice() work with new model handling

Browse Source
This commit is contained in:
Alessandro Ranellucci
2013-12-13 12:18:30 +01:00
parent 0e8a0ef1ca
commit 5470fbbebc
6 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Slic3r/GUI/Plater.pm
View File

@@ -638,7 +638,7 @@ sub export_gcode {
# select output file
$self->{output_file} = $main::opt{output};
{
$self->{output_file} = $self->skeinpanel->init_print->expanded_output_filepath($self->{output_file}, $self->{objects}[0]->input_file);
$self->{output_file} = $self->skeinpanel->init_print->expanded_output_filepath($self->{output_file}, $self->{model}->objects->[0]->input_file);
my $dlg = Wx::FileDialog->new($self, 'Save G-code file as:', Slic3r::GUI->output_path(dirname($self->{output_file})),
basename($self->{output_file}), &Slic3r::GUI::SkeinPanel::FILE_WILDCARDS->{gcode}, wxFD_SAVE);
if ($dlg->ShowModal != wxID_OK) {
@@ -653,8 +653,6 @@ sub export_gcode {
$self->statusbar->StartBusy;
$_->free_model_object for @{$self->{objects}};
# It looks like declaring a local $SIG{__WARN__} prevents the ugly
# "Attempt to free unreferenced scalar" warning...
local $SIG{__WARN__} = Slic3r::GUI::warning_catcher($self);
@@ -727,6 +725,7 @@ sub export_gcode2 {
{
my @warnings = ();
local $SIG{__WARN__} = sub { push @warnings, $_[0] };
my %params = (
output_file => $output_file,
status_cb => sub { $params{progressbar}->(@_) },
@@ -966,6 +965,7 @@ sub repaint {
next unless defined $object->thumbnail;
for my $instance_idx (0 .. $#{$model_object->instances}) {
my $instance = $model_object->instances->[$instance_idx];
next if !defined $object->transformed_thumbnail;
my $thumbnail = $object->transformed_thumbnail->clone; # in scaled coordinates
$thumbnail->scale(&Slic3r::SCALING_FACTOR * $parent->{scaling_factor}); # in unscaled pixels

12
lib/Slic3r/GUI/SkeinPanel.pm
View File

@@ -134,7 +134,17 @@ sub quick_slice {
Slic3r::GUI->save_settings;
my $print = $self->init_print;
$print->add_model(Slic3r::Model->read_from_file($input_file));
my $model = Slic3r::Model->read_from_file($input_file);
if ($model->has_objects_with_no_instances) {
# apply a default position to all objects not having one
foreach my $object (@{$model->objects}) {
$object->add_instance(offset => [0,0]) if !defined $object->instances;
}
$model->arrange_objects($config);
}
$print->add_model_object($_) for @{ $model->objects };
$print->validate;
# select output file