GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-05-13 15:28:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugfix: GUI threading issues. #369

Browse Source
This commit is contained in:
Alessandro Ranellucci 2012-05-19 21:13:10 +02:00
parent 9f21d5b3c2
commit c97ced50ff
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,13 @@
package Slic3r::GUI::Plater; package Slic3r::GUI::Plater;
use strict; use strict;
use warnings; use warnings;
my $have_threads = eval "use threads; 1";
use threads::shared;
use utf8; use utf8;
use File::Basename qw(basename dirname); use File::Basename qw(basename dirname);
use Math::ConvexHull qw(convex_hull); use Math::ConvexHull qw(convex_hull);
use Slic3r::Geometry qw(X Y Z X1 Y1 X2 Y2 scale unscale); use Slic3r::Geometry qw(X Y Z X1 Y1 X2 Y2 scale unscale);
use Slic3r::Geometry::Clipper qw(JT_ROUND); use Slic3r::Geometry::Clipper qw(JT_ROUND);
use threads::shared qw(shared_clone);
use Wx qw(:sizer :progressdialog wxOK wxICON_INFORMATION wxICON_WARNING wxICON_ERROR wxICON_QUESTION use Wx qw(:sizer :progressdialog wxOK wxICON_INFORMATION wxICON_WARNING wxICON_ERROR wxICON_QUESTION
wxOK wxCANCEL wxID_OK wxFD_OPEN wxFD_SAVE wxDEFAULT wxNORMAL); wxOK wxCANCEL wxID_OK wxFD_OPEN wxFD_SAVE wxDEFAULT wxNORMAL);
use Wx::Event qw(EVT_BUTTON EVT_PAINT EVT_MOUSE_EVENTS EVT_LIST_ITEM_SELECTED EVT_LIST_ITEM_DESELECTED use Wx::Event qw(EVT_BUTTON EVT_PAINT EVT_MOUSE_EVENTS EVT_LIST_ITEM_SELECTED EVT_LIST_ITEM_DESELECTED
@ -27,6 +26,7 @@ my $THUMBNAIL_DONE_EVENT : shared = Wx::NewEventType;
my $PROGRESS_BAR_EVENT : shared = Wx::NewEventType; my $PROGRESS_BAR_EVENT : shared = Wx::NewEventType;
my $MESSAGE_DIALOG_EVENT : shared = Wx::NewEventType; my $MESSAGE_DIALOG_EVENT : shared = Wx::NewEventType;
my $EXPORT_COMPLETED_EVENT : shared = Wx::NewEventType; my $EXPORT_COMPLETED_EVENT : shared = Wx::NewEventType;
my $EXPORT_FAILED_EVENT : shared = Wx::NewEventType;
sub new { sub new {
my $class = shift; my $class = shift;
@ -161,6 +161,11 @@ sub new {
$self->on_export_completed(@{$event->GetData}); $self->on_export_completed(@{$event->GetData});
}); });
EVT_COMMAND($self, -1, $EXPORT_FAILED_EVENT, sub {
my ($self, $event) = @_;
$self->on_export_failed;
});
$self->update_bed_size; $self->update_bed_size;
$self->{print} = Slic3r::Print->new; $self->{print} = Slic3r::Print->new;
$self->{thumbnails} = []; # polygons, each one aligned to 0,0 $self->{thumbnails} = []; # polygons, each one aligned to 0,0
@ -434,7 +439,7 @@ sub export_gcode {
} }
$self->statusbar->StartBusy; $self->statusbar->StartBusy;
if ($have_threads) { if ($Slic3r::have_threads) {
$self->{export_thread} = threads->create(sub { $self->{export_thread} = threads->create(sub {
$self->export_gcode2( $self->export_gcode2(
$self->{output_file}, $self->{output_file},
@ -442,7 +447,10 @@ sub export_gcode {
message_dialog => sub { Wx::PostEvent($self, Wx::PlThreadEvent->new(-1, $MESSAGE_DIALOG_EVENT, shared_clone([@_]))) }, message_dialog => sub { Wx::PostEvent($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($self, Wx::PlThreadEvent->new(-1, $EXPORT_COMPLETED_EVENT, shared_clone([@_]))) },
catch_error => sub { catch_error => sub {
Slic3r::GUI::catch_error($self, $_[0], sub { Wx::PostEvent($self, Wx::PlThreadEvent->new(-1, $MESSAGE_DIALOG_EVENT, shared_clone([@_]))) }); Slic3r::GUI::catch_error($self, $_[0], sub {
Wx::PostEvent($self, Wx::PlThreadEvent->new(-1, $MESSAGE_DIALOG_EVENT, shared_clone([@_])));
Wx::PostEvent($self, Wx::PlThreadEvent->new(-1, $EXPORT_FAILED_EVENT, undef));
});
}, },
); );
}); });
@ -474,7 +482,7 @@ sub export_gcode2 {
local $SIG{'KILL'} = sub { local $SIG{'KILL'} = sub {
Slic3r::debugf "Exporting cancelled; exiting thread...\n"; Slic3r::debugf "Exporting cancelled; exiting thread...\n";
threads->exit(); threads->exit();
}; } if $Slic3r::have_threads;
eval { eval {
# validate configuration # validate configuration
@ -514,10 +522,7 @@ sub export_gcode2 {
$params{on_completed}->($message); $params{on_completed}->($message);
$print->cleanup; $print->cleanup;
}; };
$params{catch_error}->(sub { $params{catch_error}->();
$self->statusbar->StopBusy;
$self->statusbar->SetStatusText("");
});
} }
sub on_export_completed { sub on_export_completed {
@ -531,6 +536,16 @@ sub on_export_completed {
Wx::MessageDialog->new($self, $message, 'Done!', wxOK | wxICON_INFORMATION)->ShowModal; Wx::MessageDialog->new($self, $message, 'Done!', wxOK | wxICON_INFORMATION)->ShowModal;
} }
sub on_export_failed {
my $self = shift;
my ($message) = @_;
$self->{export_thread} = undef;
$self->statusbar->SetCancelCallback(undef);
$self->statusbar->StopBusy;
$self->statusbar->SetStatusText("Export failed");
}
sub export_stl { sub export_stl {
my $self = shift; my $self = shift;
@ -582,7 +597,7 @@ sub make_thumbnail {
$convex_hull->simplify(0.3); $convex_hull->simplify(0.3);
$self->{thumbnails}->[$obj_idx] = $convex_hull; # ignored in multithread environment $self->{thumbnails}->[$obj_idx] = $convex_hull; # ignored in multithread environment
if ($have_threads) { if ($Slic3r::have_threads) {
Wx::PostEvent($self, Wx::PlThreadEvent->new(-1, $THUMBNAIL_DONE_EVENT, shared_clone([ $obj_idx, $convex_hull ]))); Wx::PostEvent($self, Wx::PlThreadEvent->new(-1, $THUMBNAIL_DONE_EVENT, shared_clone([ $obj_idx, $convex_hull ])));
threads->exit; threads->exit;
} else { } else {
@ -590,7 +605,7 @@ sub make_thumbnail {
} }
}; };
$have_threads ? threads->create($cb) : $cb->(); $Slic3r::have_threads ? threads->create($cb) : $cb->();
} }
sub make_thumbnail2 { sub make_thumbnail2 {