diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp index 3a51ac425..d71a128b0 100644 --- a/src/slic3r/GUI/GUI_Factories.cpp +++ b/src/slic3r/GUI/GUI_Factories.cpp @@ -555,8 +555,8 @@ void MenuFactory::append_menu_items_add_volume(wxMenu* menu) menu->Destroy(range_id); if (wxGetApp().get_mode() == comSimple) { - append_menu_item_add_text(menu, ModelVolumeType::MODEL_PART, false); - append_menu_item_add_text(menu, ModelVolumeType::NEGATIVE_VOLUME, false); + //append_menu_item_add_text(menu, ModelVolumeType::MODEL_PART, false); + //append_menu_item_add_text(menu, ModelVolumeType::NEGATIVE_VOLUME, false); append_menu_item(menu, wxID_ANY, _(ADD_VOLUME_MENU_ITEMS[int(ModelVolumeType::SUPPORT_ENFORCER)].first), "", [](wxCommandEvent&) { obj_list()->load_generic_subobject(L("Box"), ModelVolumeType::SUPPORT_ENFORCER); }, diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index 6de339a7f..954f61813 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -2480,6 +2480,9 @@ bool ObjectList::is_splittable(bool to_objects) return false; } + if (wxGetApp().get_mode() == comSimple) + return false; // suppress to split to parts for simple mode + ModelVolume* volume; if (!get_volume_by_item(item, volume) || !volume) return false; diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp index 0071e3450..82b5747cc 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp @@ -861,6 +861,9 @@ void GLGizmoEmboss::on_set_state() if (m_volume == nullptr) { // reopen gizmo when new object is created GLGizmoBase::m_state = GLGizmoBase::Off; + if (wxGetApp().get_mode() == comSimple) + // It's impossible to add a part in simple mode + return; // start creating new object create_volume(ModelVolumeType::MODEL_PART); } diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 79ce8e4b1..1ab23b344 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -2641,7 +2641,6 @@ std::vector Plater::priv::load_files(const std::vector& input_ } if (model.looks_like_multipart_object()) { - //wxMessageDialog msg_dlg(q, _L( MessageDialog msg_dlg(q, _L( "This file contains several objects positioned at multiple heights.\n" "Instead of considering them as multiple objects, should \n" @@ -2652,10 +2651,9 @@ std::vector Plater::priv::load_files(const std::vector& input_ } } } - else if ((wxGetApp().get_mode() == comSimple) && (type_3mf || type_any_amf) && model_has_advanced_features(model)) { - //wxMessageDialog msg_dlg(q, _L("This file cannot be loaded in a simple mode. Do you want to switch to an advanced mode?")+"\n", + if ((wxGetApp().get_mode() == comSimple) && (type_3mf || type_any_amf) && model_has_advanced_features(model)) { MessageDialog msg_dlg(q, _L("This file cannot be loaded in a simple mode. Do you want to switch to an advanced mode?")+"\n", - _L("Detected advanced data"), wxICON_WARNING | wxYES | wxNO); + _L("Detected advanced data"), wxICON_WARNING | wxYES | wxCANCEL); if (msg_dlg.ShowModal() == wxID_YES) { Slic3r::GUI::wxGetApp().save_mode(comAdvanced); view3D->set_as_dirty(); @@ -6156,7 +6154,7 @@ bool Plater::load_files(const wxArrayString& filenames, bool delete_after_load/* break; } case ProjectDropDialog::LoadType::LoadGeometry: { - Plater::TakeSnapshot snapshot(this, _L("Import Object")); +// Plater::TakeSnapshot snapshot(this, _L("Import Object")); load_files({ *it }, true, false); break; }