amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Multithreaded thumbnail generation

Browse source
This commit is contained in:
Alessandro Ranellucci 2012-04-30 20:59:14 +02:00
parent e41b8c7435
commit 2e897ecf0d
2 changed files with 33 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/Slic3r/GUI/Dashboard.pm
View file

@ -1,6 +1,8 @@
package Slic3r::GUI::Dashboard; package Slic3r::GUI::Dashboard;
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);
@ -9,9 +11,12 @@ 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 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
EVT_COMMAND);
use base 'Wx::Panel'; use base 'Wx::Panel';
my $THUMBNAIL_DONE_EVENT : shared = Wx::NewEventType;
sub new { sub new {
my $class = shift; my $class = shift;
my ($parent) = @_; my ($parent) = @_;
@ -65,6 +70,13 @@ sub new {
$_->SetDropTarget(Slic3r::GUI::Dashboard::DropTarget->new($self)) $_->SetDropTarget(Slic3r::GUI::Dashboard::DropTarget->new($self))
for $self, $self->{canvas}, $self->{list}; for $self, $self->{canvas}, $self->{list};
EVT_COMMAND($self, -1, $THUMBNAIL_DONE_EVENT, sub {
my ($self, $event) = @_;
my ($obj_idx, $thumbnail) = @{$event->GetData};
$self->{thumbnails}[$obj_idx] = $thumbnail;
$self->{canvas}->Refresh;
});
# calculate scaling factor for preview # calculate scaling factor for preview
{ {
# supposing the preview canvas is square, calculate the scaling factor # supposing the preview canvas is square, calculate the scaling factor
@ -379,6 +391,7 @@ sub make_thumbnail {
my $self = shift; my $self = shift;
my ($obj_idx) = @_; my ($obj_idx) = @_;
my $cb = sub {
my $object = $self->{print}->objects->[$obj_idx]; my $object = $self->{print}->objects->[$obj_idx];
my @points = map [ @$_[X,Y] ], @{$object->mesh->vertices}; my @points = map [ @$_[X,Y] ], @{$object->mesh->vertices};
my $convex_hull = Slic3r::Polygon->new(convex_hull(\@points)); my $convex_hull = Slic3r::Polygon->new(convex_hull(\@points));
@ -386,7 +399,16 @@ sub make_thumbnail {
@$_ = map $self->to_pixel($_), @$_; @$_ = map $self->to_pixel($_), @$_;
} }
$convex_hull->simplify(0.3); $convex_hull->simplify(0.3);
$self->{thumbnails}->[$obj_idx] = $convex_hull; $self->{thumbnails}->[$obj_idx] = $convex_hull; # ignored in multithread environment
$have_threads
? Wx::PostEvent($self, Wx::PlThreadEvent->new(-1, $THUMBNAIL_DONE_EVENT, shared_clone([ $obj_idx, $convex_hull ])))
: $self->{canvas}->Refresh;
threads->exit if $have_threads;
};
$have_threads ? threads->create($cb) : $cb->();
} }
sub recenter { sub recenter {

2
slic3r.pl
View file

@ -19,6 +19,7 @@ my %cli_options = ();
'help' => sub { usage() }, 'help' => sub { usage() },
'debug' => \$Slic3r::debug, 'debug' => \$Slic3r::debug,
'gui' => \$opt{gui},
'o|output=s' => \$opt{output}, 'o|output=s' => \$opt{output},
'save=s' => \$opt{save}, 'save=s' => \$opt{save},
@ -71,6 +72,7 @@ if (!@ARGV && !$opt{save} && eval "require Slic3r::GUI; 1") {
Slic3r::GUI->new->MainLoop; Slic3r::GUI->new->MainLoop;
exit; exit;
} }
die $@ if $@ && $opt{gui};
if (@ARGV) { if (@ARGV) {
while (my $input_file = shift @ARGV) { while (my $input_file = shift @ARGV) {