GitHub-Proxy/BambuStudio
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git synced 2025-08-11 12:58:59 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

FIX:fixed issue of printing progress not being displayed

Browse Source 
jira:[STUDIO-11588]

Change-Id: I369b9ed375ef3b3913553c3a965ce1aa96ec1129
This commit is contained in:
tao wang 2025-04-24 21:19:48 +08:00 committed by lane.wei
parent 8cfa735c6c
commit 378da0de26
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/MultiMachineManagerPage.cpp
View File

@ -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, 174, 66)); dc.SetTextForeground(wxColour(0, 174, 66));
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));

16
src/slic3r/GUI/MultiTaskManagerPage.cpp
View File

@ -34,7 +34,7 @@ MultiTaskItem::MultiTaskItem(wxWindow* parent, MachineObject* obj, int type)
auto m_btn_bg_enable = StateColor( auto m_btn_bg_enable = StateColor(
std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed),
std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered), std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(0, 174, 66), StateColor::Normal) std::pair<wxColour, int>(wxColour(0, 174, 66), StateColor::Normal)
); );
@ -46,8 +46,8 @@ MultiTaskItem::MultiTaskItem(wxWindow* parent, MachineObject* obj, int type)
m_button_resume->SetTextColor(StateColor::darkModeColorFor("#FFFFFE")); m_button_resume->SetTextColor(StateColor::darkModeColorFor("#FFFFFE"));
m_button_resume->SetMinSize(wxSize(FromDIP(70), FromDIP(35))); m_button_resume->SetMinSize(wxSize(FromDIP(70), FromDIP(35)));
m_button_resume->SetCornerRadius(6); m_button_resume->SetCornerRadius(6);
StateColor clean_bg(std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Disabled), std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed), StateColor clean_bg(std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Disabled), std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed),
std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered), std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Enabled), std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered), std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Enabled),
std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Normal)); std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Normal));
@ -107,7 +107,7 @@ MultiTaskItem::MultiTaskItem(wxWindow* parent, MachineObject* obj, int type)
}); });
m_button_stop->Bind(wxEVT_BUTTON, [this](auto& e) { m_button_stop->Bind(wxEVT_BUTTON, [this](auto& e) {
onStop(); onStop();
}); });
wxGetApp().UpdateDarkUIWin(this); wxGetApp().UpdateDarkUIWin(this);
@ -115,7 +115,7 @@ MultiTaskItem::MultiTaskItem(wxWindow* parent, MachineObject* obj, int type)
void MultiTaskItem::update_info() void MultiTaskItem::update_info()
{ {
//local //local
if (m_task_type == 0) { if (m_task_type == 0) {
m_button_stop->Hide(); m_button_stop->Hide();
m_button_pause->Hide(); m_button_pause->Hide();
@ -363,7 +363,7 @@ void MultiTaskItem::doRender(wxDC& dc)
else { else {
DrawTextWithEllipsis(dc, get_cloud_state_task(), FromDIP(TASK_LEFT_PRO_STATE), left); DrawTextWithEllipsis(dc, get_cloud_state_task(), FromDIP(TASK_LEFT_PRO_STATE), left);
} }
left += FromDIP(TASK_LEFT_PRO_STATE); left += FromDIP(TASK_LEFT_PRO_STATE);
//cloud task info //cloud task info
@ -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, 174, 66)); dc.SetTextForeground(wxColour(0, 174, 66));
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));
@ -1368,7 +1368,7 @@ bool CloudTaskManagerPage::Show(bool show)
dev->subscribe_device_list(std::vector<std::string>()); dev->subscribe_device_list(std::vector<std::string>());
} }
} }
return wxPanel::Show(show); return wxPanel::Show(show);
} }