mirror of
https://github.com/QIDITECH/QIDIStudio.git
synced 2026-01-30 16:38:41 +03:00
version update
This commit is contained in:
@@ -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": [
|
||||
|
||||
@@ -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": [
|
||||
|
||||
@@ -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": [
|
||||
|
||||
@@ -6350,6 +6350,29 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
|
||||
|
||||
preset_bundle->load_config_model(filename.string(), std::move(config), file_version);
|
||||
|
||||
//y71
|
||||
std::vector<std::string> 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<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
|
||||
}
|
||||
if (!silence) wxGetApp().app_config->update_config_dir(path.parent_path().string());
|
||||
}
|
||||
|
||||
//y71
|
||||
std::vector<std::string> 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;
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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}")
|
||||
|
||||
Reference in New Issue
Block a user