From d8620a4d4d06e6f15e432afe01f8d748515818ab Mon Sep 17 00:00:00 2001 From: QIDI TECH <893239786@qq.com> Date: Sun, 28 Sep 2025 17:53:59 +0800 Subject: [PATCH] version update --- resources/profiles/Q Series.json | 2 +- resources/profiles/X 3 Series.json | 2 +- resources/profiles/X 4 Series.json | 2 +- src/slic3r/GUI/Plater.cpp | 47 ++++++++++++++-------------- src/slic3r/Utils/qidi_networking.hpp | 2 +- version.inc | 2 +- 6 files changed, 28 insertions(+), 29 deletions(-) diff --git a/resources/profiles/Q Series.json b/resources/profiles/Q Series.json index cd44d2d..61d7f61 100644 --- a/resources/profiles/Q Series.json +++ b/resources/profiles/Q Series.json @@ -1,6 +1,6 @@ { "name": "Q Series", - "version": "02.02.01.60", + "version": "02.02.01.62", "force_update": "0", "description": "Q Series configurations", "machine_model_list": [ diff --git a/resources/profiles/X 3 Series.json b/resources/profiles/X 3 Series.json index 98332a3..4a86d3d 100644 --- a/resources/profiles/X 3 Series.json +++ b/resources/profiles/X 3 Series.json @@ -1,6 +1,6 @@ { "name": "X-3-Series", - "version": "02.02.01.60", + "version": "02.02.01.62", "force_update": "0", "description": "X-3-Series configurations", "machine_model_list": [ diff --git a/resources/profiles/X 4 Series.json b/resources/profiles/X 4 Series.json index e2bbe42..7760a8b 100644 --- a/resources/profiles/X 4 Series.json +++ b/resources/profiles/X 4 Series.json @@ -1,6 +1,6 @@ { "name": "X-4-Series", - "version": "02.02.01.60", + "version": "02.02.01.62", "force_update": "0", "description": "X-4-Series configurations", "machine_model_list": [ diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 46def90..12f241f 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -6350,6 +6350,29 @@ std::vector Plater::priv::load_files(const std::vector& input_ preset_bundle->load_config_model(filename.string(), std::move(config), file_version); + //y71 + std::vector qdt_nozzle_sizes = { "0.2 nozzle", "0.4 nozzle", "0.6 nozzle", "0.8 nozzle" }; + std::string current_preset_name = wxGetApp().preset_bundle->printers.get_edited_preset().name; + std::string old_preset_nozzle_size, new_preset_nozzle_size; + for (std::string qdt_nozzle : qdt_nozzle_sizes) { + if (old_preset_name.find(qdt_nozzle) != std::string::npos) + old_preset_nozzle_size = qdt_nozzle; + if (current_preset_name.find(qdt_nozzle) != std::string::npos) + new_preset_nozzle_size = qdt_nozzle; + } + + if (old_preset_nozzle_size != new_preset_nozzle_size) { + size_t nozzle_pos = old_preset_name.find(old_preset_nozzle_size); + size_t nozzle_len = old_preset_nozzle_size.size(); + old_preset_name.replace(nozzle_pos, nozzle_len, new_preset_nozzle_size); + } + if (en_3mf_file_type != En3mfType::From_QDS) { + if(has_different_settings_to_system) + wxGetApp().get_tab(Preset::TYPE_PRINT)->cache_config_diff(qdt_different_keys); + wxGetApp().get_tab(Preset::TYPE_PRINTER)->select_preset(old_preset_name); + q->on_config_change(wxGetApp().preset_bundle->full_config()); + } + ConfigOption* bed_type_opt = preset_bundle->project_config.option("curr_bed_type"); if (bed_type_opt != nullptr) { BedType bed_type = (BedType)bed_type_opt->getInt(); @@ -6479,30 +6502,6 @@ std::vector Plater::priv::load_files(const std::vector& input_ } if (!silence) wxGetApp().app_config->update_config_dir(path.parent_path().string()); } - - //y71 - std::vector qdt_nozzle_sizes = { "0.2 nozzle", "0.4 nozzle", "0.6 nozzle", "0.8 nozzle" }; - std::string current_preset_name = wxGetApp().preset_bundle->printers.get_edited_preset().name; - std::string old_preset_nozzle_size, new_preset_nozzle_size; - for (std::string qdt_nozzle : qdt_nozzle_sizes) { - if (old_preset_name.find(qdt_nozzle) != std::string::npos) - old_preset_nozzle_size = qdt_nozzle; - if (current_preset_name.find(qdt_nozzle) != std::string::npos) - new_preset_nozzle_size = qdt_nozzle; - } - - if (old_preset_nozzle_size != new_preset_nozzle_size) { - size_t nozzle_pos = old_preset_name.find(old_preset_nozzle_size); - size_t nozzle_len = old_preset_nozzle_size.size(); - old_preset_name.replace(nozzle_pos, nozzle_len, new_preset_nozzle_size); - } - if (en_3mf_file_type != En3mfType::From_QDS) { - if(has_different_settings_to_system) - wxGetApp().get_tab(Preset::TYPE_PRINT)->cache_config_diff(qdt_different_keys); - wxGetApp().get_tab(Preset::TYPE_PRINTER)->select_preset(old_preset_name); - q->on_config_change(wxGetApp().preset_bundle->full_config()); - } - } else { // QDS: add plate data related logic PlateDataPtrs plate_data; diff --git a/src/slic3r/Utils/qidi_networking.hpp b/src/slic3r/Utils/qidi_networking.hpp index 41b3129..0fe266c 100644 --- a/src/slic3r/Utils/qidi_networking.hpp +++ b/src/slic3r/Utils/qidi_networking.hpp @@ -97,7 +97,7 @@ namespace QDT { #define QIDI_NETWORK_LIBRARY "qidi_networking" #define QIDI_NETWORK_AGENT_NAME "qidi_network_agent" -#define QIDI_NETWORK_AGENT_VERSION "02.02.01.51" +#define QIDI_NETWORK_AGENT_VERSION "02.02.01.62" //iot preset type strings #define IOT_PRINTER_TYPE_STRING "printer" diff --git a/version.inc b/version.inc index d72f5e6..4dcc365 100644 --- a/version.inc +++ b/version.inc @@ -13,7 +13,7 @@ endif() # The build_version should start from 50 in master branch -set(SLIC3R_VERSION "02.02.01.60") +set(SLIC3R_VERSION "02.02.01.62") string(REPLACE "." "," SLIC3R_COMMA_SEPARATED_VERSION ${SLIC3R_VERSION}) set(SLIC3R_COMMA_SEPARATED_VERSION "${SLIC3R_COMMA_SEPARATED_VERSION}")