FIX: Delete the cali tips
original patch 485e961e9520a77d1d25e97598f6a1648a50a976 jira: STUDIO-10945 Change-Id: I7524d2c0f74d97ea86e1516a6596b63345a36661
This commit is contained in:
parent
8b775f5c2e
commit
e6e412479f
|
@ -354,12 +354,6 @@ void AMSMaterialsSetting::create_panel_kn(wxWindow* parent)
|
||||||
m_n_param->Hide();
|
m_n_param->Hide();
|
||||||
m_input_n_val->Hide();
|
m_input_n_val->Hide();
|
||||||
|
|
||||||
// tips info
|
|
||||||
m_k_value_tips = new wxStaticText(parent, wxID_ANY, _L("Tips: When starting a print, disable dynamic flow calibration to enable custom values for this task."));
|
|
||||||
m_k_value_tips->SetForegroundColour(wxColour(50, 58, 61));
|
|
||||||
m_k_value_tips->Wrap(FromDIP(300));
|
|
||||||
m_k_value_tips->Hide();
|
|
||||||
|
|
||||||
sizer->Add(0, 0, 0, wxTOP, FromDIP(10));
|
sizer->Add(0, 0, 0, wxTOP, FromDIP(10));
|
||||||
sizer->Add(cali_title_sizer, 0, wxLEFT | wxRIGHT | wxEXPAND, FromDIP(20));
|
sizer->Add(cali_title_sizer, 0, wxLEFT | wxRIGHT | wxEXPAND, FromDIP(20));
|
||||||
sizer->Add(0, 0, 0, wxTOP, FromDIP(12));
|
sizer->Add(0, 0, 0, wxTOP, FromDIP(12));
|
||||||
|
@ -367,8 +361,6 @@ void AMSMaterialsSetting::create_panel_kn(wxWindow* parent)
|
||||||
sizer->Add(0, 0, 0, wxTOP, FromDIP(10));
|
sizer->Add(0, 0, 0, wxTOP, FromDIP(10));
|
||||||
sizer->Add(kn_val_sizer, 0, wxLEFT | wxRIGHT | wxEXPAND, FromDIP(20));
|
sizer->Add(kn_val_sizer, 0, wxLEFT | wxRIGHT | wxEXPAND, FromDIP(20));
|
||||||
sizer->Add(0, 0, 0, wxTOP, FromDIP(10));
|
sizer->Add(0, 0, 0, wxTOP, FromDIP(10));
|
||||||
sizer->Add(m_k_value_tips, 0, wxLEFT | wxRIGHT | wxEXPAND, FromDIP(20));
|
|
||||||
sizer->Add(0, 0, 0, wxTOP, FromDIP(10));
|
|
||||||
parent->SetSizer(sizer);
|
parent->SetSizer(sizer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1121,16 +1113,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) {
|
||||||
if (m_pa_cali_select_id > 0) {
|
|
||||||
m_k_value_tips->Show();
|
|
||||||
} else {
|
|
||||||
m_k_value_tips->Hide();
|
|
||||||
}
|
|
||||||
m_input_k_val->GetTextCtrl()->SetValue(float_to_string_with_precision(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(float_to_string_with_precision(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));
|
||||||
Layout();
|
|
||||||
Fit();
|
|
||||||
Refresh();
|
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
m_input_k_val->GetTextCtrl()->SetValue(std::to_string(0.00));
|
m_input_k_val->GetTextCtrl()->SetValue(std::to_string(0.00));
|
||||||
|
@ -1353,16 +1337,8 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cali_select_idx >= 0) {
|
if (cali_select_idx >= 0) {
|
||||||
if (cali_select_idx > 0) {
|
|
||||||
m_k_value_tips->Show();
|
|
||||||
} else {
|
|
||||||
m_k_value_tips->Hide();
|
|
||||||
}
|
|
||||||
m_input_k_val->GetTextCtrl()->SetValue(float_to_string_with_precision(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(float_to_string_with_precision(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));
|
||||||
Layout();
|
|
||||||
Fit();
|
|
||||||
Refresh();
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
m_input_k_val->GetTextCtrl()->SetValue(float_to_string_with_precision(m_pa_profile_items[0].k_value));
|
m_input_k_val->GetTextCtrl()->SetValue(float_to_string_with_precision(m_pa_profile_items[0].k_value));
|
||||||
|
|
|
@ -160,7 +160,6 @@ protected:
|
||||||
wxStaticText * m_title_temperature;
|
wxStaticText * m_title_temperature;
|
||||||
TextInput * m_input_nozzle_min;
|
TextInput * m_input_nozzle_min;
|
||||||
TextInput* m_input_nozzle_max;
|
TextInput* m_input_nozzle_max;
|
||||||
wxStaticText* m_k_value_tips;
|
|
||||||
ScalableBitmap * degree;
|
ScalableBitmap * degree;
|
||||||
wxStaticBitmap * bitmap_max_degree;
|
wxStaticBitmap * bitmap_max_degree;
|
||||||
wxStaticBitmap * bitmap_min_degree;
|
wxStaticBitmap * bitmap_min_degree;
|
||||||
|
|
Loading…
Reference in New Issue