mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix:on Mac,step mesh shows a count of 0 initially 

jira: STUDIO-9595
Change-Id: I9908d3eff394ada12dd9ab0a2c10ca8a78d4f1f6
This commit is contained in:
mack-test 2025-01-10 16:32:29 +08:00 committed by lane.wei
parent 329807156a
commit 8bafed6e0a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/slic3r/GUI/StepMeshDialog.cpp
View File

@ -344,22 +344,22 @@ void StepMeshDialog::stop_task()
void StepMeshDialog::update_mesh_number_text() void StepMeshDialog::update_mesh_number_text()
{ {
if (m_last_linear == get_linear_defletion() && m_last_angle == get_angle_defletion()) if ((m_last_linear == get_linear_defletion()) && (m_last_angle == get_angle_defletion()) && (m_mesh_number != 0))
return; return;
wxString newText = wxString::Format(_L("Calculating, please wait...")); wxString newText = wxString::Format(_L("Calculating, please wait..."));
mesh_face_number_text->SetLabel(newText); mesh_face_number_text->SetLabel(newText);
stop_task(); stop_task();
task = std::async(std::launch::async, [&] { task = std::async(std::launch::async, [&] {
unsigned int number = m_file.get_triangle_num(get_linear_defletion(), get_angle_defletion()); unsigned int m_mesh_number = m_file.get_triangle_num(get_linear_defletion(), get_angle_defletion());
if (number != 0) { if (m_mesh_number != 0) {
wxString number_text = wxString::Format("%d", number); wxString number_text = wxString::Format("%d", m_mesh_number);
wxCommandEvent event(wxEVT_THREAD_DONE); wxCommandEvent event(wxEVT_THREAD_DONE);
event.SetString(number_text); event.SetString(number_text);
wxPostEvent(this, event); wxPostEvent(this, event);
m_last_linear = get_linear_defletion(); m_last_linear = get_linear_defletion();
m_last_angle = get_angle_defletion(); m_last_angle = get_angle_defletion();
} }
return number; return m_mesh_number;
}); });
} }

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

@ -44,6 +44,7 @@ private:
wxStaticText* mesh_face_number_text; wxStaticText* mesh_face_number_text;
double m_last_linear = 0.003; double m_last_linear = 0.003;
double m_last_angle = 0.5; double m_last_angle = 0.5;
unsigned int m_mesh_number = 0;
std::future<unsigned int> task; std::future<unsigned int> task;
bool validate_number_range(const wxString& value, double min, double max); bool validate_number_range(const wxString& value, double min, double max);
void update_mesh_number_text(); void update_mesh_number_text();