From a9e7b5c645ced9974477aa976a792f6b010d93a1 Mon Sep 17 00:00:00 2001
From: YuSanka <yusanka@gmail.com>
Date: Fri, 2 Nov 2018 12:35:26 +0100
Subject: [PATCH] Implemented adding of support enforcer/blocker to the object
 list

---
 resources/icons/support_blocker_.png  | Bin 0 -> 1955 bytes
 resources/icons/support_enforcer_.png | Bin 0 -> 1744 bytes
 src/slic3r/GUI/GUI_ObjectList.cpp     | 142 ++++++++++----------------
 src/slic3r/GUI/GUI_ObjectList.hpp     |   9 +-
 4 files changed, 58 insertions(+), 93 deletions(-)
 create mode 100644 resources/icons/support_blocker_.png
 create mode 100644 resources/icons/support_enforcer_.png

diff --git a/resources/icons/support_blocker_.png b/resources/icons/support_blocker_.png
new file mode 100644
index 0000000000000000000000000000000000000000..0873c5e6edbf7cb9232723e54f43202eacfa208f
GIT binary patch
literal 1955
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

literal 0
HcmV?d00001

diff --git a/resources/icons/support_enforcer_.png b/resources/icons/support_enforcer_.png
new file mode 100644
index 0000000000000000000000000000000000000000..265cebcb953919dcd947496a4cd36d4683012ee8
GIT binary patch
literal 1744
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

literal 0
HcmV?d00001

diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp
index d1f9f4df14..082a9f66dc 100644
--- a/src/slic3r/GUI/GUI_ObjectList.cpp
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
@@ -213,17 +213,26 @@ void ObjectList::update_extruder_in_config(const wxString& selection)
 
 void ObjectList::init_icons()
 {
-    m_bmp_modifiermesh = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("lambda.png")), wxBITMAP_TYPE_PNG);//(Slic3r::var("plugin.png")), wxBITMAP_TYPE_PNG);
-    m_bmp_solidmesh = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("object.png")), wxBITMAP_TYPE_PNG);//(Slic3r::var("package.png")), wxBITMAP_TYPE_PNG);
+    m_bmp_modifiermesh      = wxBitmap(from_u8(var("lambda.png")), wxBITMAP_TYPE_PNG);//(Slic3r::var("plugin.png")), wxBITMAP_TYPE_PNG);
+    m_bmp_solidmesh         = wxBitmap(from_u8(var("object.png")), wxBITMAP_TYPE_PNG);//(Slic3r::var("package.png")), wxBITMAP_TYPE_PNG);
+
+    m_bmp_support_enforcer  = wxBitmap(from_u8(var("support_enforcer_.png")), wxBITMAP_TYPE_PNG);
+    m_bmp_support_blocker   = wxBitmap(from_u8(var("support_blocker_.png")), wxBITMAP_TYPE_PNG);
+
+    m_bmp_vector.reserve(4); // bitmaps for different types of parts 
+    m_bmp_vector.push_back(&m_bmp_solidmesh);         // Add part
+    m_bmp_vector.push_back(&m_bmp_modifiermesh);      // Add modifier
+    m_bmp_vector.push_back(&m_bmp_support_enforcer);  // Add support enforcer
+    m_bmp_vector.push_back(&m_bmp_support_blocker);   // Add support blocker
 
     // init icon for manifold warning
-    m_bmp_manifold_warning = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("exclamation_mark_.png")), wxBITMAP_TYPE_PNG);//(Slic3r::var("error.png")), wxBITMAP_TYPE_PNG);
+    m_bmp_manifold_warning  = wxBitmap(from_u8(var("exclamation_mark_.png")), wxBITMAP_TYPE_PNG);//(Slic3r::var("error.png")), wxBITMAP_TYPE_PNG);
 
     // init bitmap for "Split to sub-objects" context menu
-    m_bmp_split = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("split.png")), wxBITMAP_TYPE_PNG);
+    m_bmp_split             = wxBitmap(from_u8(var("split.png")), wxBITMAP_TYPE_PNG);
 
     // init bitmap for "Add Settings" context menu
-    m_bmp_cog = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("cog.png")), wxBITMAP_TYPE_PNG);
+    m_bmp_cog               = wxBitmap(from_u8(var("cog.png")), wxBITMAP_TYPE_PNG);
 }
 
 
@@ -552,47 +561,60 @@ wxMenuItem* ObjectList::menu_item_settings(wxMenu* menu, int id, const bool is_p
 wxMenu* ObjectList::create_add_part_popupmenu()
 {
     wxMenu *menu = new wxMenu;
-    std::vector<std::string> menu_items = { L("Add part"), L("Add modifier"), L("Add generic") };
+    std::vector<std::string> menu_object_types_items = {L("Add part"), 
+                                                        L("Add modifier"), 
+                                                        L("Add support enforcer"), 
+                                                        L("Add support bloker"), 
+                                                        L("Add generic") };
+    const int obj_types_count = menu_object_types_items.size();
+    const int generics_count = 4;
 
-    wxWindowID config_id_base = wxWindow::NewControlId(menu_items.size() + 4 + 2);
+    wxWindowID config_id_base = wxWindow::NewControlId(menu_object_types_items.size() + 4 + 2);
 
+    // Add first 4 menu items
     int i = 0;
-    for (auto& item : menu_items) {
+    for (i = 0; i < obj_types_count - 1; i++) {
+        auto& item = menu_object_types_items[i];
         auto menu_item = new wxMenuItem(menu, config_id_base + i, _(item));
-        menu_item->SetBitmap(i == 0 ? m_bmp_solidmesh : m_bmp_modifiermesh);
-        if (item == "Add generic")
-            menu_item_add_generic(menu_item, config_id_base + i);
+        menu_item->SetBitmap(*m_bmp_vector[i]);
         menu->Append(menu_item);
-        i++;
     }
+    // Add generic modifier
+    auto& item = menu_object_types_items[i];
+    auto menu_item = new wxMenuItem(menu, config_id_base + i, _(item));
+    menu_item->SetBitmap(*m_bmp_vector[1]); // set modifier's icon
+    menu_item_add_generic(menu_item, config_id_base + i);
+    menu->Append(menu_item);
 
+    // Split object to parts
     menu->AppendSeparator();
-    auto menu_item = menu_item_split(menu, config_id_base + i + 4);
+    menu_item = menu_item_split(menu, config_id_base + obj_types_count + generics_count);
     menu->Append(menu_item);
     menu_item->Enable(is_splittable_object(false));
 
+    // Settings
     menu->AppendSeparator();
     // Append settings popupmenu
-    menu->Append(menu_item_settings(menu, config_id_base + i + 5, false));
+    menu->Append(menu_item_settings(menu, config_id_base + obj_types_count + generics_count+1, false));
 
     menu->Bind(wxEVT_MENU, [config_id_base, menu, this](wxEvent &event) {
         switch (event.GetId() - config_id_base) {
-        case 0:
-            load_subobject();
+        case 0: // ~ModelVolume::MODEL_PART
+        case 1: // ~ModelVolume::PARAMETER_MODIFIER
+        case 2: // ~ModelVolume::SUPPORT_ENFORCER
+        case 3: // ~ModelVolume::SUPPORT_BLOCKER
+            load_subobject(event.GetId() - config_id_base);
             break;
-        case 1:
-            load_subobject(true);
-            break;
-        case 2:
-        case 3:
         case 4:
         case 5:
         case 6:
+        case 7:
+        case 8:
 #ifdef __WXMSW__
             load_lambda(menu->GetLabel(event.GetId()).ToStdString());
 #endif // __WXMSW__
             break;
-        case 7: //3:
+        case 9:
             split(false);
             break;
         default:
@@ -655,31 +677,21 @@ wxMenu* ObjectList::create_add_settings_popupmenu(bool is_part)
     return menu;
 }
 
-
-// Load SubObjects (parts and modifiers)
-void ObjectList::load_subobject(bool is_modifier /*= false*/, bool is_lambda/* = false*/)
+void ObjectList::load_subobject(int type)
 {
     auto item = GetSelection();
-    if (!item)
-        return;
-    int obj_idx = -1;
-    if (m_objects_model->GetParent(item) == wxDataViewItem(0))
-        obj_idx = m_objects_model->GetIdByItem(item);
-    else
+    if (!item || m_objects_model->GetParent(item) != wxDataViewItem(0))
         return;
+    int obj_idx = m_objects_model->GetIdByItem(item);
 
     if (obj_idx < 0) return;
     wxArrayString part_names;
-    if (is_lambda)
-        load_lambda((*m_objects)[obj_idx], part_names, is_modifier);
-    else
-        load_part((*m_objects)[obj_idx], part_names, is_modifier);
+    load_part((*m_objects)[obj_idx], part_names, type);
 
     parts_changed(obj_idx);
 
     for (int i = 0; i < part_names.size(); ++i) {
-        const wxDataViewItem sel_item = m_objects_model->AddVolumeChild(item, part_names.Item(i),
-            is_modifier ? m_bmp_modifiermesh : m_bmp_solidmesh);
+        const wxDataViewItem sel_item = m_objects_model->AddVolumeChild(item, part_names.Item(i), *m_bmp_vector[type]);
 
         if (i == part_names.size() - 1)
             select_item(sel_item);
@@ -688,11 +700,12 @@ void ObjectList::load_subobject(bool is_modifier /*= false*/, bool is_lambda/* =
 #ifndef __WXOSX__ //#ifdef __WXMSW__ // #ys_FIXME
 //     selection_changed();
 #endif //no __WXOSX__//__WXMSW__
+
 }
 
 void ObjectList::load_part( ModelObject* model_object,
                             wxArrayString& part_names, 
-                            const bool is_modifier)
+                            int type)
 {
     wxWindow* parent = wxGetApp().tab_panel()->GetPage(0);
 
@@ -722,7 +735,7 @@ void ObjectList::load_part( ModelObject* model_object,
             }
             for (auto volume : object->volumes) {
                 auto new_volume = model_object->add_volume(*volume);
-                new_volume->set_type(is_modifier ? ModelVolume::PARAMETER_MODIFIER : ModelVolume::MODEL_PART);
+                new_volume->set_type(static_cast<ModelVolume::Type>(type));
                 boost::filesystem::path(input_file).filename().string();
                 new_volume->name = boost::filesystem::path(input_file).filename().string();
 
@@ -738,58 +751,7 @@ void ObjectList::load_part( ModelObject* model_object,
             }
         }
     }
-}
 
-void ObjectList::load_lambda(   ModelObject* model_object,
-                                wxArrayString& part_names, 
-                                const bool is_modifier)
-{
-    auto dlg = new LambdaObjectDialog(GetMainWindow());
-    if (dlg->ShowModal() == wxID_CANCEL) {
-        m_parts_changed = false;
-        return;
-    }
-
-    std::string name = "lambda-";
-    TriangleMesh mesh;
-
-    auto params = dlg->ObjectParameters();
-    switch (params.type)
-    {
-    case LambdaTypeBox:{
-        mesh = make_cube(params.dim[0], params.dim[1], params.dim[2]);
-        name += "Box";
-        break; }
-    case LambdaTypeCylinder:{
-        mesh = make_cylinder(params.cyl_r, params.cyl_h);
-        name += "Cylinder";
-        break; }
-    case LambdaTypeSphere:{
-        mesh = make_sphere(params.sph_rho);
-        name += "Sphere";
-        break; }
-    case LambdaTypeSlab:{
-        const auto& size = model_object->bounding_box().size();
-        mesh = make_cube(size(0)*1.5, size(1)*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(-size(0)*1.5 / 2.0, -size(1)*1.5 / 2.0, params.slab_z);
-        name += "Slab";
-        break; }
-    default:
-        break;
-    }
-    mesh.repair();
-
-    auto new_volume = model_object->add_volume(mesh);
-    new_volume->set_type(is_modifier ? ModelVolume::PARAMETER_MODIFIER : ModelVolume::MODEL_PART);
-
-    new_volume->name = name;
-    // set a default extruder value, since user can't add it manually
-    new_volume->config.set_key_value("extruder", new ConfigOptionInt(0));
-
-    part_names.Add(name);
-
-    m_parts_changed = true;
 }
 
 void ObjectList::load_lambda(const std::string& type_name)
diff --git a/src/slic3r/GUI/GUI_ObjectList.hpp b/src/slic3r/GUI/GUI_ObjectList.hpp
index 3a7de9e3b8..63bf3efd03 100644
--- a/src/slic3r/GUI/GUI_ObjectList.hpp
+++ b/src/slic3r/GUI/GUI_ObjectList.hpp
@@ -28,10 +28,14 @@ class ObjectList : public wxDataViewCtrl
 
     wxBitmap	m_bmp_modifiermesh;
     wxBitmap	m_bmp_solidmesh;
+    wxBitmap	m_bmp_support_enforcer;
+    wxBitmap	m_bmp_support_blocker;
     wxBitmap	m_bmp_manifold_warning;
     wxBitmap	m_bmp_cog;
     wxBitmap	m_bmp_split;
 
+    std::vector<wxBitmap*> m_bmp_vector;
+
     int			m_selected_object_id = -1;
     bool		m_prevent_list_events = false;		// We use this flag to avoid circular event handling Select() 
                                                     // happens to fire a wxEVT_LIST_ITEM_SELECTED on OSX, whose event handler 
@@ -85,9 +89,8 @@ public:
     wxMenu*             create_part_settings_popupmenu();
     wxMenu*             create_add_settings_popupmenu(bool is_part);
 
-    void                load_subobject(bool is_modifier = false, bool is_lambda = false);
-    void                load_part(ModelObject* model_object, wxArrayString& part_names, const bool is_modifier);
-    void                load_lambda(ModelObject* model_object, wxArrayString& part_names, const bool is_modifier);
+    void                load_subobject(int type);
+    void                load_part(ModelObject* model_object, wxArrayString& part_names, int type);
     void                load_lambda(const std::string& type_name);
     void                del_subobject_item(wxDataViewItem& item);
     void                del_settings_from_config();