mirror of
				https://github.com/SoftFever/OrcaSlicer.git
				synced 2025-11-02 20:51:23 -07:00 
			
		
		
		
	disable misleading 3mf version warning
This commit is contained in:
		
							parent
							
								
									e823044b9a
								
							
						
					
					
						commit
						b4b9805383
					
				
					 1 changed files with 32 additions and 30 deletions
				
			
		| 
						 | 
				
			
			@ -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?
 | 
			
		||||
                            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) {
 | 
			
		||||
                            wxString text  = wxString::Format(_L("The 3mf's version %s is newer than %s's version %s, Found following keys unrecognized:"),
 | 
			
		||||
                                                             file_version.to_string(), std::string(SLIC3R_APP_FULL_NAME), app_version.to_string());
 | 
			
		||||
                            text += "\n";
 | 
			
		||||
                            bool     first = true;
 | 
			
		||||
                            // std::string context = into_u8(text);
 | 
			
		||||
                            wxString context = text;
 | 
			
		||||
                            for (auto &key : config_substitutions.unrecogized_keys) {
 | 
			
		||||
                                context += "  -";
 | 
			
		||||
                                context += key;
 | 
			
		||||
                                context += ";\n";
 | 
			
		||||
                                first = false;
 | 
			
		||||
                    } 
 | 
			
		||||
                            wxString append = _L("You'd better upgrade your software.\n");
 | 
			
		||||
                            context += "\n\n";
 | 
			
		||||
                            // context += into_u8(append);
 | 
			
		||||
                            context += append;
 | 
			
		||||
                            show_info(q, context, _L("Newer 3mf version"));
 | 
			
		||||
                        }
 | 
			
		||||
                        else {
 | 
			
		||||
                            //if the minor version is not matched
 | 
			
		||||
                            if (file_version.min() != app_version.min()) {
 | 
			
		||||
                                wxString text  = wxString::Format(_L("The 3mf's version %s is newer than %s's version %s, Suggest to upgrade your software."),
 | 
			
		||||
                                                 file_version.to_string(), std::string(SLIC3R_APP_FULL_NAME), app_version.to_string());
 | 
			
		||||
                                text += "\n";
 | 
			
		||||
                                show_info(q, text, _L("Newer 3mf version"));
 | 
			
		||||
                            }
 | 
			
		||||
                        }
 | 
			
		||||
                    } else if (!load_config) {
 | 
			
		||||
                    // else if (load_config && (file_version > app_version)) {
 | 
			
		||||
                    //     if (config_substitutions.unrecogized_keys.size() > 0) {
 | 
			
		||||
                    //         wxString text  = wxString::Format(_L("The 3mf's version %s is newer than %s's version %s, Found following keys unrecognized:"),
 | 
			
		||||
                    //                                          file_version.to_string(), std::string(SLIC3R_APP_FULL_NAME), app_version.to_string());
 | 
			
		||||
                    //         text += "\n";
 | 
			
		||||
                    //         bool     first = true;
 | 
			
		||||
                    //         // std::string context = into_u8(text);
 | 
			
		||||
                    //         wxString context = text;
 | 
			
		||||
                    //         for (auto &key : config_substitutions.unrecogized_keys) {
 | 
			
		||||
                    //             context += "  -";
 | 
			
		||||
                    //             context += key;
 | 
			
		||||
                    //             context += ";\n";
 | 
			
		||||
                    //             first = false;
 | 
			
		||||
                    //         }
 | 
			
		||||
                    //         wxString append = _L("You'd better upgrade your software.\n");
 | 
			
		||||
                    //         context += "\n\n";
 | 
			
		||||
                    //         // context += into_u8(append);
 | 
			
		||||
                    //         context += append;
 | 
			
		||||
                    //         show_info(q, context, _L("Newer 3mf version"));
 | 
			
		||||
                    //     }
 | 
			
		||||
                    //     else {
 | 
			
		||||
                    //         //if the minor version is not matched
 | 
			
		||||
                    //         if (file_version.min() != app_version.min()) {
 | 
			
		||||
                    //             wxString text  = wxString::Format(_L("The 3mf's version %s is newer than %s's version %s, Suggest to upgrade your software."),
 | 
			
		||||
                    //                              file_version.to_string(), std::string(SLIC3R_APP_FULL_NAME), app_version.to_string());
 | 
			
		||||
                    //             text += "\n";
 | 
			
		||||
                    //             show_info(q, text, _L("Newer 3mf version"));
 | 
			
		||||
                    //         }
 | 
			
		||||
                    //     }
 | 
			
		||||
                    // } 
 | 
			
		||||
                    else if (!load_config) {
 | 
			
		||||
                        // reset config except color
 | 
			
		||||
                        for (ModelObject *model_object : model.objects) {
 | 
			
		||||
                            bool has_extruder = model_object->config.has("extruder");
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue