3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-11-02 20:51:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

disable misleading 3mf version warning

Browse source
This commit is contained in:
SoftFever 2023-12-02 01:27:09 +08:00
parent e823044b9a
commit b4b9805383
1 changed files with 32 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3174,36 +3174,38 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
// Is there any modifier or advanced config data? // Is there any modifier or advanced config data?
for (ModelVolume *model_volume : model_object->volumes) model_volume->config.reset(); for (ModelVolume *model_volume : model_object->volumes) model_volume->config.reset();
} }
} else if (load_config && (file_version > app_version)) { }
if (config_substitutions.unrecogized_keys.size() > 0) { // else if (load_config && (file_version > app_version)) {
wxString text = wxString::Format(_L("The 3mf's version %s is newer than %s's version %s, Found following keys unrecognized:"), // if (config_substitutions.unrecogized_keys.size() > 0) {
file_version.to_string(), std::string(SLIC3R_APP_FULL_NAME), app_version.to_string()); // wxString text = wxString::Format(_L("The 3mf's version %s is newer than %s's version %s, Found following keys unrecognized:"),
text += "\n"; // file_version.to_string(), std::string(SLIC3R_APP_FULL_NAME), app_version.to_string());
bool first = true; // text += "\n";
// std::string context = into_u8(text); // bool first = true;
wxString context = text; // // std::string context = into_u8(text);
for (auto &key : config_substitutions.unrecogized_keys) { // wxString context = text;
context += " -"; // for (auto &key : config_substitutions.unrecogized_keys) {
context += key; // context += " -";
context += ";\n"; // context += key;
first = false; // context += ";\n";
} // first = false;
wxString append = _L("You'd better upgrade your software.\n"); // }
context += "\n\n"; // wxString append = _L("You'd better upgrade your software.\n");
// context += into_u8(append); // context += "\n\n";
context += append; // // context += into_u8(append);
show_info(q, context, _L("Newer 3mf version")); // context += append;
} // show_info(q, context, _L("Newer 3mf version"));
else { // }
//if the minor version is not matched // else {
if (file_version.min() != app_version.min()) { // //if the minor version is not matched
wxString text = wxString::Format(_L("The 3mf's version %s is newer than %s's version %s, Suggest to upgrade your software."), // if (file_version.min() != app_version.min()) {
file_version.to_string(), std::string(SLIC3R_APP_FULL_NAME), app_version.to_string()); // wxString text = wxString::Format(_L("The 3mf's version %s is newer than %s's version %s, Suggest to upgrade your software."),
text += "\n"; // file_version.to_string(), std::string(SLIC3R_APP_FULL_NAME), app_version.to_string());
show_info(q, text, _L("Newer 3mf version")); // text += "\n";
} // show_info(q, text, _L("Newer 3mf version"));
} // }
} else if (!load_config) { // }
// }
else if (!load_config) {
// reset config except color // reset config except color
for (ModelObject *model_object : model.objects) { for (ModelObject *model_object : model.objects) {
bool has_extruder = model_object->config.has("extruder"); bool has_extruder = model_object->config.has("extruder");