NEW:tracking stl model files

jira:[STUDIO-5372]

Change-Id: Idb1275b07441f0cd06c24588d5f7c20f81f1556c
This commit is contained in:
tao wang
2023-11-23 20:00:34 +08:00
committed by Lane.Wei
parent b96f1b333e
commit 54eed41661
8 changed files with 131 additions and 19 deletions

View File

@@ -245,7 +245,6 @@ void PrintJob::process()
params.dst_file = m_dst_path;
}
if (wxGetApp().model().model_info && wxGetApp().model().model_info.get()) {
ModelInfo* model_info = wxGetApp().model().model_info.get();
auto origin_profile_id = model_info->metadata_items.find(BBL_DESIGNER_PROFILE_ID_TAG);
@@ -279,7 +278,17 @@ void PrintJob::process()
catch (...) {}
}
}
if (!wxGetApp().model().stl_design_id.empty()) {
int stl_design_id = 0;
try {
stl_design_id = std::stoi(wxGetApp().model().stl_design_id);
}
catch (const std::exception& e) {
stl_design_id = 0;
}
params.stl_design_id = stl_design_id;
}
if (params.preset_name.empty() && m_print_type == "from_normal") { params.preset_name = wxString::Format("%s_plate_%d", m_project_name, curr_plate_idx).ToStdString(); }
if (params.project_name.empty()) {params.project_name = m_project_name;}

View File

@@ -3140,6 +3140,53 @@ BoundingBox Plater::priv::scaled_bed_shape_bb() const
return printable_area.bounding_box();
}
std::string read_binary_stl(const std::string& filename) {
std::string model_id;
std::ifstream file(filename, std::ios::binary);
if (!file) {
return model_id;
}
try{
// Read the first 80 bytes
char data[80];
file.read(data, 80);
if (!file) {
file.close();
return model_id;
}
if (data[0] == '\0' || data[0] == ' ') {
file.close();
return model_id;
}
char magic[2] = { data[0], data[1] };
if (magic[0] != 'M' || magic[1] != 'W') {
file.close();
return model_id;
}
if (data[2] != ' ') {
file.close();
return model_id;
}
char protocol_version[3] = { data[3], data[4], data[5] };
//version
if (protocol_version[0] == '1' && protocol_version[1] == '.' && protocol_version[2] == '0') {
model_id = std::string(&data[7], &data[80]);
}
file.close();
}
catch (...){
}
return model_id;
}
// BBS: backup & restore
std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_files, LoadStrategy strategy, bool ask_multi)
{
@@ -3177,6 +3224,8 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
auto *new_model = (!load_model || one_by_one) ? nullptr : new Slic3r::Model();
std::vector<size_t> obj_idxs;
std::string designer_model_id;
int answer_convert_from_meters = wxOK_DEFAULT;
int answer_convert_from_imperial_units = wxOK_DEFAULT;
int tolal_model_count = 0;
@@ -3626,10 +3675,12 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
std::vector<Preset *> project_presets;
bool is_xxx;
Semver file_version;
model = Slic3r::Model::read_from_file(
path.string(), nullptr, nullptr, strategy, &plate_data, &project_presets, &is_xxx, &file_version, nullptr,
[this, &dlg, real_filename, &progress_percent, &file_percent, INPUT_FILES_RATIO, total_files, i](int current, int total, bool &cancel)
[this, &dlg, real_filename, &progress_percent, &file_percent, INPUT_FILES_RATIO, total_files, i, &designer_model_id](int current, int total, bool &cancel, std::string &mode_id)
{
designer_model_id = mode_id;
bool cont = true;
float percent_float = (100.0f * (float)i / (float)total_files) + INPUT_FILES_RATIO * 100.0f * ((float)current / (float)total) / (float)total_files;
BOOST_LOG_TRIVIAL(trace) << "load_stl_file: percent(float)=" << percent_float << ", curr = " << current << ", total = " << total;
@@ -3654,6 +3705,11 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
_L("Attention!"));
});
if (designer_model_id.empty() && boost::algorithm::iends_with(path.string(), ".stl")) {
designer_model_id = read_binary_stl(path.string());
}
if (type_any_amf && is_xxx) imperial_units = true;
for (auto obj : model.objects)
@@ -3947,6 +4003,10 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
GLGizmoSimplify::add_simplify_suggestion_notification(
obj_idxs, model.objects, *notification_manager);
//set designer_model_id
if (!designer_model_id.empty() && q->model().stl_design_id.empty()) {
q->model().stl_design_id = designer_model_id;
}
if (tolal_model_count <= 0 && !q->m_exported_file) {
dlg.Hide();

View File

@@ -202,6 +202,7 @@ struct PrintParams {
std::string connection_type;
std::string comments;
int origin_profile_id = 0;
int stl_design_id = 0;
std::string origin_model_id;
std::string print_type;
std::string dst_file;