diff --git a/lib/Slic3r/GUI/Plater/LambdaObjectDialog.pm b/lib/Slic3r/GUI/Plater/LambdaObjectDialog.pm index cabaebb5b..683b990bd 100644 --- a/lib/Slic3r/GUI/Plater/LambdaObjectDialog.pm +++ b/lib/Slic3r/GUI/Plater/LambdaObjectDialog.pm @@ -24,6 +24,8 @@ sub new { cyl_r => 1, cyl_h => 1, sph_rho => 1.0, + slab_h => 1.0, + slab_z => 0.0, }; $self->{sizer} = Wx::BoxSizer->new(wxVERTICAL); @@ -63,7 +65,7 @@ sub new { }, label_width => 100, ); - my @options = ("box", "cylinder", "sphere"); + my @options = ("box", "slab", "cylinder", "sphere"); $self->{type} = Wx::ComboBox->new($self, 1, "box", wxDefaultPosition, wxDefaultSize, \@options, wxCB_READONLY); $optgroup_box->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new( @@ -139,6 +141,36 @@ sub new { default => '1', )); + my $optgroup_slab; + $optgroup_slab = $self->{optgroup_slab} = Slic3r::GUI::OptionsGroup->new( + parent => $self, + title => 'Add Slab...', + on_change => sub { + # Do validation + my ($opt_id) = @_; + if ($opt_id eq 'slab_z' || $opt_id eq 'slab_h') { + if (!looks_like_number($optgroup_slab->get_value($opt_id))) { + return 0; + } + } + $self->{object_parameters}->{$opt_id} = $optgroup_slab->get_value($opt_id); + }, + label_width => 100, + ); + $optgroup_slab->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new( + opt_id => "slab_h", + label => 'H', + type => 'f', + default => '1', + )); + $optgroup_slab->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new( + opt_id => "slab_z", + label => 'Initial Z', + type => 'f', + default => '0', + )); + + EVT_COMBOBOX($self, 1, sub{ $self->{object_parameters}->{type} = $self->{type}->GetValue(); $self->_update_ui; @@ -149,6 +181,7 @@ sub new { $self->{sizer}->Add($optgroup_box->sizer, 0, wxEXPAND | wxBOTTOM | wxLEFT | wxRIGHT, 10); $self->{sizer}->Add($optgroup_cylinder->sizer, 0, wxEXPAND | wxBOTTOM | wxLEFT | wxRIGHT, 10); $self->{sizer}->Add($optgroup_sphere->sizer, 0, wxEXPAND | wxBOTTOM | wxLEFT | wxRIGHT, 10); + $self->{sizer}->Add($optgroup_slab->sizer, 0, wxEXPAND | wxBOTTOM | wxLEFT | wxRIGHT, 10); $self->{sizer}->Add($button_sizer,0, wxEXPAND | wxBOTTOM | wxLEFT | wxRIGHT, 10); $self->_update_ui; @@ -170,12 +203,15 @@ sub ObjectParameter { sub _update_ui { my ($self) = @_; $self->{sizer}->Hide($self->{optgroup_cylinder}->sizer); + $self->{sizer}->Hide($self->{optgroup_slab}->sizer); $self->{sizer}->Hide($self->{optgroup_box}->sizer); $self->{sizer}->Hide($self->{optgroup_sphere}->sizer); if ($self->{type}->GetValue eq "box") { $self->{sizer}->Show($self->{optgroup_box}->sizer); } elsif ($self->{type}->GetValue eq "cylinder") { $self->{sizer}->Show($self->{optgroup_cylinder}->sizer); + } elsif ($self->{type}->GetValue eq "slab") { + $self->{sizer}->Show($self->{optgroup_slab}->sizer); } elsif ($self->{type}->GetValue eq "sphere") { $self->{sizer}->Show($self->{optgroup_sphere}->sizer); } diff --git a/lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm b/lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm index 5f993eb8f..789de8069 100644 --- a/lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm +++ b/lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm @@ -352,6 +352,10 @@ sub on_btn_lambda { $mesh = Slic3r::TriangleMesh::cylinder($params->{"cyl_r"}, $params->{"cyl_h"}); } elsif ($type eq "sphere") { $mesh = Slic3r::TriangleMesh::sphere($params->{"sph_rho"}); + } elsif ($type eq "slab") { + $mesh = Slic3r::TriangleMesh::cube($self->{model_object}->bounding_box->size->x*1.5, $self->{model_object}->bounding_box->size->y*1.5, $params->{"slab_h"}); + # box sets the base coordinate at 0,0, move to center of plate and move it up to initial_z + $mesh->translate(-$self->{model_object}->bounding_box->size->x*1.5/2.0, -$self->{model_object}->bounding_box->size->y*1.5/2.0, $params->{"slab_z"}); } else { return; }