diff --git a/lib/Slic3r/GUI.pm b/lib/Slic3r/GUI.pm index 9d66ea96..20a99304 100644 --- a/lib/Slic3r/GUI.pm +++ b/lib/Slic3r/GUI.pm @@ -7,6 +7,7 @@ use FindBin; use Slic3r::GUI::AboutDialog; use Slic3r::GUI::ConfigWizard; use Slic3r::GUI::Plater; +use Slic3r::GUI::Plater::ObjectPartsPanel; use Slic3r::GUI::Plater::ObjectPreviewDialog; use Slic3r::GUI::Plater::ObjectSettingsDialog; use Slic3r::GUI::Preferences; diff --git a/lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm b/lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm new file mode 100644 index 00000000..1f71da7f --- /dev/null +++ b/lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm @@ -0,0 +1,61 @@ +package Slic3r::GUI::Plater::ObjectPartsPanel; +use strict; +use warnings; +use utf8; + +use Wx qw(:misc :sizer :treectrl wxTAB_TRAVERSAL wxSUNKEN_BORDER wxBITMAP_TYPE_PNG); +use Wx::Event qw(EVT_BUTTON EVT_TREE_ITEM_COLLAPSING); +use base 'Wx::Panel'; + +use constant ICON_MATERIAL => 0; +use constant ICON_SOLIDMESH => 1; +use constant ICON_MODIFIERMESH => 2; + +sub new { + my $class = shift; + my ($parent, %params) = @_; + my $self = $class->SUPER::new($parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + + my $object = $self->{model_object} = $params{model_object}; + + $self->{sizer} = Wx::BoxSizer->new(wxVERTICAL); + + # create TreeCtrl + my $tree = $self->{tree} = Wx::TreeCtrl->new($self, -1, wxDefaultPosition, [-1, 200], + wxTR_NO_BUTTONS | wxSUNKEN_BORDER | wxTR_HAS_VARIABLE_ROW_HEIGHT | wxTR_HIDE_ROOT + | wxTR_MULTIPLE | wxTR_NO_BUTTONS); + { + $self->{tree_icons} = Wx::ImageList->new(16, 16, 1); + $tree->AssignImageList($self->{tree_icons}); + $self->{tree_icons}->Add(Wx::Bitmap->new("$Slic3r::var/tag_blue.png", wxBITMAP_TYPE_PNG)); + $self->{tree_icons}->Add(Wx::Bitmap->new("$Slic3r::var/package.png", wxBITMAP_TYPE_PNG)); + $self->{tree_icons}->Add(Wx::Bitmap->new("$Slic3r::var/package_green.png", wxBITMAP_TYPE_PNG)); + + my $rootId = $tree->AddRoot(""); + my %nodes = (); # material_id => nodeId + foreach my $volume (@{$object->volumes}) { + my $material_id = $volume->material_id; + $material_id //= '_'; + + if (!exists $nodes{$material_id}) { + $nodes{$material_id} = $tree->AppendItem($rootId, $object->model->get_material_name($material_id), ICON_MATERIAL); + } + my $name = $volume->modifier ? 'Modifier mesh' : 'Solid mesh'; + my $icon = $volume->modifier ? ICON_MODIFIERMESH : ICON_SOLIDMESH; + $tree->AppendItem($nodes{$material_id}, $name, $icon); + } + $tree->ExpandAll; + } + EVT_TREE_ITEM_COLLAPSING($self, $tree, sub { + my ($self, $event) = @_; + $event->Veto; + }); + + $self->{sizer}->Add($tree, 0, wxEXPAND | wxALL, 10); + + $self->SetSizer($self->{sizer}); + $self->{sizer}->SetSizeHints($self); + return $self; +} + +1; diff --git a/lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm b/lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm index b2f5c3ce..9422ab54 100644 --- a/lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm +++ b/lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm @@ -16,6 +16,7 @@ sub new { $self->{tabpanel} = Wx::Notebook->new($self, -1, wxDefaultPosition, wxDefaultSize, wxNB_TOP | wxTAB_TRAVERSAL); $self->{tabpanel}->AddPage($self->{settings} = Slic3r::GUI::Plater::ObjectDialog::SettingsTab->new($self->{tabpanel}), "Settings"); $self->{tabpanel}->AddPage($self->{layers} = Slic3r::GUI::Plater::ObjectDialog::LayersTab->new($self->{tabpanel}), "Layers"); + $self->{tabpanel}->AddPage($self->{parts} = Slic3r::GUI::Plater::ObjectPartsPanel->new($self->{tabpanel}, model_object => $params{model_object}), "Parts"); $self->{tabpanel}->AddPage($self->{materials} = Slic3r::GUI::Plater::ObjectDialog::MaterialsTab->new($self->{tabpanel}), "Materials"); my $buttons = $self->CreateStdDialogButtonSizer(wxOK); diff --git a/var/package_green.png b/var/package_green.png new file mode 100755 index 00000000..25b28bb6 Binary files /dev/null and b/var/package_green.png differ diff --git a/var/tag_blue.png b/var/tag_blue.png new file mode 100755 index 00000000..9757fc6e Binary files /dev/null and b/var/tag_blue.png differ