From 94d50a117700d135a020ae34c8967dce349a568c Mon Sep 17 00:00:00 2001 From: tao wang Date: Thu, 6 Apr 2023 16:48:56 +0800 Subject: [PATCH] ENH:use layer to represent the current number of layers Change-Id: I42d1f55a16efd6082df82e12c7bff575eea74fad --- src/slic3r/GUI/StatusPanel.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 9b023a253..0d70160c4 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -508,7 +508,7 @@ wxBoxSizer *StatusBasePanel::create_project_task_page(wxWindow *parent) panel_button_block->SetSize(wxSize(TASK_BUTTON_SIZE.x * 2 + FromDIP(5) * 2, -1)); panel_button_block->SetBackgroundColour(*wxWHITE); - m_staticText_layers = new wxStaticText(penel_text, wxID_ANY, _L("Layers: N/A")); + m_staticText_layers = new wxStaticText(penel_text, wxID_ANY, _L("Layer: N/A")); m_staticText_layers->SetFont(wxFont(12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("HarmonyOS Sans SC"))); m_staticText_layers->SetForegroundColour(wxColour(146, 146, 146)); m_staticText_layers->Hide(); @@ -2290,7 +2290,7 @@ void StatusPanel::update_subtask(MachineObject *obj) m_staticText_progress_percent->SetLabelText(NA_STR); m_staticText_progress_percent_icon->SetLabelText(wxEmptyString); m_staticText_progress_left->SetLabel(NA_STR); - m_staticText_layers->SetLabelText(wxString::Format(_L("Layers: %s"), NA_STR)); + m_staticText_layers->SetLabelText(wxString::Format(_L("Layer: %s"), NA_STR)); wxString subtask_text = wxString::Format("%s", GUI::from_u8(obj->subtask_name)); m_staticText_subtask_value->SetLabelText(subtask_text); update_basic_print_data(false); @@ -2319,13 +2319,13 @@ void StatusPanel::update_subtask(MachineObject *obj) m_gauge_progress->SetValue(obj->subtask_->task_progress); m_staticText_progress_percent->SetLabelText(wxString::Format("%d", obj->subtask_->task_progress)); m_staticText_progress_percent_icon->SetLabelText("%"); - m_staticText_layers->SetLabelText(wxString::Format(_L("Layers: %d/%d"), obj->curr_layer, obj->total_layers)); + m_staticText_layers->SetLabelText(wxString::Format(_L("Layer: %d/%d"), obj->curr_layer, obj->total_layers)); } else { m_gauge_progress->SetValue(0); m_staticText_progress_percent->SetLabelText(NA_STR); m_staticText_progress_percent_icon->SetLabelText(wxEmptyString); - m_staticText_layers->SetLabelText(wxString::Format(_L("Layers: %s"), NA_STR)); + m_staticText_layers->SetLabelText(wxString::Format(_L("Layer: %s"), NA_STR)); } } wxString subtask_text = wxString::Format("%s", GUI::from_u8(obj->subtask_name)); @@ -2407,7 +2407,7 @@ void StatusPanel::reset_printing_values() update_basic_print_data(false); m_printing_stage_value->SetLabelText(""); m_staticText_progress_left->SetLabelText(NA_STR); - m_staticText_layers->SetLabelText(wxString::Format(_L("Layers: %s"), NA_STR)); + m_staticText_layers->SetLabelText(wxString::Format(_L("Layer: %s"), NA_STR)); m_staticText_progress_percent->SetLabelText(NA_STR); m_staticText_progress_percent_icon->SetLabelText(wxEmptyString); m_bitmap_thumbnail->SetBitmap(m_thumbnail_placeholder.bmp());