remove: Revert "ENH: support default filament for volumes"

This reverts commit 8f1b7d6e8b603e32bc1fa5d52fd0ab6dd8ddcb29.

Change-Id: I73ac458be7d2d5d1f9c0a976e936f3f97c90f57d

src/slic3r/GUI/ExtraRenderers.cpp

@@ -313,16 +313,11 @@ wxWindow* BitmapChoiceRenderer::CreateEditorCtrl(wxWindow* parent, wxRect labelR
         labelRect.GetTopLeft(), wxSize(labelRect.GetWidth(), -1),
         0, nullptr, wxCB_READONLY | CB_NO_DROP_ICON | CB_NO_TEXT);
     c_editor->GetDropDown().SetUseContentWidth(true);
-
     // BBS
-    int def_id = get_default_extruder_idx ? get_default_extruder_idx() : 0;
-    wxBitmap* default_icon = get_extruder_color_icon(def_id, true);
-    if (is_volume_selected())
-        c_editor->Append("default", *default_icon);
     for (size_t i = 0; i < icons.size(); i++)
         c_editor->Append(wxString::Format("%d", i+1), *icons[i]);
 
-    c_editor->SetSelection(atoi(data.GetText().c_str()));
+    c_editor->SetSelection(atoi(data.GetText().c_str()) - 1);
 
     
 #ifdef __linux__

src/slic3r/GUI/GUI_Factories.cpp

@@ -689,9 +689,7 @@ void MenuFactory::append_menu_item_change_extruder(wxMenu* menu)
         initial_extruder = config.has("extruder") ? config.extruder() : 1;
     }
 
-    ItemType sel_type = obj_list()->get_item_type(sels[0]);
+    for (int i = 0; i <= filaments_cnt; i++)
-    int i = (sel_type & ItemType::itVolume) ? 0 : 1;
-    for (; i < filaments_cnt; i++)
     {
         bool is_active_extruder = i == initial_extruder;
         int icon_idx = i == 0 ? 0 : i - 1;

src/slic3r/GUI/GUI_ObjectList.cpp

@@ -587,11 +587,6 @@ ModelConfig& ObjectList::get_item_config(const wxDataViewItem& item) const
                             (*m_objects)[obj_idx]->config;
 }
 
-ItemType ObjectList::get_item_type(const wxDataViewItem& item) const
-{
-    return m_objects_model->GetItemType(item);
-}
-
 void ObjectList::update_filament_values_for_items(const size_t filaments_count)
 {
     for (size_t i = 0; i < m_objects->size(); ++i)
@@ -1369,7 +1364,7 @@ void ObjectList::key_event(wxKeyEvent& event)
     //else if (event.GetUnicodeKey() == 'p')
     //    toggle_printable_state();
     else if (filaments_count() > 1) {
-        std::vector<wxChar> numbers = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' };
+        std::vector<wxChar> numbers = { '1', '2', '3', '4', '5', '6', '7', '8', '9' };
         wxChar key_char = event.GetUnicodeKey();
         if (std::find(numbers.begin(), numbers.end(), key_char) != numbers.end()) {
             long extruder_number;
@@ -1846,7 +1841,8 @@ void ObjectList::load_modifier(const wxArrayString& input_files, ModelObject& mo
         ModelVolume* new_volume = model_object.add_volume(std::move(mesh), type);
         new_volume->name = boost::filesystem::path(input_file).filename().string();
         // set a default extruder value, since user can't add it manually
-        new_volume->config.set_key_value("extruder", new ConfigOptionInt(0));
+        // BBS
+        new_volume->config.set_key_value("extruder", new ConfigOptionInt(1));
         // update source data
         new_volume->source.input_file = input_file;
         new_volume->source.object_idx = obj_idx;
@@ -1948,7 +1944,8 @@ void ObjectList::load_generic_subobject(const std::string& type_name, const Mode
     const wxString name = _L("Generic") + "-" + _(type_name);
     new_volume->name = into_u8(name);
     // set a default extruder value, since user can't add it manually
-    new_volume->config.set_key_value("extruder", new ConfigOptionInt(0));
+    // BBS
+    new_volume->config.set_key_value("extruder", new ConfigOptionInt(1));
     new_volume->source.is_from_builtin_objects = true;
 
     select_item([this, obj_idx, new_volume]() {
@@ -4721,7 +4718,7 @@ void ObjectList::ItemValueChanged(wxDataViewEvent &event)
     else if (event.GetColumn() == colFilament) {
         wxDataViewItem item = event.GetItem();
         if (m_objects_model->GetItemType(item) == itObject)
-            m_objects_model->UpdateVolumesExtruderBitmap(item);
+            m_objects_model->UpdateVolumesExtruderBitmap(item, true);
         update_filament_in_config(item);
     }
 }
@@ -4801,17 +4798,13 @@ void ObjectList::set_extruder_for_selected_items(const int extruder)
         wxDataViewItem item = (sel_item_type & itInstance) ? m_objects_model->GetObject(item) : sel_item;
         ItemType type = m_objects_model->GetItemType(item);
 
-        // ignore extruder 0 for object
-        if ((sel_item_type & (itObject | itInstance)) && extruder == 0)
-            continue;
-
         ModelConfig& config = get_item_config(item);
         if (config.has("extruder"))
             config.set("extruder", extruder);
         else
             config.set_key_value("extruder", new ConfigOptionInt(extruder));
 
-        // BBS: for object, clear all its volume's extruder config
+        // for object, clear all its volume's extruder config
         if (type & itObject) {
             ObjectDataViewModelNode* node = (ObjectDataViewModelNode*)item.GetID();
             for (ModelVolume* mv : node->m_model_object->volumes) {

src/slic3r/GUI/GUI_ObjectList.hpp

@@ -311,9 +311,6 @@ public:
     int                 get_selected_obj_idx() const;
     ModelConfig&        get_item_config(const wxDataViewItem& item) const;
 
-    // BBS
-    ItemType            get_item_type(const wxDataViewItem& item) const;
-
     void                changed_object(const int obj_idx = -1) const;
     void                part_selection_changed();
 

src/slic3r/GUI/ObjectDataViewModel.cpp

@@ -343,16 +343,11 @@ void ObjectDataViewModelNode::UpdateExtruderAndColorIcon(wxString extruder /*= "
         m_extruder = extruder; // update extruder
 
     // update color icon
-    bool as_default = false;
     size_t extruder_idx = atoi(extruder.c_str());
     if (extruder_idx == 0) {
-        if (m_type & itObject) {
+        if (m_type & itObject);
-            // Do nothing
+        else if (m_type & itVolume && m_volume_type == ModelVolumeType::MODEL_PART) {
-        }
-        else if (m_type & itVolume) {
-            // m_volume_type should be MODEL_PART or PARAMETER_MODIFIER type
             extruder_idx = atoi(m_parent->GetExtruder().c_str());
-            as_default = true;
         }
         else {
             m_extruder_bmp = wxNullBitmap;
@@ -360,8 +355,15 @@ void ObjectDataViewModelNode::UpdateExtruderAndColorIcon(wxString extruder /*= "
         }
     }
 
-    wxBitmap* bitmap = get_extruder_color_icon(extruder_idx, as_default);
+    if (extruder_idx > 0) --extruder_idx;
-    m_extruder_bmp = bitmap ? *bitmap : wxNullBitmap;
+    // Create the bitmap with color bars.
+    std::vector<wxBitmap*> bmps = get_extruder_color_icons(false);// use wide icons
+    if (bmps.empty()) {
+        m_extruder_bmp = wxNullBitmap;
+        return;
+    }
+
+    m_extruder_bmp = *bmps[extruder_idx >= bmps.size() ? 0 : extruder_idx];
 }
 
 // *****************************************************************************
@@ -547,7 +549,7 @@ wxDataViewItem ObjectDataViewModel::AddVolumeChild( const wxDataViewItem &parent
     wxString extruder_str = extruder == 0 ? _(L("default")) : wxString::Format("%d", extruder);
 
     const auto node = new ObjectDataViewModelNode(root, name, volume_type, GetVolumeIcon(volume_type, warning_icon_name),
-        extruder_str, root->m_volumes_cnt, warning_icon_name);
+        extruder == 0 ? root->m_extruder : extruder_str, root->m_volumes_cnt, warning_icon_name);
     insert_position < 0 ? root->Append(node) : root->Insert(node, insert_position);
 
     // if part with errors is added, but object wasn't marked, then mark it
@@ -1370,33 +1372,26 @@ void ObjectDataViewModel::UpdateItemNames()
 }
 
 // BBS: add use_obj_extruder
-void ObjectDataViewModel::UpdateVolumesExtruderBitmap(wxDataViewItem obj_item)
+void ObjectDataViewModel::UpdateVolumesExtruderBitmap(wxDataViewItem obj_item, bool use_obj_extruder)
 {
     if (!obj_item.IsOk() || GetItemType(obj_item) != itObject)
         return;
     ObjectDataViewModelNode* obj_node = static_cast<ObjectDataViewModelNode*>(obj_item.GetID());
-    ModelObject* mo = obj_node->m_model_object;
     for (auto child : obj_node->GetChildren())
-        // BBS: also update PARAMETER_MODIFIER
+        if (child->GetVolumeType() == ModelVolumeType::MODEL_PART)
-        if (child->GetVolumeType() == ModelVolumeType::MODEL_PART || child->GetVolumeType() == ModelVolumeType::PARAMETER_MODIFIER) {
+            child->UpdateExtruderAndColorIcon(use_obj_extruder ? obj_node->GetExtruder() : "");
-            int vol_idx = child->GetIdx();
-            ModelVolume* mv = mo->volumes[vol_idx];
-            const ConfigOption* opt = mv->config.option("extruder");
-            int vol_extr = opt ? opt->getInt() : 0;
-            child->UpdateExtruderAndColorIcon(std::to_string(vol_extr));
-        }
 }
 
 int ObjectDataViewModel::GetDefaultExtruderIdx(wxDataViewItem item)
 {
     ItemType type = GetItemType(item);
     if (type == itObject)
-        return 1;
+        return 0;
 
-    if (type == itVolume && (GetVolumeType(item) == ModelVolumeType::MODEL_PART || GetVolumeType(item) == ModelVolumeType::PARAMETER_MODIFIER)) {
+    if (type == itVolume && GetVolumeType(item) == ModelVolumeType::MODEL_PART) {
         wxDataViewItem obj_item = GetParent(item);
         int extruder_id = GetExtruderNumber(obj_item);
-        //if (extruder_id > 0) extruder_id--;
+        if (extruder_id > 0) extruder_id--;
         return extruder_id;
     }
 
@@ -1587,7 +1582,7 @@ void ObjectDataViewModel::SetExtruder(const wxString& extruder, wxDataViewItem i
 
     node->UpdateExtruderAndColorIcon(extruder);
     if (node->GetType() == itObject)
-        UpdateVolumesExtruderBitmap(item);
+        UpdateVolumesExtruderBitmap(item, true);
 
     // BBS
     ItemChanged(item);

src/slic3r/GUI/ObjectDataViewModel.hpp

@@ -449,7 +449,7 @@ public:
     bool        UpdateColumValues(unsigned col);
     void        UpdateExtruderBitmap(wxDataViewItem item);
     // BBS: add use_obj_extruder
-    void        UpdateVolumesExtruderBitmap(wxDataViewItem object_item);
+    void        UpdateVolumesExtruderBitmap(wxDataViewItem object_item, bool use_obj_extruder = false);
     int         GetDefaultExtruderIdx(wxDataViewItem item);
 
     // BBS

src/slic3r/GUI/wxExtensions.cpp

@@ -462,14 +462,16 @@ wxBitmap create_scaled_bitmap(  const std::string& bmp_name_in,
     return *bmp;
 }
 
-wxBitmap* get_extruder_color_icon(int extruder_id, bool as_default, bool thin_icon/* = false*/)
+std::vector<wxBitmap*> get_extruder_color_icons(bool thin_icon/* = false*/)
 {
     static Slic3r::GUI::BitmapCache bmp_cache;
 
-    bool dark_mode = Slic3r::GUI::wxGetApp().dark_mode();
+    // Create the bitmap with color bars.
+    std::vector<wxBitmap*> bmps;
     std::vector<std::string> colors = Slic3r::GUI::wxGetApp().plater()->get_extruder_colors_from_plater_config();
-    if (colors.empty() || extruder_id > colors.size())
+
-        return nullptr;
+    if (colors.empty())
+        return bmps;
 
     unsigned char rgb[3];
 
@@ -481,15 +483,18 @@ wxBitmap* get_extruder_color_icon(int extruder_id, bool as_default, bool thin_ic
     const int icon_width = lround((thin_icon ? 2 : 4.5) * em);
     const int icon_height = lround(2 * em);
 
+    bool dark_mode = Slic3r::GUI::wxGetApp().dark_mode();
+
+    int index = 0;
     wxClientDC cdc((wxWindow*)Slic3r::GUI::wxGetApp().mainframe);
     wxMemoryDC dc(&cdc);
     dc.SetFont(::Label::Body_12);
-    std::string color = colors[extruder_id - 1];
+    for (const std::string &color : colors)
-    auto cache_label = as_default ? "default" : std::to_string(extruder_id);
+    {
+        auto label = std::to_string(++index);
         std::string bitmap_key = color + "-h" + std::to_string(icon_height) + "-w" + std::to_string(icon_width) 
-        + "-i" + cache_label;
+                + "-i" + label;
 
-    auto disp_label = as_default ? _L("default") : std::to_string(extruder_id);
         wxBitmap* bitmap = bmp_cache.find(bitmap_key);
         if (bitmap == nullptr) {
             // Paint the color icon.
@@ -505,41 +510,17 @@ wxBitmap* get_extruder_color_icon(int extruder_id, bool as_default, bool thin_ic
                 dc.SetPen(*wxGREY_PEN);
                 dc.DrawRectangle(0, 0, icon_width, icon_height);
             }
-        auto size = dc.GetTextExtent(disp_label);
+            auto size = dc.GetTextExtent(wxString(label));
             dc.SetTextForeground(clr.GetLuminance() < 0.51 ? *wxWHITE : *wxBLACK);
-        dc.DrawText(disp_label, (icon_width - size.x) / 2, (icon_height - size.y) / 2);
+            dc.DrawText(label, (icon_width - size.x) / 2, (icon_height - size.y) / 2);
             dc.SelectObject(wxNullBitmap);
         }
-
-    return bitmap;
-}
-
-std::vector<wxBitmap*> get_extruder_color_icons(bool thin_icon/* = false*/)
-{
-    // Create the bitmap with color bars.
-    std::vector<wxBitmap*> bmps;
-    int index = 0;
-    std::vector<std::string> colors = Slic3r::GUI::wxGetApp().plater()->get_extruder_colors_from_plater_config();
-    for (const std::string &color : colors)
-    {
-        wxBitmap* bitmap = get_extruder_color_icon(++index, false, thin_icon);
         bmps.emplace_back(bitmap);
     }
 
     return bmps;
 }
 
-bool is_volume_selected()
-{
-    Slic3r::GUI::ObjectList* obj_list = Slic3r::GUI::wxGetApp().obj_list();
-
-    wxDataViewItemArray sels;
-    obj_list->GetSelections(sels);
-    if (sels.IsEmpty())
-        return false;
-
-    return (obj_list->get_item_type(sels[0]) & Slic3r::GUI::ItemType::itVolume) != 0;
-}
 
 void apply_extruder_selector(Slic3r::GUI::BitmapComboBox** ctrl, 
                              wxWindow* parent,

src/slic3r/GUI/wxExtensions.hpp

@@ -64,10 +64,7 @@ wxBitmap create_scaled_bitmap(const std::string& bmp_name, wxWindow *win = nullp
     const int px_cnt = 16, const bool grayscale = false, const bool resize = false);
 #endif
 
-// BBS
-wxBitmap* get_extruder_color_icon(int extruder_id, bool as_default, bool thin_icon = false);
 std::vector<wxBitmap*> get_extruder_color_icons(bool thin_icon = false);
-bool is_volume_selected();
 
 namespace Slic3r {
 namespace GUI {