3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-04 04:24:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Show dialog when opening 3mf files to choose whether to import settings. (#4110)

Browse source 
* Show dialog when opening 3mf files to choose whether to import settings.

* Merge branch 'main' into main
This commit is contained in:
markleaf131313 2024-02-18 09:54:43 -05:00 • committed by GitHub
parent 1f835e01fc
commit 8ce07d3e8e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/Plater.cpp
View file

@ -10136,7 +10136,7 @@ bool Plater::open_3mf_file(const fs::path &file_path)
} }
LoadType load_type = LoadType::Unknown; LoadType load_type = LoadType::Unknown;
if (!model().objects.empty()) {
bool show_drop_project_dialog = true; bool show_drop_project_dialog = true;
if (show_drop_project_dialog) { if (show_drop_project_dialog) {
ProjectDropDialog dlg(filename); ProjectDropDialog dlg(filename);
@ -10151,8 +10151,6 @@ bool Plater::open_3mf_file(const fs::path &file_path)
} else } else
load_type = static_cast<LoadType>( load_type = static_cast<LoadType>(
std::clamp(std::stoi(wxGetApp().app_config->get("import_project_action")), static_cast<int>(LoadType::OpenProject), static_cast<int>(LoadType::LoadConfig))); std::clamp(std::stoi(wxGetApp().app_config->get("import_project_action")), static_cast<int>(LoadType::OpenProject), static_cast<int>(LoadType::LoadConfig)));
} else
load_type = LoadType::OpenProject;
if (load_type == LoadType::Unknown) return false; if (load_type == LoadType::Unknown) return false;