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

One more fix for Cancel button. #1461

Browse source
This commit is contained in:
Alessandro Ranellucci 2013-10-16 15:13:39 +02:00
parent 127e38d4a4
commit b653839e9a
1 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,11 +29,12 @@ use constant TB_SPLIT => &Wx::NewId;
use constant TB_VIEW => &Wx::NewId; use constant TB_VIEW => &Wx::NewId;
use constant TB_SETTINGS => &Wx::NewId; use constant TB_SETTINGS => &Wx::NewId;
my $THUMBNAIL_DONE_EVENT : shared = Wx::NewEventType; # package variables to avoid passing lexicals to threads
my $PROGRESS_BAR_EVENT : shared = Wx::NewEventType; our $THUMBNAIL_DONE_EVENT : shared = Wx::NewEventType;
my $MESSAGE_DIALOG_EVENT : shared = Wx::NewEventType; our $PROGRESS_BAR_EVENT : shared = Wx::NewEventType;
my $EXPORT_COMPLETED_EVENT : shared = Wx::NewEventType; our $MESSAGE_DIALOG_EVENT : shared = Wx::NewEventType;
my $EXPORT_FAILED_EVENT : shared = Wx::NewEventType; our $EXPORT_COMPLETED_EVENT : shared = Wx::NewEventType;
our $EXPORT_FAILED_EVENT : shared = Wx::NewEventType;
use constant CANVAS_SIZE => [335,335]; use constant CANVAS_SIZE => [335,335];
use constant CANVAS_TEXT => join('-', +(localtime)[3,4]) eq '13-8' use constant CANVAS_TEXT => join('-', +(localtime)[3,4]) eq '13-8'
@ -613,8 +614,8 @@ sub export_gcode {
} }
# get config before spawning the thread because it needs GetParent and it's not available there # get config before spawning the thread because it needs GetParent and it's not available there
my $config = $self->skeinpanel->config; our $config = $self->skeinpanel->config;
my $extra_variables = $self->skeinpanel->extra_variables; our $extra_variables = $self->skeinpanel->extra_variables;
# select output file # select output file
$self->{output_file} = $main::opt{output}; $self->{output_file} = $main::opt{output};
@ -642,18 +643,22 @@ sub export_gcode {
if ($Slic3r::have_threads) { if ($Slic3r::have_threads) {
@_ = (); @_ = ();
# some perls (including 5.14.2) crash on threads->exit if we pass lexicals to the thread
our $_thread_self = $self;
$self->{export_thread} = threads->create(sub { $self->{export_thread} = threads->create(sub {
$self->export_gcode2( $_thread_self->export_gcode2(
$config, $config,
$extra_variables, $extra_variables,
$self->{output_file}, $_thread_self->{output_file},
progressbar => sub { Wx::PostEvent($self, Wx::PlThreadEvent->new(-1, $PROGRESS_BAR_EVENT, shared_clone([@_]))) }, progressbar => sub { Wx::PostEvent($_thread_self, Wx::PlThreadEvent->new(-1, $PROGRESS_BAR_EVENT, shared_clone([@_]))) },
message_dialog => sub { Wx::PostEvent($self, Wx::PlThreadEvent->new(-1, $MESSAGE_DIALOG_EVENT, shared_clone([@_]))) }, message_dialog => sub { Wx::PostEvent($_thread_self, Wx::PlThreadEvent->new(-1, $MESSAGE_DIALOG_EVENT, shared_clone([@_]))) },
on_completed => sub { Wx::PostEvent($self, Wx::PlThreadEvent->new(-1, $EXPORT_COMPLETED_EVENT, shared_clone([@_]))) }, on_completed => sub { Wx::PostEvent($_thread_self, Wx::PlThreadEvent->new(-1, $EXPORT_COMPLETED_EVENT, shared_clone([@_]))) },
catch_error => sub { catch_error => sub {
Slic3r::GUI::catch_error($self, $_[0], sub { Slic3r::GUI::catch_error($_thread_self, $_[0], sub {
Wx::PostEvent($self, Wx::PlThreadEvent->new(-1, $MESSAGE_DIALOG_EVENT, shared_clone([@_]))); Wx::PostEvent($_thread_self, Wx::PlThreadEvent->new(-1, $MESSAGE_DIALOG_EVENT, shared_clone([@_])));
Wx::PostEvent($self, Wx::PlThreadEvent->new(-1, $EXPORT_FAILED_EVENT, undef)); Wx::PostEvent($_thread_self, Wx::PlThreadEvent->new(-1, $EXPORT_FAILED_EVENT, undef));
}); });
}, },
); );