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

Use statusbar to show warnings instead of obtrusive dialog box (#4220)

Browse Source
This commit is contained in:
Giles Bathgate 2017-12-30 01:17:13 +00:00 committed by Joseph Lenox
parent dccb146b4a
commit 966fd37ea7
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1215,7 +1215,16 @@ sub load_file {
$self->{objects}[$obj_idx]->input_file($input_file);
$self->{objects}[$obj_idx]->input_file_obj_idx($i++);
}
$self->statusbar->SetStatusText("Loaded " . basename($input_file));
if($self->{scaled_down}) {
$self->statusbar->SetStatusText('Your object appears to be too large, so it was automatically scaled down to fit your print bed.');
}
if($self->{outside_bounds}) {
$self->statusbar->SetStatusText('Some of your object(s) appear to be outside the print bed. Use the arrange button to correct this.');
}
}
$process_dialog->Destroy;
@ -1239,8 +1248,6 @@ sub load_model_objects {
my $bed_size = $bed_shape->bounding_box->size;
my $need_arrange = 0;
my $scaled_down = 0;
my $outside_bounds = 0;
my @obj_idx = ();
foreach my $model_object (@model_objects) {
my $o = $self->{model}->add_object($model_object);
@ -1283,7 +1290,7 @@ sub load_model_objects {
my $ratio = max(@$size[X,Y]) / unscale(max(@$bed_size[X,Y]));
if ($ratio > 5) {
$_->set_scaling_factor(1/$ratio) for @{$o->instances};
$scaled_down = 1;
$self->{scaled_down} = 1;
}
}
@ -1295,30 +1302,13 @@ sub load_model_objects {
my $max = Slic3r::Pointf->new($o_bounds->x_max, $o_bounds->y_max);
if (!$bed_bounds->contains_point($min) || !$bed_bounds->contains_point($max))
{
$outside_bounds = 1;
$self->{outside_bounds} = 1;
}
}
$self->{print}->auto_assign_extruders($o);
$self->{print}->add_model_object($o);
}
if ($outside_bounds) {
Slic3r::GUI::show_info(
$self,
'Some of your object(s) appear to be outside the print bed. Use the arrange button to correct this.',
'Outside print bed?',
);
}
if ($scaled_down) {
Slic3r::GUI::show_info(
$self,
'Your object appears to be too large, so it was automatically scaled down to fit your print bed.',
'Object too large?',
);
}
$self->make_thumbnail($_) for @obj_idx;
$self->arrange if $need_arrange;
@ -1697,7 +1687,8 @@ sub arrange {
my $success = $self->{model}->arrange_objects($self->config->min_object_distance, $bb);
# ignore arrange failures on purpose: user has visual feedback and we don't need to warn him
# when parts don't fit in print bed
$self->statusbar->SetStatusText('Objects were arranged.');
$self->on_model_change(1);
}