juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 20:03:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX:fixed the issue of incorrect display of calibration information

Browse Source 
jira:[STUDIO-11515]

Change-Id: I4cd62b06ead3fc43917cee7fbc68b2575a0d8133
(cherry picked from commit 6d1b7b8d806530c80e72f266c733e0207e7ac27a)
This commit is contained in:
tao wang
2025-04-15 12:53:36 +08:00
committed by Noisyfox
parent 49559a6946
commit 3f46b18032
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/DeviceManager.cpp
View File

@@ -1529,8 +1529,6 @@ bool MachineObject::is_in_calibration()
return false; return false;
} }
bool MachineObject::is_calibration_done() bool MachineObject::is_calibration_done()
{ {
return calibration_done; return calibration_done;
@@ -5438,6 +5436,10 @@ void MachineObject::set_modeltask(BBLModelTask* task)
model_task = task; model_task = task;
} }
void MachineObject::set_slice_info(BBLSliceInfo *info) {
slice_info = info;
}
void MachineObject::update_model_task() void MachineObject::update_model_task()
{ {
if (request_model_result > 10) return; if (request_model_result > 10) return;

1
src/slic3r/GUI/DeviceManager.hpp
View File

@@ -1301,6 +1301,7 @@ public:
BBLSubTask* get_subtask(); BBLSubTask* get_subtask();
BBLModelTask* get_modeltask(); BBLModelTask* get_modeltask();
void set_modeltask(BBLModelTask* task); void set_modeltask(BBLModelTask* task);
void set_slice_info(BBLSliceInfo *info);
void update_model_task(); void update_model_task();
void update_slice_info(std::string project_id, std::string profile_id, std::string subtask_id, int plate_idx); void update_slice_info(std::string project_id, std::string profile_id, std::string subtask_id, int plate_idx);

4
src/slic3r/GUI/StatusPanel.cpp
View File

@@ -3695,8 +3695,7 @@ void StatusPanel::update_subtask(MachineObject *obj)
update_model_info(); update_model_info();
if (obj->is_system_printing() if (obj->is_system_printing() || obj->is_in_calibration()) {
|| obj->is_in_calibration()) {
reset_printing_values(); reset_printing_values();
} else if (obj->is_in_printing() || obj->print_status == "FINISH") { } else if (obj->is_in_printing() || obj->print_status == "FINISH") {
if (obj->is_in_prepare() || obj->print_status == "SLICING") { if (obj->is_in_prepare() || obj->print_status == "SLICING") {
@@ -3834,6 +3833,7 @@ void StatusPanel::update_cloud_subtask(MachineObject *obj)
if (is_task_changed(obj)) { if (is_task_changed(obj)) {
obj->set_modeltask(nullptr); obj->set_modeltask(nullptr);
obj->set_slice_info(nullptr);
reset_printing_values(); reset_printing_values();
BOOST_LOG_TRIVIAL(info) << "monitor: change to sub task id = " << obj->subtask_->task_id; BOOST_LOG_TRIVIAL(info) << "monitor: change to sub task id = " << obj->subtask_->task_id;
if (web_request.IsOk() && web_request.GetState() == wxWebRequest::State_Active) { if (web_request.IsOk() && web_request.GetState() == wxWebRequest::State_Active) {