FIX:fix some new ui issues

jira:[new ui]

Change-Id: I1283de641d4f2e4acfd5bef91716f9029665c465
(cherry picked from commit 65e8b4ee7e816cc313e8d7a33f06c6f1638dceef)
This commit is contained in:
tao wang
2024-10-16 11:58:25 +08:00
committed by Noisyfox
parent b6197c460b
commit 99f0e35069
2 changed files with 11 additions and 6 deletions

View File

@@ -2819,19 +2819,18 @@ void SelectMachineDialog::update_flow_cali_check(MachineObject* obj)
set_flow_calibration_state(true, show_cali_tips); set_flow_calibration_state(true, show_cali_tips);
} }
void SelectMachineDialog::update_ams_check(MachineObject* obj) void SelectMachineDialog::update_ams_check(MachineObject *obj)
{ {
if (obj && obj->has_ams()) { if (obj && obj->has_ams() && !obj->is_enable_np) {
select_use_ams->Show(); select_use_ams->Show();
if (obj->get_printer_ams_type() == "generic") { if (obj->get_printer_ams_type() == "generic") {
img_use_ams_tip->Show(); img_use_ams_tip->Show();
} } else {
else {
img_use_ams_tip->Hide(); img_use_ams_tip->Hide();
} }
} else {
select_use_ams->Hide();
} }
if (obj->is_enable_np) { m_checkbox_list["use_ams"]->SetValue(true); }
} }
void SelectMachineDialog::update_show_status() void SelectMachineDialog::update_show_status()

View File

@@ -3832,6 +3832,8 @@ void StatusPanel::on_start_unload(wxCommandEvent &event)
void StatusPanel::on_set_bed_temp() void StatusPanel::on_set_bed_temp()
{ {
if (!obj) {return;}
wxString str = m_tempCtrl_bed->GetTextCtrl()->GetValue(); wxString str = m_tempCtrl_bed->GetTextCtrl()->GetValue();
try { try {
long bed_temp; long bed_temp;
@@ -3853,6 +3855,8 @@ void StatusPanel::on_set_bed_temp()
void StatusPanel::on_set_nozzle_temp() void StatusPanel::on_set_nozzle_temp()
{ {
if (!obj) {return;}
wxString str = m_tempCtrl_nozzle->GetTextCtrl()->GetValue(); wxString str = m_tempCtrl_nozzle->GetTextCtrl()->GetValue();
wxString str_deputy; wxString str_deputy;
int nozzle_num = obj->m_extder_data.total_extder_count; int nozzle_num = obj->m_extder_data.total_extder_count;
@@ -3884,6 +3888,8 @@ void StatusPanel::on_set_nozzle_temp()
void StatusPanel::on_set_chamber_temp() void StatusPanel::on_set_chamber_temp()
{ {
if (!obj) {return;}
wxString str = m_tempCtrl_chamber->GetTextCtrl()->GetValue(); wxString str = m_tempCtrl_chamber->GetTextCtrl()->GetValue();
try { try {
long chamber_temp; long chamber_temp;