mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-07-30 22:32:07 +00:00
FIX: the error display when reset virtual slot
jira: none Change-Id: I5ae5899baf1bfc2aaadb832083b277855a669fd5
This commit is contained in:
@@ -13,6 +13,13 @@ namespace Slic3r { namespace GUI {
|
|||||||
|
|
||||||
wxDEFINE_EVENT(EVT_SELECTED_COLOR, wxCommandEvent);
|
wxDEFINE_EVENT(EVT_SELECTED_COLOR, wxCommandEvent);
|
||||||
|
|
||||||
|
static std::string float_to_string_with_precision(float value, int precision = 3)
|
||||||
|
{
|
||||||
|
std::stringstream stream;
|
||||||
|
stream << std::fixed << std::setprecision(precision) << value;
|
||||||
|
return stream.str();
|
||||||
|
}
|
||||||
|
|
||||||
AMSMaterialsSetting::AMSMaterialsSetting(wxWindow *parent, wxWindowID id)
|
AMSMaterialsSetting::AMSMaterialsSetting(wxWindow *parent, wxWindowID id)
|
||||||
: DPIDialog(parent, id, _L("AMS Materials Setting"), wxDefaultPosition, wxDefaultSize, wxBORDER_NONE)
|
: DPIDialog(parent, id, _L("AMS Materials Setting"), wxDefaultPosition, wxDefaultSize, wxBORDER_NONE)
|
||||||
, m_color_picker_popup(ColorPickerPopup(this))
|
, m_color_picker_popup(ColorPickerPopup(this))
|
||||||
@@ -922,8 +929,8 @@ void AMSMaterialsSetting::on_select_cali_result(wxCommandEvent &evt)
|
|||||||
{
|
{
|
||||||
m_pa_cali_select_id = evt.GetSelection();
|
m_pa_cali_select_id = evt.GetSelection();
|
||||||
if (m_pa_cali_select_id >= 0) {
|
if (m_pa_cali_select_id >= 0) {
|
||||||
m_input_k_val->GetTextCtrl()->SetValue(std::to_string(m_pa_profile_items[m_pa_cali_select_id].k_value));
|
m_input_k_val->GetTextCtrl()->SetValue(float_to_string_with_precision(m_pa_profile_items[m_pa_cali_select_id].k_value));
|
||||||
m_input_n_val->GetTextCtrl()->SetValue(std::to_string(m_pa_profile_items[m_pa_cali_select_id].n_coef));
|
m_input_n_val->GetTextCtrl()->SetValue(float_to_string_with_precision(m_pa_profile_items[m_pa_cali_select_id].n_coef));
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
m_input_k_val->GetTextCtrl()->SetValue(std::to_string(0.00));
|
m_input_k_val->GetTextCtrl()->SetValue(std::to_string(0.00));
|
||||||
@@ -1012,6 +1019,8 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)
|
|||||||
m_button_confirm->SetBorderColor(wxColour(0x90, 0x90, 0x90));
|
m_button_confirm->SetBorderColor(wxColour(0x90, 0x90, 0x90));
|
||||||
m_comboBox_cali_result->Clear();
|
m_comboBox_cali_result->Clear();
|
||||||
m_comboBox_cali_result->SetValue(wxEmptyString);
|
m_comboBox_cali_result->SetValue(wxEmptyString);
|
||||||
|
m_input_k_val->GetTextCtrl()->SetValue(wxEmptyString);
|
||||||
|
m_input_n_val->GetTextCtrl()->SetValue(wxEmptyString);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@@ -1076,8 +1085,8 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (cali_select_idx >= 0) {
|
if (cali_select_idx >= 0) {
|
||||||
m_input_k_val->GetTextCtrl()->SetValue(std::to_string(m_pa_profile_items[cali_select_idx].k_value));
|
m_input_k_val->GetTextCtrl()->SetValue(float_to_string_with_precision(m_pa_profile_items[cali_select_idx].k_value));
|
||||||
m_input_n_val->GetTextCtrl()->SetValue(std::to_string(m_pa_profile_items[cali_select_idx].n_coef));
|
m_input_n_val->GetTextCtrl()->SetValue(float_to_string_with_precision(m_pa_profile_items[cali_select_idx].n_coef));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|||||||
Reference in New Issue
Block a user