FIX: [STUDIO-3515] Resolution information disappears
Change-Id: I24de7c63746cd92980a11ce88d8393e6ffcb18b5
This commit is contained in:
parent
a21df32225
commit
dc8bdb04bb
|
@ -297,12 +297,21 @@ void CameraPopup::check_func_supported(MachineObject *obj2)
|
|||
auto curr_res = to_resolution_msg_string(CameraResolution(i));
|
||||
std::vector <std::string> ::iterator it = std::find(resolution_supported.begin(), resolution_supported.end(), curr_res);
|
||||
if ((it == resolution_supported.end())||(support_count <= 1) || !obj->is_support_1080dpi)
|
||||
m_resolution_options[i] -> Hide();
|
||||
m_resolution_options[i]->Hide();
|
||||
else {
|
||||
m_resolution_options[i]->Show();
|
||||
if (m_obj->camera_resolution == curr_res) {
|
||||
resolution_rbtns[i]->SetValue(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
//hide resolution if there is only one choice
|
||||
if (support_count <= 1 || !obj->is_support_1080dpi) {
|
||||
m_text_resolution->Hide();
|
||||
}
|
||||
else {
|
||||
m_text_resolution->Show();
|
||||
}
|
||||
}
|
||||
|
||||
void CameraPopup::update(bool vcamera_streaming)
|
||||
|
|
|
@ -2336,7 +2336,7 @@ void MachineObject::reset()
|
|||
camera_recording = false;
|
||||
camera_recording_when_printing = false;
|
||||
camera_timelapse = false;
|
||||
camera_resolution = "";
|
||||
//camera_resolution = "";
|
||||
printing_speed_mag = 100;
|
||||
gcode_file_prepare_percent = 0;
|
||||
iot_print_status = "";
|
||||
|
|
Loading…
Reference in New Issue