mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-20 20:03:47 +00:00
FIX:fixed issue of printing progress not being displayed
jira:[STUDIO-11588] Change-Id: I369b9ed375ef3b3913553c3a965ce1aa96ec1129 (cherry picked from commit 378da0de26f837683890247a80ffdf0703529645)
This commit is contained in:
@@ -187,7 +187,7 @@ void MultiMachineItem::doRender(wxDC& dc)
|
|||||||
else if (state_device > 2 && state_device < 7) {
|
else if (state_device > 2 && state_device < 7) {
|
||||||
dc.SetFont(Label::Body_12);
|
dc.SetFont(Label::Body_12);
|
||||||
dc.SetTextForeground(wxColour(0, 150, 136));
|
dc.SetTextForeground(wxColour(0, 150, 136));
|
||||||
if (obj_->get_curr_stage().IsEmpty() && obj_->subtask_) {
|
if (obj_->get_curr_stage() == _L("Printing") && obj_->subtask_) {
|
||||||
//wxString layer_info = wxString::Format(_L("Layer: %d/%d"), obj_->curr_layer, obj_->total_layers);
|
//wxString layer_info = wxString::Format(_L("Layer: %d/%d"), obj_->curr_layer, obj_->total_layers);
|
||||||
wxString progress_info = wxString::Format("%d", obj_->subtask_->task_progress);
|
wxString progress_info = wxString::Format("%d", obj_->subtask_->task_progress);
|
||||||
wxString left_time = wxString::Format("%s", get_left_time(obj_->mc_left_time));
|
wxString left_time = wxString::Format("%s", get_left_time(obj_->mc_left_time));
|
||||||
|
|||||||
@@ -387,7 +387,7 @@ void MultiTaskItem::doRender(wxDC& dc)
|
|||||||
else if (state_device > 2 && state_device < 7) {
|
else if (state_device > 2 && state_device < 7) {
|
||||||
dc.SetFont(Label::Body_12);
|
dc.SetFont(Label::Body_12);
|
||||||
dc.SetTextForeground(wxColour(0, 150, 136));
|
dc.SetTextForeground(wxColour(0, 150, 136));
|
||||||
if (obj_->get_curr_stage().IsEmpty()) {
|
if (obj_->get_curr_stage() == _L("Printing") && obj_->subtask_) {
|
||||||
//wxString layer_info = wxString::Format(_L("Layer: %d/%d"), obj_->curr_layer, obj_->total_layers);
|
//wxString layer_info = wxString::Format(_L("Layer: %d/%d"), obj_->curr_layer, obj_->total_layers);
|
||||||
wxString progress_info = wxString::Format("%d", obj_->subtask_->task_progress);
|
wxString progress_info = wxString::Format("%d", obj_->subtask_->task_progress);
|
||||||
wxString left_time = wxString::Format("%s", get_left_time(obj_->mc_left_time));
|
wxString left_time = wxString::Format("%s", get_left_time(obj_->mc_left_time));
|
||||||
|
|||||||
Reference in New Issue
Block a user