From 781b457035c6681aaa85550c81dbe8d412bebb4b Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Tue, 30 Nov 2021 09:41:43 +0100 Subject: [PATCH] Tech ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED set as default --- src/libslic3r/Format/3mf.cpp | 6 ------ src/libslic3r/Model.cpp | 8 +------- src/libslic3r/Technologies.hpp | 11 ----------- src/slic3r/GUI/GLCanvas3D.cpp | 9 --------- src/slic3r/GUI/MainFrame.cpp | 11 ----------- src/slic3r/GUI/Plater.cpp | 5 ----- 6 files changed, 1 insertion(+), 49 deletions(-) diff --git a/src/libslic3r/Format/3mf.cpp b/src/libslic3r/Format/3mf.cpp index 3271e2c384..0e44cc14ea 100644 --- a/src/libslic3r/Format/3mf.cpp +++ b/src/libslic3r/Format/3mf.cpp @@ -2710,16 +2710,10 @@ namespace Slic3r { bool _3MF_Exporter::_add_build_to_model_stream(std::stringstream& stream, const BuildItemsList& build_items) { -#if ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED // This happens for empty projects -#endif // ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED if (build_items.size() == 0) { add_error("No build item found"); -#if ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED return true; -#else - return false; -#endif // ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED } stream << " <" << BUILD_TAG << ">\n"; diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp index b900a62984..efc66f4781 100644 --- a/src/libslic3r/Model.cpp +++ b/src/libslic3r/Model.cpp @@ -160,13 +160,7 @@ Model Model::read_from_archive(const std::string& input_file, DynamicPrintConfig if (!result) throw Slic3r::RuntimeError("Loading of a model file failed."); -#if !ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED - if (model.objects.empty()) - throw Slic3r::RuntimeError("The supplied file couldn't be read because it's empty"); -#endif // !ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED - - for (ModelObject *o : model.objects) - { + for (ModelObject *o : model.objects) { // if (boost::algorithm::iends_with(input_file, ".zip.amf")) // { // // we remove the .zip part of the extension to avoid it be added to filenames when exporting diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp index 9ba98dab10..487958a455 100644 --- a/src/libslic3r/Technologies.hpp +++ b/src/libslic3r/Technologies.hpp @@ -36,17 +36,6 @@ #define ENABLE_FIXED_SCREEN_SIZE_POINT_MARKERS 1 -//==================== -// 2.4.0.alpha1 techs -//==================== -#define ENABLE_2_4_0_ALPHA1 1 - -// Enable implementation of retract acceleration in gcode processor -#define ENABLE_RETRACT_ACCELERATION (1 && ENABLE_2_4_0_ALPHA1) -// Enable save and save as commands to be enabled also when the plater is empty and allow to load empty projects -#define ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED (1 && ENABLE_2_4_0_ALPHA1) - - //==================== // 2.4.0.alpha2 techs //==================== diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index f660a3c332..bcb8501d80 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -4130,24 +4130,15 @@ void GLCanvas3D::_render_thumbnail_internal(ThumbnailData& thumbnail_data, const } } -#if !ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED - if (visible_volumes.empty()) - return; -#endif // !ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED - BoundingBoxf3 volumes_box; -#if ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED if (!visible_volumes.empty()) { -#endif // ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED for (const GLVolume* vol : visible_volumes) { volumes_box.merge(vol->transformed_bounding_box()); } -#if ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED } else // This happens for empty projects volumes_box = m_bed.extended_bounding_box(); -#endif // ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED Camera camera; camera.set_type(camera_type); diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index bfb2537813..18aeeec34e 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -831,26 +831,15 @@ bool MainFrame::can_start_new_project() const bool MainFrame::can_save() const { -#if ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED return (m_plater != nullptr) && !m_plater->canvas3D()->get_gizmos_manager().is_in_editing_mode(false) && m_plater->is_project_dirty(); -#else - return (m_plater != nullptr) && !m_plater->model().objects.empty() && - !m_plater->canvas3D()->get_gizmos_manager().is_in_editing_mode(false) && - !m_plater->get_project_filename().empty() && m_plater->is_project_dirty(); -#endif // ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED } bool MainFrame::can_save_as() const { -#if ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED return (m_plater != nullptr) && !m_plater->canvas3D()->get_gizmos_manager().is_in_editing_mode(false); -#else - return (m_plater != nullptr) && !m_plater->model().objects.empty() && - !m_plater->canvas3D()->get_gizmos_manager().is_in_editing_mode(false); -#endif // ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED } void MainFrame::save_project() diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 628aaa4d22..622705f40c 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -5918,16 +5918,11 @@ void Plater::export_amf() bool Plater::export_3mf(const boost::filesystem::path& output_path) { -#if ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED if (p->model.objects.empty()) { MessageDialog dialog(nullptr, _L("The plater is empty.\nDo you want to save the project?"), _L("Save project"), wxYES_NO); if (dialog.ShowModal() != wxID_YES) return false; } -#else - if (p->model.objects.empty()) - return false; -#endif // ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED wxString path; bool export_config = true;