From 11f065ca5e1336d590fd55707dcebd4b35a702fb Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Wed, 8 Jan 2014 19:36:41 +0100
Subject: [PATCH] New object dialog tab with list of materials and volumes

---
 lib/Slic3r/GUI.pm                             |   1 +
 lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm     |  61 ++++++++++++++++++
 lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm |   1 +
 var/package_green.png                         | Bin 0 -> 896 bytes
 var/tag_blue.png                              | Bin 0 -> 586 bytes
 5 files changed, 63 insertions(+)
 create mode 100644 lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm
 create mode 100755 var/package_green.png
 create mode 100755 var/tag_blue.png

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 0000000000000000000000000000000000000000..25b28bb6aab661d06764c3f5df40447eafdc0611
GIT binary patch
literal 896
zcmV-`1AqL9P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#5=lfsR5;6h
zlSyb?1ssRJH|v{pCi_y7v=y_EMcdSihZ=)eg7nZfv}y`M1o5DPo(xjzK`;lQ_F^wq
zir~dlPt~TN!H6Xi&C;q#nq(TYO(&VjGW)!ldGG)CWDgSj&L7|D_cK(LgIN6jY&RmG
zs%S_>KI|MAoju4i{u@{tJy)-y@2kjrH7x^`PJV~I)v=6<eyNUJduDL#@qvNmyXU>C
z`lgBuhno6Z8#*uI5{FE53a{TyEIdwPb9zlhuByn*o}qjBCxNBA=lc=8;;-uIZRogw
zS=9zw#NJ=#@9`0ibe+Ogc8o$c&USd3bbMh_9cSdZw<m8Ki=*ehMr5eAb<i-YpT$b=
zkc=<j6f=~vQA}5nh9m7@?c)v}#bt&_MVHtPPm|kU`_`k5ywQI8x=~8+kco~X#T5Qr
zoLnkOY9m7H;1_rUhakI(X2Te%C2AUvQ&9~wcUE5Ys7O{ZDtxA&Q1wyr@p;OsDyggr
z5FiKEIygSCB9Px8w>3#-bprFL3#cPmkBXQjDd5M8x1tTNKZF&VLNYPDZZL9>z@-$o
zek7erU<WEuHz1%QWgd0J9Zrtokv-aiui)|=!mK}u?F(R9yU5lLBui;*Gl=64A-NKJ
zR*r~TsN;BD>Ns|}ub$=P&x}PsA(FiZTEG)*B6PT&oEM6I6T4uO&RP6Yi1D2#!M@?3
zj;KdPT+QWuH26CBX>*w061S-HHgF>FB0;keTcKdt%%qe2>11#Wc&Yqlx{|^}k)r#Z
zfn$A{-OZ<ip=LS`U!u-k%UpV#N7fv+?z6JJ&7H(HYhuwE?BccBvy>-=^|@K>LVUuw
z|4pw?MTXRo;p&#tt<A^J;PQC*BYuO2nHm0C+^5c0!|P2Kapwv|<{yyWy}zcSpCfYf
z$&_cldcIyoK2S&AZ9H+lva#n3rDB5E#uP!vMRb0S-Svr#iri3<YrP+@L=HUD@7GUu
zt0R|H<WfuDTSh*%%HxFx*!j&{DmwDQmGJEUzVTmvz1rQcA|D~*Q<2Y3U0%L@koON=
WFTzErDA}I?0000<MNUMnLSTZ~LbUDx

literal 0
HcmV?d00001

diff --git a/var/tag_blue.png b/var/tag_blue.png
new file mode 100755
index 0000000000000000000000000000000000000000..9757fc6ed6597438eb8e5a70a1ab2402cdebd5d1
GIT binary patch
literal 586
zcmV-Q0=4~#P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz+(|@1R5;6p
zli7+IK@^7TCFVB4w-A~<T_9wVOfEA+67m49DDEgIDsIy~ZaprDn2w^x+%>6YY<vFH
zDX|@K$;G*;I{)|or}{M0bsgPq7wvW%tyT-oW)qsGK~+^W8jULe>{78#rvt}vj%qrc
zN=UU@y$E6COaj9&r1NAlaUpajQlL~SorN%pOwHs*2laYgHBA$?ZOd~4Rw@<b^ZAny
zMy|U?A$}5(4a>5yFm2?1ZIg`0V-$-;<Z`(q2qWiR<jrOS694||;KRc+-rfUQV|zCm
zjVJ}u>GT1Fi5dB7wUSNi^%`^Ge62m>OBeX610Nsukl}DhDG-mxT?nhyYH!4he7Ri8
zrq0Ti&UXUvqX&F@JcJAe14@BNBqAY_QZAPjF(Y3r7P9H_kB#@LgFAf>xz>Qp&n=|a
z>ro1XLZK^nmO`PRh#C2OK0ktd7l6-A;O5?fz1gNnCX)yR0<RBVRLrMjvspfy&0NSk
z0r@0GxNWUrT2C*<9(RP7mC0n3R4T=36A7XV$Zgw!W$&H+e!s_k#8b<WNF<b4EXHXQ
zcb}NV;`~5-7C;q^M!n*tIW1Vf-#;n72%rjw!`@&p$Vu$;`8+3A`G3EwaP<oDt8@4N
Y09wpC?6mZIDF6Tf07*qoM6N<$f_O;+EC2ui

literal 0
HcmV?d00001