From b651cee316c1db9a9875398636531a00cc89a773 Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Sat, 8 Feb 2025 12:10:20 +0800 Subject: [PATCH] ENH:Import 3mf into existing projects and remember previous selection jira: none Change-Id: I799c3aa240d614fc4ff7bf8ff02a9879d1a4b459 --- src/libslic3r/AppConfig.cpp | 3 ++- src/slic3r/GUI/Plater.cpp | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp index 50920a54c..7bb2cfe87 100644 --- a/src/libslic3r/AppConfig.cpp +++ b/src/libslic3r/AppConfig.cpp @@ -131,7 +131,8 @@ void AppConfig::set_defaults() if (get("single_instance").empty()) set_bool("single_instance", false); - + if (get("import_3mf_as_project").empty()) + set_bool("import_3mf_as_project", true); #ifdef SUPPORT_REMEMBER_OUTPUT_PATH if (get("remember_output_path").empty()) set_bool("remember_output_path", true); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 8dba83494..361c25ea6 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -12101,7 +12101,7 @@ ProjectDropDialog::ProjectDropDialog(const std::string &filename) m_sizer_select_v->Add(select_f, 0, wxEXPAND, 5); m_sizer_select_v->Add(select_s, 0, wxEXPAND, 5); //m_sizer_select_v->Add(select_t, 0, wxEXPAND, 5); - select_radio(2); + select_radio(wxGetApp().app_config->get_bool("import_3mf_as_project") ? 1 : 2); m_sizer_select_h->Add(m_sizer_select_v, 0, wxALIGN_CENTER | wxLEFT, 22); @@ -12284,6 +12284,11 @@ void ProjectDropDialog::on_select_radio(wxMouseEvent &event) if (rs->m_groupid == groupid && rs->m_radiobox->GetId() == event.GetId()) { set_action(rs->m_select_id); rs->m_radiobox->SetValue(true); + if (rs->m_select_id == 1) { + wxGetApp().app_config->set_bool("import_3mf_as_project", true); + } else { + wxGetApp().app_config->set_bool("import_3mf_as_project", false); + } }