FIX: pa calibration default save value issue
should not use last input value as default saving value Jira: STUDIO-3648 Change-Id: I8ea5bac66ef723c668c09ffb40b141a489e7d637
This commit is contained in:
parent
3c691ac086
commit
7b67686528
|
@ -593,6 +593,8 @@ bool CaliPASaveManualPanel::Show(bool show) {
|
||||||
if (!m_obj->selected_cali_preset.empty()) {
|
if (!m_obj->selected_cali_preset.empty()) {
|
||||||
wxString default_name = get_default_name(m_obj->selected_cali_preset[0].name, CalibMode::Calib_PA_Line);
|
wxString default_name = get_default_name(m_obj->selected_cali_preset[0].name, CalibMode::Calib_PA_Line);
|
||||||
set_default_name(default_name);
|
set_default_name(default_name);
|
||||||
|
m_k_val->GetTextCtrl()->SetLabel("");
|
||||||
|
m_n_val->GetTextCtrl()->SetLabel("");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -703,6 +705,14 @@ bool CaliPASaveP1PPanel::get_result(float* out_k, float* out_n){
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool CaliPASaveP1PPanel::Show(bool show) {
|
||||||
|
if (show) {
|
||||||
|
m_k_val->GetTextCtrl()->SetLabel("");
|
||||||
|
m_n_val->GetTextCtrl()->SetLabel("");
|
||||||
|
}
|
||||||
|
return wxPanel::Show(show);
|
||||||
|
}
|
||||||
|
|
||||||
CaliSavePresetValuePanel::CaliSavePresetValuePanel(
|
CaliSavePresetValuePanel::CaliSavePresetValuePanel(
|
||||||
wxWindow *parent,
|
wxWindow *parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
|
|
|
@ -155,6 +155,8 @@ public:
|
||||||
|
|
||||||
bool get_result(float* out_k, float* out_n);
|
bool get_result(float* out_k, float* out_n);
|
||||||
|
|
||||||
|
virtual bool Show(bool show = true) override;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
wxBoxSizer* m_top_sizer;
|
wxBoxSizer* m_top_sizer;
|
||||||
Label * m_complete_text;
|
Label * m_complete_text;
|
||||||
|
|
Loading…
Reference in New Issue