From 13e4e85e3d2b53382915909c46b2340abd88aac1 Mon Sep 17 00:00:00 2001
From: YuSanka <yusanka@gmail.com>
Date: Mon, 17 Oct 2022 15:23:31 +0200
Subject: [PATCH] Cut bug fixing: Model: fixed looks_like_imperial_units().
 This function respects to cut status now. To be detected as
 looks_like_imperial_units, all parts of cat object have to be
 looks_like_imperial_units().

ObjectList: Fixed update after adding/deleting of the modifiers for cut object

GUI_Factories: Fixed a place of the "Invalidate cut info" item in object menu
---
 src/libslic3r/Model.cpp           | 19 ++++++++++++++++---
 src/slic3r/GUI/GUI_Factories.cpp  | 11 ++++-------
 src/slic3r/GUI/GUI_ObjectList.cpp | 17 +++++++++++++----
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp
index 54d4fcab74..56f3af2d1d 100644
--- a/src/libslic3r/Model.cpp
+++ b/src/libslic3r/Model.cpp
@@ -464,12 +464,25 @@ static constexpr const double volume_threshold_inches = 9.0; // 9 = 3*3*3;
 
 bool Model::looks_like_imperial_units() const
 {
-    if (this->objects.size() == 0)
+    if (this->objects.empty())
         return false;
 
     for (ModelObject* obj : this->objects)
-        if (obj->get_object_stl_stats().volume < volume_threshold_inches)
-            return true;
+        if (obj->get_object_stl_stats().volume < volume_threshold_inches) {
+            if (!obj->is_cut())
+                return true;
+            bool all_cut_parts_look_like_imperial_units = true;
+            for (ModelObject* obj_other : this->objects) {
+                if (obj_other == obj)
+                    continue;
+                if (obj_other->cut_id.is_equal(obj->cut_id) && obj_other->get_object_stl_stats().volume >= volume_threshold_inches) {
+                    all_cut_parts_look_like_imperial_units = false;
+                    break;
+                }
+            }
+            if (all_cut_parts_look_like_imperial_units)
+                return true;
+        }
 
     return false;
 }
diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp
index 5164c691e2..ff9113c684 100644
--- a/src/slic3r/GUI/GUI_Factories.cpp
+++ b/src/slic3r/GUI/GUI_Factories.cpp
@@ -689,15 +689,12 @@ void MenuFactory::append_menu_item_invalidate_cut_info(wxMenu* menu)
 {
     const wxString menu_name = _L("Invalidate cut info");
 
-    bool is_cut = obj_list()->has_selected_cut_object();
-
     auto menu_item_id = menu->FindItem(menu_name);
-    if (menu_item_id != wxNOT_FOUND) {
+    if (menu_item_id != wxNOT_FOUND)
         // Delete old menu item if selected object isn't cut
-        if (!is_cut)
-            menu->Destroy(menu_item_id);
-    }
-    else if (is_cut)
+        menu->Destroy(menu_item_id);
+
+    if (obj_list()->has_selected_cut_object())
         append_menu_item(menu, wxID_ANY, menu_name, "",
             [](wxCommandEvent&) { obj_list()->invalidate_cut_info_for_selection(); }, "", menu,
             []() { return true; }, m_parent);
diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp
index 663290a8be..d9cc1b1cac 100644
--- a/src/slic3r/GUI/GUI_ObjectList.cpp
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
@@ -1728,6 +1728,9 @@ void ObjectList::load_generic_subobject(const std::string& type_name, const Mode
         // update printable state on canvas
         wxGetApp().plater()->canvas3D()->update_instance_printable_state_for_object((size_t)obj_idx);
 
+    if (model_object.is_cut())
+        update_info_items(obj_idx);
+
     selection_changed();
 }
 
@@ -1858,11 +1861,13 @@ bool ObjectList::del_subobject_item(wxDataViewItem& item)
 
     // If last volume item with warning was deleted, unmark object item
     if (type & itVolume) {
+        add_volumes_to_object_in_list(obj_idx);
         const std::string& icon_name = get_warning_icon_name(object(obj_idx)->get_object_stl_stats());
         m_objects_model->UpdateWarningIcon(parent, icon_name);
     }
+    else
+        m_objects_model->Delete(item);
 
-    m_objects_model->Delete(item);
     update_info_items(obj_idx);
 
     return true;
@@ -2677,7 +2682,8 @@ void ObjectList::part_selection_changed()
                     volume_id = m_objects_model->GetVolumeIdByItem(item);
                     m_config = &object->volumes[volume_id]->config;
                     update_and_show_manipulations = true;
-                    enable_manipulation = !(object->is_cut() && object->volumes[volume_id]->is_cut_connector());
+                    const ModelVolume* volume = object->volumes[volume_id];
+                    enable_manipulation = !(object->is_cut() && (volume->is_cut_connector() || volume->is_model_part()));
                 }
                 else if (type & itInstance) {
                     og_name = _L("Instance manipulation");
@@ -2874,8 +2880,11 @@ static bool can_add_volumes_to_object(const ModelObject* object)
     if (can && object->is_cut()) {
         int no_connectors_cnt = 0;
         for (const ModelVolume* v : object->volumes)
-            if (!v->is_cut_connector())
+            if (!v->is_cut_connector()) {
+                if (!v->is_model_part())
+                    return true;
                 no_connectors_cnt++;
+            }
         can = no_connectors_cnt > 1;
     }
 
@@ -3031,7 +3040,7 @@ bool ObjectList::delete_from_model_and_list(const std::vector<ItemForDelete>& it
             if (!del_subobject_from_object(item->obj_idx, item->sub_obj_idx, item->type))
                 continue;
             if (item->type&itVolume) {
-                m_objects_model->Delete(m_objects_model->GetItemByVolumeId(item->obj_idx, item->sub_obj_idx));
+                add_volumes_to_object_in_list(item->obj_idx);
                 ModelObject* obj = object(item->obj_idx);
                 if (obj->volumes.size() == 1) {
                     wxDataViewItem parent = m_objects_model->GetItemById(item->obj_idx);