diff --git a/src/libslic3r/Format/STEP.cpp b/src/libslic3r/Format/STEP.cpp index 67ffe2e98..333bd794d 100644 --- a/src/libslic3r/Format/STEP.cpp +++ b/src/libslic3r/Format/STEP.cpp @@ -210,13 +210,15 @@ static void getNamedSolids(const TopLoc_Location& location, const std::string& p } } -bool load_step(const char *path, Model *model, ImportStepProgressFn stepFn, StepIsUtf8Fn isUtf8Fn) +bool load_step(const char *path, Model *model, bool& is_cancel, ImportStepProgressFn stepFn, StepIsUtf8Fn isUtf8Fn) { bool cb_cancel = false; if (stepFn) { stepFn(LOAD_STEP_STAGE_READ_FILE, 0, 1, cb_cancel); - if (cb_cancel) + is_cancel = cb_cancel; + if (cb_cancel) { return false; + } } if (!StepPreProcessor::isUtf8File(path) && isUtf8Fn) @@ -248,6 +250,7 @@ bool load_step(const char *path, Model *model, ImportStepProgressFn stepFn, Step if (stepFn) { if ((iLabel % stage_unit2) == 0) { stepFn(LOAD_STEP_STAGE_GET_SOLID, iLabel, topShapeLength, cb_cancel); + is_cancel = cb_cancel; } if (cb_cancel) { shapeTool.reset(nullptr); @@ -345,6 +348,7 @@ bool load_step(const char *path, Model *model, ImportStepProgressFn stepFn, Step if (stepFn) { if ((i % stage_unit3) == 0) { stepFn(LOAD_STEP_STAGE_GET_MESH, i, stl.size(), cb_cancel); + is_cancel = cb_cancel; } if (cb_cancel) { model->delete_object(new_object); diff --git a/src/libslic3r/Format/STEP.hpp b/src/libslic3r/Format/STEP.hpp index 13965d411..b86933a34 100644 --- a/src/libslic3r/Format/STEP.hpp +++ b/src/libslic3r/Format/STEP.hpp @@ -17,7 +17,7 @@ typedef std::function StepIsUtf8Fn; //BBS: Load an step file into a provided model. -extern bool load_step(const char *path, Model *model, ImportStepProgressFn proFn = nullptr, StepIsUtf8Fn isUtf8Fn = nullptr); +extern bool load_step(const char *path, Model *model, bool& is_cancel, ImportStepProgressFn proFn = nullptr, StepIsUtf8Fn isUtf8Fn = nullptr); //BBS: Used to detect what kind of encoded type is used in name field of step // If is encoded in UTF8, the file don't need to be handled, then return the original path directly. diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp index b8ed5d10a..cff60e72c 100644 --- a/src/libslic3r/Model.cpp +++ b/src/libslic3r/Model.cpp @@ -165,10 +165,11 @@ Model Model::read_from_file(const std::string& input_file, DynamicPrintConfig* c file_version = &temp_version; bool result = false; + bool is_cb_cancel = false; std::string message; if (boost::algorithm::iends_with(input_file, ".stp") || boost::algorithm::iends_with(input_file, ".step")) - result = load_step(input_file.c_str(), &model, stepFn, stepIsUtf8Fn); + result = load_step(input_file.c_str(), &model, is_cb_cancel, stepFn, stepIsUtf8Fn); else if (boost::algorithm::iends_with(input_file, ".stl")) result = load_stl(input_file.c_str(), &model, nullptr, stlFn); else if (boost::algorithm::iends_with(input_file, ".obj")) @@ -189,6 +190,11 @@ Model Model::read_from_file(const std::string& input_file, DynamicPrintConfig* c else throw Slic3r::RuntimeError("Unknown file format. Input file must have .stl, .obj, .amf(.xml) extension."); + if (is_cb_cancel) { + Model empty_model; + return empty_model; + } + if (!result) { if (message.empty()) throw Slic3r::RuntimeError("Loading of a model file failed.");