feat: add object instance controls

(cherry picked from commit 1303a53)

Author: BenJule

src/slic3r/GUI/GUI_Factories.cpp

@@ -1246,11 +1246,53 @@ void MenuFactory::create_default_menu()
         []() { return plater()->is_view3D_shown(); }, [this]() { return plater()->are_view3D_object_labels_shown(); }, m_parent);
 }
 
+void MenuFactory::append_menu_items_instance_manipulation(wxMenu* menu)
+{
+    const MenuType type = menu == &m_object_menu ? mtObjectFFF : mtObjectSLA;
+
+    items_increase[type] = append_menu_item(
+        menu,
+        wxID_ANY,
+        _L("Add instance"),
+        _L("Add one more instance of the selected object"),
+        [](wxCommandEvent&) { plater()->increase_instances(); },
+        "",
+        nullptr,
+        []() { return plater()->can_increase_instances(); },
+        m_parent);
+
+    items_decrease[type] = append_menu_item(
+        menu,
+        wxID_ANY,
+        _L("Remove instance"),
+        _L("Remove one instance of the selected object"),
+        [](wxCommandEvent&) { plater()->decrease_instances(); },
+        "",
+        nullptr,
+        []() { return plater()->can_decrease_instances(); },
+        m_parent);
+
+    items_set_number_of_copies[type] = append_menu_item(
+        menu,
+        wxID_ANY,
+        _L("Set number of instances") + dots,
+        _L("Change the number of instances of the selected object"),
+        [](wxCommandEvent&) { plater()->set_number_of_copies(); },
+        "",
+        nullptr,
+        []() {
+            return plater()->can_increase_instances() ||
+                   plater()->can_decrease_instances();
+        },
+        m_parent);
+
+    menu->AppendSeparator();
+}
+
 void MenuFactory::create_common_object_menu(wxMenu* menu)
 {
     append_menu_item_rename(menu);
-    // BBS
-    //append_menu_items_instance_manipulation(menu);
+    append_menu_items_instance_manipulation(menu);
     // Delete menu was moved to be after +/- instace to make it more difficult to be selected by mistake.
     append_menu_item_delete(menu);
     //append_menu_item_instance_to_object(menu);
@@ -1292,6 +1334,7 @@ void MenuFactory::create_object_menu()
 
 void MenuFactory::create_bbl_object_menu()
 {
+    append_menu_items_instance_manipulation(&m_object_menu);
     append_menu_item_fill_bed(&m_object_menu);
     // Object Clone
     append_menu_item_clone(&m_object_menu);

src/slic3r/GUI/GUI_Factories.hpp

@@ -166,7 +166,7 @@ class MenuFactory
     void        append_menu_item_edit_text(wxMenu *menu);
     void        append_menu_item_edit_svg(wxMenu *menu);
 
-    //void        append_menu_items_instance_manipulation(wxMenu *menu);
+    void        append_menu_items_instance_manipulation(wxMenu *menu);
     //void        update_menu_items_instance_manipulation(MenuType type);
     //BBS add bbl menu item
     void        append_menu_item_clone(wxMenu* menu);

src/slic3r/GUI/Plater.cpp

@@ -20265,8 +20265,6 @@ void Plater::remove_selected()
 
 void Plater::increase_instances(size_t num)
 {
-    // BBS
-#if 0
     if (! can_increase_instances()) { return; }
 
     Plater::TakeSnapshot snapshot(this, "Increase Instances");
@@ -20299,13 +20297,10 @@ void Plater::increase_instances(size_t num)
 
     p->selection_changed();
     this->p->schedule_background_process();
-#endif
 }
 
 void Plater::decrease_instances(size_t num)
 {
-    // BBS
-#if 0
     if (! can_decrease_instances()) { return; }
 
     Plater::TakeSnapshot snapshot(this, "Decrease Instances");
@@ -20322,14 +20317,14 @@ void Plater::decrease_instances(size_t num)
     }
     else {
         remove(obj_idx);
+        return;
     }
 
     if (!model_object->instances.empty())
         p->get_selection().add_instance(obj_idx, (int)model_object->instances.size() - 1);
 
     p->selection_changed();
     this->p->schedule_background_process();
-#endif
 }
 
 static long GetNumberFromUser(  const wxString& msg,
@@ -20360,13 +20355,11 @@ void Plater::set_number_of_copies(/*size_t num*/)
 
     ModelObject* model_object = p->model.objects[obj_idx];
 
-    const int num = GetNumberFromUser( " ", _L("Number of copies:"),
-                                    _L("Copies of the selected object"), model_object->instances.size(), 0, 1000, this );
+    const int num = GetNumberFromUser( " ", _L("Number of instances:"),
+                                    _L("Instances of the selected object"), model_object->instances.size(), 1, 1000, this );
     if (num < 0)
         return;
 
-    Plater::TakeSnapshot snapshot(this, (boost::format("Set numbers of copies to %1%")%num).str());
-
     int diff = num - (int)model_object->instances.size();
     if (diff > 0)
         increase_instances(diff);