juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-11 19:17:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile error

Browse Source
This commit is contained in:
Noisyfox
2025-09-06 23:31:30 +08:00
parent 13d9fdb410
commit c043f73a98
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/slic3r/GUI/Plater.cpp
View File

@@ -1176,16 +1176,16 @@ void Sidebar::priv::update_sync_status(const MachineObject *obj)
struct ExtruderInfo struct ExtruderInfo
{ {
float diameter{0.4}; //float diameter{0.4};
int nozzle_volue_type{0}; //int nozzle_volue_type{0};
int ams_4{0}; int ams_4{0};
int ams_1{0}; int ams_1{0};
bool operator==(const ExtruderInfo &other) const bool operator==(const ExtruderInfo &other) const
{ {
return abs(diameter - other.diameter) < EPSILON return /*abs(diameter - other.diameter) < EPSILON
&& nozzle_volue_type == other.nozzle_volue_type && nozzle_volue_type == other.nozzle_volue_type
&& ams_4 == other.ams_4 &&*/ ams_4 == other.ams_4
&& ams_1 == other.ams_1; && ams_1 == other.ams_1;
} }
}; };
@@ -1194,9 +1194,9 @@ void Sidebar::priv::update_sync_status(const MachineObject *obj)
int extruder_nums = preset_bundle->get_printer_extruder_count(); int extruder_nums = preset_bundle->get_printer_extruder_count();
std::vector<ExtruderInfo> extruder_infos(extruder_nums); std::vector<ExtruderInfo> extruder_infos(extruder_nums);
std::vector<int> nozzle_volume_types = wxGetApp().preset_bundle->project_config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type")->values; std::vector<int> nozzle_volume_types = wxGetApp().preset_bundle->project_config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type")->values;
for (size_t i = 0; i < nozzle_volume_types.size(); ++i) { //for (size_t i = 0; i < nozzle_volume_types.size(); ++i) {
extruder_infos[i].nozzle_volue_type = nozzle_volume_types[i]; // extruder_infos[i].nozzle_volue_type = nozzle_volume_types[i];
} //}
std::vector<std::map<int, int>> extruder_ams_counts = wxGetApp().preset_bundle->extruder_ams_counts; std::vector<std::map<int, int>> extruder_ams_counts = wxGetApp().preset_bundle->extruder_ams_counts;
if (extruder_ams_counts.size() >= extruder_nums) { if (extruder_ams_counts.size() >= extruder_nums) {
@@ -1210,26 +1210,26 @@ void Sidebar::priv::update_sync_status(const MachineObject *obj)
} }
} }
if (extruder_nums == 1) { //if (extruder_nums == 1) {
double value = 0.0; // double value = 0.0;
single_extruder->diameter.ToDouble(&value); // single_extruder->diameter.ToDouble(&value);
extruder_infos[0].diameter = float(value); // extruder_infos[0].diameter = float(value);
} //}
else if(extruder_nums == 2){ //else if(extruder_nums == 2){
double value = 0.0; // double value = 0.0;
left_extruder->diameter.ToDouble(&value); // left_extruder->diameter.ToDouble(&value);
extruder_infos[0].diameter = float(value); // extruder_infos[0].diameter = float(value);
//
value = 0.0; // value = 0.0;
right_extruder->diameter.ToDouble(&value); // right_extruder->diameter.ToDouble(&value);
extruder_infos[1].diameter = float(value); // extruder_infos[1].diameter = float(value);
} //}
std::vector<ExtruderInfo> machine_extruder_infos(obj->m_extder_data.extders.size()); std::vector<ExtruderInfo> machine_extruder_infos(obj->m_extder_data.extders.size());
for (const Extder &extruder : obj->m_extder_data.extders) { //for (const Extder &extruder : obj->m_extder_data.extders) {
machine_extruder_infos[extruder.id].nozzle_volue_type = int(extruder.current_nozzle_flow_type) - 1; // machine_extruder_infos[extruder.id].nozzle_volue_type = int(extruder.current_nozzle_flow_type) - 1;
machine_extruder_infos[extruder.id].diameter = extruder.current_nozzle_diameter; // machine_extruder_infos[extruder.id].diameter = extruder.current_nozzle_diameter;
} //}
for (auto &item : obj->amsList) { for (auto &item : obj->amsList) {
if (item.second->type == 4) { // N3S if (item.second->type == 4) { // N3S
machine_extruder_infos[item.second->nozzle].ams_1++; machine_extruder_infos[item.second->nozzle].ams_1++;
@@ -15714,7 +15714,7 @@ void Plater::post_process_string_object_exception(StringObjectException &err)
void Plater::update_objects_position_when_select_preset(const std::function<void()> &select_prest) void Plater::update_objects_position_when_select_preset(const std::function<void()> &select_prest)
{ {
p->update_objects_position_when_select_preset(select_prest); //p->update_objects_position_when_select_preset(select_prest); // TODO: Orca hack
} }
bool Plater::check_ams_status() bool Plater::check_ams_status()