From bcfcfdf58d73fba5e055d6a445a9678ce52ac107 Mon Sep 17 00:00:00 2001 From: sunsets <845944018@qq.com> Date: Fri, 28 Jul 2023 10:07:01 +0800 Subject: [PATCH] Version1.0.4 --- resources/profiles/QIDITechnology.idx | 2 ++ resources/profiles/QIDITechnology.ini | 4 ++-- src/slic3r/GUI/MainFrame.cpp | 14 ++++++++------ version.inc | 6 +++--- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/resources/profiles/QIDITechnology.idx b/resources/profiles/QIDITechnology.idx index 8a6180e..aa3257f 100644 --- a/resources/profiles/QIDITechnology.idx +++ b/resources/profiles/QIDITechnology.idx @@ -1,3 +1,5 @@ +min_slic3r_version = 1.0.4 +1.0.4 Modify start code min_slic3r_version = 1.0.3 1.0.3 Delete filament property min_slic3r_version = 1.0.2 diff --git a/resources/profiles/QIDITechnology.ini b/resources/profiles/QIDITechnology.ini index 7defdd5..339683e 100644 --- a/resources/profiles/QIDITechnology.ini +++ b/resources/profiles/QIDITechnology.ini @@ -5,7 +5,7 @@ name = QIDI Technology # Configuration version of this file. Config file will only be installed, if the config_version differs. # This means, the server may force the PrusaSlicer configuration to be downgraded. -config_version = 1.0.3 +config_version = 1.0.4 # Where to get the updates from? config_update_url = https://github.com/QIDITECH/QIDISlicer/releases/download/QIDITechnology/ changelog_url = https://qidi3d.com/pages/software-firmware @@ -747,7 +747,7 @@ retract_restart_extra_toolchange = 0 retract_speed = 30 silent_mode = 0 single_extruder_multi_material = 0 -start_gcode = G28\nM141 S0\nG0 Z50 F600\nM190 S[first_layer_bed_temperature]\nG28 Z\nG29\nG0 X0 Y0 Z50 F6000\nM109 S[first_layer_temperature]\nM83\nG0 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0)} Z5 F6000\nG0 Z0.2 F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.04} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 2} E{2 * 0.04} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} E{85 * 0.04} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 85} E{83 * 0.04} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 2} E{2 * 0.04} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 5} E{80 * 0.04} F3000 +start_gcode = G28\nM141 S0\nG0 Z50 F600\nM190 S[first_layer_bed_temperature]\nG28 Z\nG29 ; mesh bed leveling ,comment this code to close it\nG0 X0 Y0 Z50 F6000\nM109 S[first_layer_temperature]\nM83\nG0 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0)} Z5 F6000\nG0 Z0.2 F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.04} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 2} E{2 * 0.04} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} E{85 * 0.04} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 85} E{83 * 0.04} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 2} E{2 * 0.04} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 3} E{82 * 0.04} F3000\nG0 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 12} F3000 template_custom_gcode = thumbnails = thumbnails_format = QIDI diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 9982215..6f71b1b 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -2085,13 +2085,15 @@ void MainFrame::select_tab(size_t tab/* = size_t(-1)*/) m_printer_view->load_url(url); } } - //B4 -#ifdef __APPLE__ - if (count == 0 && m_tabpanel->GetSelection() != (int) new_selection) { + // B30 + if (m_tabpanel->GetSelection() != (int) new_selection && m_tabpanel->GetSelection() < 4) m_tabpanel->SetSelection(new_selection); - count++; - } -#endif + //#ifdef __APPLE__ + // if (count == 0 && m_tabpanel->GetSelection() != (int) new_selection) { + // m_tabpanel->SetSelection(new_selection); + // count++; + // } + //#endif #ifdef _MSW_DARK_MODE if (wxGetApp().tabs_as_menu()) { diff --git a/version.inc b/version.inc index c01ddec..c28a83c 100644 --- a/version.inc +++ b/version.inc @@ -3,7 +3,7 @@ set(SLIC3R_APP_NAME "QIDISlicer") set(SLIC3R_APP_KEY "QIDISlicer") -set(SLIC3R_VERSION "1.0.3") +set(SLIC3R_VERSION "1.0.4") set(SLIC3R_BUILD_ID "QIDISlicer-${SLIC3R_VERSION}+Win64") -set(SLIC3R_RC_VERSION "1,0,3,0") -set(SLIC3R_RC_VERSION_DOTS "1.0.3.0") +set(SLIC3R_RC_VERSION "1,0,4,0") +set(SLIC3R_RC_VERSION_DOTS "1.0.4.0")