From edb08f521d5f672950aaf5266642dc6a93db67d6 Mon Sep 17 00:00:00 2001
From: QIDI TECH <893239786@qq.com>
Date: Thu, 9 Nov 2023 10:56:33 +0800
Subject: [PATCH] Fix bug of calibration and other bugs
---
resources/web/guide/index.html | 8 ++++++++
src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp | 7 +++++--
src/slic3r/GUI/Tab.cpp | 6 ++++++
src/slic3r/GUI/calib_dlg.cpp | 11 ++++-------
4 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/resources/web/guide/index.html b/resources/web/guide/index.html
index e547232..5b55a55 100644
--- a/resources/web/guide/index.html
+++ b/resources/web/guide/index.html
@@ -296,14 +296,20 @@
+
+
https://qidi3d.com/products/qidi-x-max-3
+
+
https://qidi3d.com/products/qidi-x-plus-3
+
+
https://qidi3d.com/products/qidi-x-smart-3
@@ -507,6 +513,8 @@
+
+ https://qidi3d.com/collections/filaments
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
index 3a1ae91..beecd80 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
@@ -320,10 +320,13 @@ void GLGizmoEmboss::create_volume(ModelVolumeType volume_type, const Vec2d &mous
m_raycast_manager.actualize(*obj, &cond, &meshes);
std::optional hit = ray_from_camera(m_raycast_manager, coor, camera, &cond);
- Transform3d surface_trmat = create_transformation_onto_surface(Vec3d(mouse_pos.x(), mouse_pos.y(), 0.2),
+ DynamicPrintConfig *print_config = &wxGetApp().preset_bundle->prints.get_edited_preset().config;
+ double pa_first_layer_height = print_config->get_abs_value("first_layer_height");
+ double pa_layer_height = print_config->get_abs_value("layer_height");
+ Transform3d surface_trmat = create_transformation_onto_surface(Vec3d(mouse_pos.x(), mouse_pos.y(), pa_first_layer_height),
hit->normal,
priv::up_limit);
- emboss_data.text_configuration.style.prop.emboss = 0.2;
+ emboss_data.text_configuration.style.prop.emboss = pa_layer_height;
emboss_data.text_configuration.style.prop.size_in_mm = 7;
const FontProp &font_prop = emboss_data.text_configuration.style.prop;
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index 2391e11..ffce630 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -2283,6 +2283,12 @@ void TabFilament::toggle_options()
bool chamber_fan = printer_config->opt_bool("chamber_fan");
toggle_option("enable_volume_fan", chamber_fan);
+
+ int auxiliary_fan_speed = m_config->opt_int("enable_auxiliary_fan", 0);
+ if (auxiliary_fan_speed == 0)
+ toggle_option("disable_rapid_cooling_fan_first_layers", false);
+ else
+ toggle_option("disable_rapid_cooling_fan_first_layers", true);
}
}
diff --git a/src/slic3r/GUI/calib_dlg.cpp b/src/slic3r/GUI/calib_dlg.cpp
index c70bdc2..fbd4ad7 100644
--- a/src/slic3r/GUI/calib_dlg.cpp
+++ b/src/slic3r/GUI/calib_dlg.cpp
@@ -5,7 +5,6 @@
#include
#include "MainFrame.hpp"
#include
-#include
#include
namespace Slic3r {
namespace GUI {
@@ -31,9 +30,7 @@ FRF_Calibration_Dlg::FRF_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plater
// extru
auto filament_config = &wxGetApp().preset_bundle->filaments.get_edited_preset().config;
auto read_extrusion_multiplier = filament_config->opt_float("extrusion_multiplier", 0);
- std::stringstream ss;
- ss << read_extrusion_multiplier;
- m_tc_extrusion_multiplier = new wxTextCtrl(this, wxID_ANY, ss.str(), wxDefaultPosition, wxSize(100, -1), wxBORDER_SIMPLE);
+ m_tc_extrusion_multiplier = new wxTextCtrl(this, wxID_ANY, wxString::FromDouble(read_extrusion_multiplier), wxDefaultPosition, wxSize(100, -1), wxBORDER_SIMPLE);
m_tc_extrusion_multiplier->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
settings_sizer->Add(m_tc_extrusion_multiplier, 0, wxRIGHT | wxALIGN_RIGHT, 0);
@@ -104,7 +101,7 @@ PA_Calibration_Dlg::PA_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plater*
auto start_pa_text = new wxStaticText(this, wxID_ANY, _L("Start PA: "), wxDefaultPosition, wxSize(80, -1), wxALIGN_LEFT);
start_PA_sizer->Add(start_pa_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
- m_tcStartPA = new wxTextCtrl(this, wxID_ANY, "0", wxDefaultPosition, wxSize(100, -1), wxBORDER_SIMPLE);
+ m_tcStartPA = new wxTextCtrl(this, wxID_ANY, wxString::FromDouble(0.0), wxDefaultPosition, wxSize(100, -1), wxBORDER_SIMPLE);
m_tcStartPA->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
start_PA_sizer->Add(m_tcStartPA, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
settings_sizer->Add(start_PA_sizer);
@@ -114,7 +111,7 @@ PA_Calibration_Dlg::PA_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plater*
auto end_pa_text = new wxStaticText(this, wxID_ANY, _L("End PA: "), wxDefaultPosition, wxSize(80, -1), wxALIGN_LEFT);
end_PA_sizer->Add(end_pa_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
- m_tcEndPA = new wxTextCtrl(this, wxID_ANY, "0.04", wxDefaultPosition, wxSize(100, -1), wxBORDER_SIMPLE);
+ m_tcEndPA = new wxTextCtrl(this, wxID_ANY, wxString::FromDouble(0.04), wxDefaultPosition, wxSize(100, -1), wxBORDER_SIMPLE);
m_tcStartPA->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
end_PA_sizer->Add(m_tcEndPA, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
settings_sizer->Add(end_PA_sizer);
@@ -124,7 +121,7 @@ PA_Calibration_Dlg::PA_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plater*
auto PA_step_text = new wxStaticText(this, wxID_ANY, _L("PA step: "), wxDefaultPosition, wxSize(80, -1), wxALIGN_LEFT);
PA_step_sizer->Add(PA_step_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
- m_tcPAStep = new wxTextCtrl(this, wxID_ANY, "0.002", wxDefaultPosition, wxSize(100, -1), wxBORDER_SIMPLE);
+ m_tcPAStep = new wxTextCtrl(this, wxID_ANY, wxString::FromDouble(0.002), wxDefaultPosition, wxSize(100, -1), wxBORDER_SIMPLE);
m_tcStartPA->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
PA_step_sizer->Add(m_tcPAStep, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
settings_sizer->Add(PA_step_sizer);
