mirror of
https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git
synced 2025-08-11 18:19:04 +08:00
FIX:fixed the issue of incorrect display of calibration information
jira:[STUDIO-11515] Change-Id: I4cd62b06ead3fc43917cee7fbc68b2575a0d8133
This commit is contained in:
parent
6c2725a78e
commit
6d1b7b8d80
@ -1538,8 +1538,6 @@ bool MachineObject::is_in_calibration()
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
||||
bool MachineObject::is_calibration_done()
|
||||
{
|
||||
return calibration_done;
|
||||
@ -5546,6 +5544,10 @@ void MachineObject::set_modeltask(BBLModelTask* task)
|
||||
model_task = task;
|
||||
}
|
||||
|
||||
void MachineObject::set_slice_info(BBLSliceInfo *info) {
|
||||
slice_info = info;
|
||||
}
|
||||
|
||||
void MachineObject::update_model_task()
|
||||
{
|
||||
if (request_model_result > 10) return;
|
||||
|
@ -1301,6 +1301,7 @@ public:
|
||||
BBLSubTask* get_subtask();
|
||||
BBLModelTask* get_modeltask();
|
||||
void set_modeltask(BBLModelTask* task);
|
||||
void set_slice_info(BBLSliceInfo *info);
|
||||
void update_model_task();
|
||||
void update_slice_info(std::string project_id, std::string profile_id, std::string subtask_id, int plate_idx);
|
||||
|
||||
|
@ -3668,8 +3668,7 @@ void StatusPanel::update_subtask(MachineObject *obj)
|
||||
|
||||
update_model_info();
|
||||
|
||||
if (obj->is_system_printing()
|
||||
|| obj->is_in_calibration()) {
|
||||
if (obj->is_system_printing() || obj->is_in_calibration()) {
|
||||
reset_printing_values();
|
||||
} else if (obj->is_in_printing() || obj->print_status == "FINISH") {
|
||||
|
||||
@ -3809,6 +3808,7 @@ void StatusPanel::update_cloud_subtask(MachineObject *obj)
|
||||
|
||||
if (is_task_changed(obj)) {
|
||||
obj->set_modeltask(nullptr);
|
||||
obj->set_slice_info(nullptr);
|
||||
reset_printing_values();
|
||||
BOOST_LOG_TRIVIAL(info) << "monitor: change to sub task id = " << obj->subtask_->task_id;
|
||||
if (web_request.IsOk() && web_request.GetState() == wxWebRequest::State_Active) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user