juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-06-15 16:33:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH:loading the step in boost thread

Browse Source 
github: #6079
Change-Id: I0a289fc9730e7d091a71137cf11a711dfee5392f
(cherry picked from commit b454e7d8bb91b62b3be6121c567f7aee291eff50)
(cherry picked from commit b7ffba39e407317ad3cc4fe65d220f0049963aa9)
This commit is contained in:
Mack
2025-03-25 11:28:07 +08:00
committed by Noisyfox
parent ed40ce590b
commit 5004fbbf60
3 changed files with 466 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/libslic3r/Model.cpp
View File

@@ -190,26 +190,34 @@ Model Model::read_from_step(const std::string&
Model model;
bool result = false;
bool is_cb_cancel = false;
std::string message;
Step step_file(input_file);
step_file.load();
Step::Step_Status status;
Step step_file(input_file, stepFn);
status = step_file.load();
if(status != Step::Step_Status::LOAD_SUCCESS) {
goto _finished;
}
if (step_mesh_fn) {
if (step_mesh_fn(step_file, linear_defletion, angle_defletion, is_split_compound) == -1) {
status = Step::Step_Status::CANCEL;
goto _finished;
}
}
status = step_file.mesh(&model, is_cb_cancel, is_split_compound, linear_defletion, angle_defletion);
_finished:
switch (status){
case Step::Step_Status::CANCEL: {
Model empty_model;
return empty_model;
}
}
result = load_step(input_file.c_str(), &model, is_cb_cancel, linear_defletion, angle_defletion, is_split_compound, stepFn, stepIsUtf8Fn);
if (is_cb_cancel) {
Model empty_model;
return empty_model;
}
if (!result) {
if (message.empty())
case Step::Step_Status::LOAD_ERROR:
throw Slic3r::RuntimeError(_L("Loading of a model file failed."));
else
throw Slic3r::RuntimeError(message);
case Step::Step_Status::MESH_ERROR:
throw Slic3r::RuntimeError(_L("Meshing of a model file failed or no valid shape."));
default:
break;
}
if (model.objects.empty())