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

Add a progress bar during STL loading

Browse Source
This commit is contained in:
Alessandro Ranellucci 2012-04-30 21:49:44 +02:00
parent 2e897ecf0d
commit 3e92587824
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Slic3r/Format/STL.pm
View File

@ -121,12 +121,11 @@ sub read_file {
sub _read_ascii {
my ($fh, $facets) = @_;
my $point_re = qr/([^ ]+)\s+([^ ]+)\s+([^ ]+)\s*$/;
my $point_re = qr/([^ ]+)\s+([^ ]+)\s+([^ ]+)/;
my $facet;
seek $fh, 0, 0;
while (my $_ = <$fh>) {
s/\R+$//;
if (!$facet) {
/^\s*facet\s+normal\s+$point_re/ or next;
$facet = [ [$1, $2, $3] ];
@ -135,7 +134,7 @@ sub _read_ascii {
push @$facets, $facet;
undef $facet;
} else {
/^\s*vertex\s+$point_re/ or next;
/^\s*vertex\s+$point_re/o or next;
push @$facet, [map $_ * 1, $1, $2, $3];
}
}

3
lib/Slic3r/GUI/Dashboard.pm
View File

@ -139,9 +139,12 @@ sub load_file {
$Slic3r::GUI::SkeinPanel::last_input_file = $input_file;
my $process_dialog = Wx::ProgressDialog->new('Loading...', "Processing input file...", 100, $self, 0);
$process_dialog->Pulse;
local $SIG{__WARN__} = Slic3r::GUI::warning_catcher($self);
my $object = $self->{print}->add_object_from_file($input_file);
my $obj_idx = $#{$self->{print}->objects};
$process_dialog->Destroy;
$self->{list}->InsertStringItem($obj_idx, basename($input_file));
$self->{list}->SetItem($obj_idx, 1, "1");