QIDITECH/QIDIStudio
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDIStudio.git synced 2026-02-07 12:21:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Updated to 1.9.5, and optimize calibration and device

Browse Source
This commit is contained in:
QIDI TECH
2024-09-16 16:07:29 +08:00
parent fa251e0a9a
commit d842832b25
90 changed files with 2753 additions and 998 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libslic3r/Format/qds_3mf.cpp
View File

@@ -1681,7 +1681,8 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
/*if (m_qidislicer_generator_version) {
Semver app_version = *(Semver::parse(SLIC3R_VERSION));
Semver file_version = *m_qidislicer_generator_version;
if (file_version.maj() != app_version.maj())
//1.9.5
if (file_version.maj() > app_version.maj())
dont_load_config = true;
}
else {
@@ -7326,7 +7327,14 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
else if (obj){
inst = obj->instances[inst_id];
if (use_loaded_id && (inst->loaded_id > 0))
{
//1.9.5
identify_id = inst->loaded_id;
if (identify_id & 0xFF000000) {
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format(", identify_id %1%, too big, limit the high bits to 0\n") % identify_id;
identify_id = identify_id & 0x00FFFFFF;
}
}
else
identify_id = inst->id().id;
}
@@ -7515,8 +7523,18 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
continue;
}
inst = obj->instances[inst_id];
//1.9.5
if (!inst->printable)
continue;
if (m_use_loaded_id && (inst->loaded_id > 0))
{
identify_id = inst->loaded_id;
if (identify_id & 0xFF000000) {
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format(", identify_id %1%, too big, limit the high bits to 0\n") % identify_id;
identify_id = identify_id & 0x00FFFFFF;
}
}
else
identify_id = inst->id().id;
bool skipped = std::find(plate_data->skipped_objects.begin(), plate_data->skipped_objects.end(), identify_id) !=