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

fix some bug

Browse Source
This commit is contained in:
wjyLearn
2026-02-05 16:08:33 +08:00
parent 126fca3520
commit 462728f4f3
40 changed files with 841 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libslic3r/AppConfig.cpp
View File

@@ -519,7 +519,6 @@ void AppConfig::set_defaults()
if(get("switch to device tab after upload").empty())
set_bool("switch to device tab after upload", false);
//y76
if(get("last_selected_machine").empty())
set("last_selected_machine", "");

1
src/libslic3r/FilamentGroup.cpp
View File

@@ -14,6 +14,7 @@ namespace Slic3r
// clear the array and heap,save the groups in heap to the array
static void change_memoryed_heaps_to_arrays(MemoryedGroupHeap& heap,const int total_filament_num,const std::vector<unsigned int>& used_filaments, std::vector<std::vector<int>>& arrs)
{
// switch the label idx
arrs.clear();
while (!heap.empty()) {

8
src/libslic3r/FilamentGroup.hpp
View File

@@ -282,10 +282,10 @@ namespace Slic3r
protected:
MemoryedGroupHeap memoryed_groups;
std::shared_ptr<FlushDistanceEvaluator>m_evaluator;
std::unordered_map<int, std::vector<int>> m_unplaceable_limits; // <20><><EFBFBD>ϲ<EFBFBD><CFB2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>䵽<EFBFBD>ض<EFBFBD><D8B6><EFBFBD><EFBFBD><EFBFBD>
std::unordered_map<int, std::vector<int>> m_placeable_limits; // <20><><EFBFBD>ϱ<EFBFBD><CFB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>䵽<EFBFBD>ض<EFBFBD><D8B6><EFBFBD><EFBFBD><EFBFBD>
std::vector<int>m_max_cluster_size; // ÿ<><C3BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ܹ<EFBFBD><DCB9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IJ<EFBFBD><C4B2><EFBFBD><EFBFBD><EFBFBD>
std::vector<int>m_cluster_labels; // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϸ<EFBFBD><CFB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>id
std::unordered_map<int, std::vector<int>> m_unplaceable_limits;
std::unordered_map<int, std::vector<int>> m_placeable_limits;
std::vector<int>m_max_cluster_size;
std::vector<int>m_cluster_labels;
std::vector<std::pair<std::set<int>,int>> m_cluster_group_size;
std::vector<int> m_nozzle_to_extruder;

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

@@ -1791,17 +1791,17 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
//QDS: version check
bool dont_load_config = !m_load_config;
//w18
/*if (m_qidislicer_generator_version) {
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())
dont_load_config = true;
/*if (file_version.maj() > app_version.maj())
dont_load_config = true;*/
}
else {
m_qidislicer_generator_version = Semver::parse("0.0.0.0");
dont_load_config = true;
}*/
}
// we then loop again the entries to read other files stored in the archive
for (mz_uint i = 0; i < num_entries; ++i) {
@@ -3849,6 +3849,10 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
m_is_qdt_3mf = true;
m_qidislicer_generator_version = Semver::parse(m_curr_characters.substr(12));
}
//y77
if (boost::starts_with(m_curr_characters, "BambuStudio-")) {
m_qidislicer_generator_version = Semver::parse(m_curr_characters.substr(12));
}
//TODO: currently use version 0, no need to load&&save this string
/*} else if (m_curr_metadata_name == QDS_FDM_SUPPORTS_PAINTING_VERSION) {
m_fdm_supports_painting_version = (unsigned int) atoi(m_curr_characters.c_str());

3
src/libslic3r/Model.hpp
View File

@@ -761,7 +761,8 @@ enum class ConversionType : int {
enum class En3mfType : int {
From_QDS,
From_Prusa,
From_Other
From_Other,
From_BBS
};
class FacetsAnnotation final : public ObjectWithTimestamp {

2
src/libslic3r/PrintConfig.hpp
View File

@@ -1211,6 +1211,7 @@ PRINT_CONFIG_CLASS_DEFINE(
((ConfigOptionBool, support_multi_bed_types))
//y60
((ConfigOptionBool, is_support_3mf))
//y76
((ConfigOptionBool, is_support_mqtt))
)
@@ -1393,6 +1394,7 @@ PRINT_CONFIG_CLASS_DERIVED_DEFINE(
((ConfigOptionBool, is_support_timelapse))
//y65
((ConfigOptionBool, is_support_multi_box))
//y76
((ConfigOptionBool, is_support_air_condition)))
// This object is mapped to Perl as Slic3r::Config::Full.