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

Make new plater compatible with threaded perls

Browse source
This commit is contained in:
Alessandro Ranellucci 2012-09-21 17:45:54 +02:00
parent 037be34b7b
commit 35e449e891
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -158,8 +158,8 @@ sub new {
EVT_COMMAND($self, -1, $THUMBNAIL_DONE_EVENT, sub { EVT_COMMAND($self, -1, $THUMBNAIL_DONE_EVENT, sub {
my ($self, $event) = @_; my ($self, $event) = @_;
my ($obj_idx, $thumbnail) = @{$event->GetData}; my ($obj_idx, $thumbnail) = @{$event->GetData};
$self->{objects}[$obj_idx]->thumbnail($thumbnail); $self->{objects}[$obj_idx]->thumbnail($thumbnail->clone);
$self->mesh(undef); $self->{objects}[$obj_idx]->mesh(undef);
$self->on_thumbnail_made; $self->on_thumbnail_made;
}); });
@ -433,7 +433,7 @@ sub arrange {
my $total_parts = sum(map $_->instances_count, @{$self->{objects}}) or return; my $total_parts = sum(map $_->instances_count, @{$self->{objects}}) or return;
my @size = (); my @size = ();
for my $a (X,Y) { for my $a (X,Y) {
$size[$a] = $self->to_units(max(map $_->thumbnail->size->[$a], @{$self->{objects}})); $size[$a] = max(map $_->rotated_size->[$a], @{$self->{objects}});
} }
eval { eval {
@ -529,7 +529,7 @@ sub export_gcode {
); );
}); });
$self->statusbar->SetCancelCallback(sub { $self->statusbar->SetCancelCallback(sub {
$self->{export_thread}->kill('KILL'); $self->{export_thread}->kill('KILL')->join;
$self->{export_thread} = undef; $self->{export_thread} = undef;
$self->statusbar->StopBusy; $self->statusbar->StopBusy;
$self->statusbar->SetStatusText("Export cancelled"); $self->statusbar->SetStatusText("Export cancelled");