mirror of
https://github.com/QIDITECH/QIDISlicer.git
synced 2026-01-30 23:48:44 +03:00
Fix bug of calibration and other bugs
This commit is contained in:
@@ -296,14 +296,20 @@
|
||||
|
||||
<div class="IntroduceBoard" board="X-MAX 3">
|
||||
<div class="AutozoomImage"><img src="img/X-MAX3Poster.png"/></div>
|
||||
<div class="IntroduceTextBold trans" tid="l0"></div>
|
||||
<div class="IntroduceText">https://qidi3d.com/products/qidi-x-max-3</div>
|
||||
</div>
|
||||
|
||||
<div class="IntroduceBoard" board="X-Plus 3">
|
||||
<div class="AutozoomImage"><img src="img/X-Plus3Poster.png"/></div>
|
||||
<div class="IntroduceTextBold trans" tid="l0"></div>
|
||||
<div class="IntroduceText">https://qidi3d.com/products/qidi-x-plus-3</div>
|
||||
</div>
|
||||
|
||||
<div class="IntroduceBoard" board="X-smart 3">
|
||||
<div class="AutozoomImage"><img src="img/X-smart3Poster.png"/></div>
|
||||
<div class="IntroduceTextBold trans" tid="l0"></div>
|
||||
<div class="IntroduceText">https://qidi3d.com/products/qidi-x-smart-3</div>
|
||||
</div>
|
||||
|
||||
<div class="IntroduceBoard" board="Filaments">
|
||||
@@ -507,6 +513,8 @@
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="IntroduceTextBold trans" tid="l0"></div>
|
||||
<div class="IntroduceText">https://qidi3d.com/collections/filaments</div>
|
||||
</div>
|
||||
|
||||
<div class="IssueBoard" board="IssueReport">
|
||||
|
||||
@@ -320,10 +320,13 @@ void GLGizmoEmboss::create_volume(ModelVolumeType volume_type, const Vec2d &mous
|
||||
m_raycast_manager.actualize(*obj, &cond, &meshes);
|
||||
std::optional<RaycastManager::Hit> 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;
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
#include <wx/dcgraph.h>
|
||||
#include "MainFrame.hpp"
|
||||
#include <string>
|
||||
#include <sstream>
|
||||
#include <iomanip>
|
||||
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);
|
||||
|
||||
Reference in New Issue
Block a user