3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-08 14:34:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into wipe_tower_improvements

Browse source
This commit is contained in:
Lukas Matena 2018-04-04 13:06:46 +02:00
commit eb9917536c
27 changed files with 457 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/Slic3r/GUI/Plater/3D.pm
View file

@ -12,7 +12,7 @@ use Wx::Locale gettext => 'L';
__PACKAGE__->mk_accessors(qw(
on_arrange on_rotate_object_left on_rotate_object_right on_scale_object_uniformly
on_remove_object on_increase_objects on_decrease_objects));
on_remove_object on_increase_objects on_decrease_objects on_enable_action_buttons));
sub new {
my $class = shift;
@ -176,6 +176,11 @@ sub set_on_model_update {
$self->on_model_update($cb);
}
sub set_on_enable_action_buttons {
my ($self, $cb) = @_;
$self->on_enable_action_buttons($cb);
}
sub reload_scene {
my ($self, $force) = @_;
@ -218,10 +223,12 @@ sub reload_scene {
if (!$self->{model}->fits_print_volume($self->{config})) {
$self->set_warning_enabled(1);
Slic3r::GUI::_3DScene::generate_warning_texture(L("Detected object outside print volume"));
$self->on_enable_action_buttons->(0) if ($self->on_enable_action_buttons);
} else {
$self->set_warning_enabled(0);
$self->volumes->update_outside_state($self->{config}, 1);
Slic3r::GUI::_3DScene::reset_warning_texture();
$self->on_enable_action_buttons->(1) if ($self->on_enable_action_buttons);
}
}
}

1
lib/Slic3r/GUI/Plater/3DPreview.pm
View file

@ -69,6 +69,7 @@ sub new {
$choice_view_type->Append(L("Height"));
$choice_view_type->Append(L("Width"));
$choice_view_type->Append(L("Speed"));
$choice_view_type->Append(L("Volumetric flow rate"));
$choice_view_type->Append(L("Tool"));
$choice_view_type->SetSelection(0);