fix: misc issues in step import dialog (#14067)
fix mesh count cancellation flag using uninitialized memory fix initial waiting text being truncated
This commit is contained in:
@@ -107,7 +107,7 @@ public:
|
||||
double linear_defletion = 0.003,
|
||||
double angle_defletion = 0.5);
|
||||
|
||||
std::atomic<bool> m_stop_mesh;
|
||||
std::atomic<bool> m_stop_mesh{false};
|
||||
void update_process(int load_stage, int current, int total, bool& cancel);
|
||||
private:
|
||||
std::string m_path;
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user