From 59a06bc8facd2699ca3b759709329985a51d571e Mon Sep 17 00:00:00 2001 From: spr0u <204455541+spr0u@users.noreply.github.com> Date: Sun, 7 Jun 2026 00:30:13 -0500 Subject: [PATCH] fix: misc issues in step import dialog (#14067) fix mesh count cancellation flag using uninitialized memory fix initial waiting text being truncated --- src/libslic3r/Format/STEP.hpp | 2 +- src/slic3r/GUI/StepMeshDialog.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libslic3r/Format/STEP.hpp b/src/libslic3r/Format/STEP.hpp index 4c035e3eba..3253553567 100644 --- a/src/libslic3r/Format/STEP.hpp +++ b/src/libslic3r/Format/STEP.hpp @@ -107,7 +107,7 @@ public: double linear_defletion = 0.003, double angle_defletion = 0.5); - std::atomic m_stop_mesh; + std::atomic m_stop_mesh{false}; void update_process(int load_stage, int current, int total, bool& cancel); private: std::string m_path; diff --git a/src/slic3r/GUI/StepMeshDialog.cpp b/src/slic3r/GUI/StepMeshDialog.cpp index 17768504a1..5f74a79b7d 100644 --- a/src/slic3r/GUI/StepMeshDialog.cpp +++ b/src/slic3r/GUI/StepMeshDialog.cpp @@ -258,10 +258,9 @@ StepMeshDialog::StepMeshDialog(wxWindow* parent, Slic3r::Step& file, double line wxStaticText *mesh_face_number_title = new wxStaticText(this, wxID_ANY, _L("Number of triangular facets") + ": "); mesh_face_number_title->SetFont(::Label::Body_14); mesh_face_number_title->SetForegroundColour(StateColor::darkModeColorFor(FONT_COLOR)); - mesh_face_number_text = new wxStaticText(this, wxID_ANY, "0"); + mesh_face_number_text = new wxStaticText(this, wxID_ANY, _L("Calculating, please wait...")); mesh_face_number_text->SetFont(::Label::Body_14); mesh_face_number_text->SetForegroundColour(StateColor::darkModeColorFor(FONT_COLOR)); - mesh_face_number_text->SetMinSize(wxSize(FromDIP(150), -1)); mesh_face_number_sizer->Add(mesh_face_number_title, 0, wxALIGN_LEFT); mesh_face_number_sizer->Add(mesh_face_number_text, 0, wxALIGN_LEFT); bSizer->Add(mesh_face_number_sizer, 0, wxEXPAND | wxALL, LEFT_RIGHT_PADING);