3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-02-22 20:42:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

FIX:add "check_objects_empty_and_gcode3mf" api

Browse source 
jira: none
Change-Id: I8ffa72f5898292dbb8c539b743acd18d12e8dbb7
(cherry picked from commit 3a233b06db4ab913143d552c2c554a8c664eba9b)
This commit is contained in:
zhou.xu 2024-11-26 19:47:25 +08:00 • committed by Noisyfox
parent 5b03339b70
commit 8c2f658c93
2 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/slic3r/GUI/PartPlate.cpp
View file

@ -1392,14 +1392,9 @@ int PartPlate::picking_id_component(int idx) const
std::vector<int> PartPlate::get_extruders(bool conside_custom_gcode) const
{
std::vector<int> plate_extruders;
// if gcode.3mf file
if (m_model->objects.empty()) {
for (int i = 0; i < slice_filaments_info.size(); i++) {
plate_extruders.push_back(slice_filaments_info[i].id + 1);
}
return plate_extruders;
}
if (check_objects_empty_and_gcode3mf(plate_extruders)) {
return plate_extruders;
}
// if 3mf file
const DynamicPrintConfig& glb_config = wxGetApp().preset_bundle->prints.get_edited_preset().config;
int glb_support_intf_extr = glb_config.opt_int("support_interface_filament");
@ -1631,17 +1626,25 @@ std::vector<int> PartPlate::get_extruders_under_cli(bool conside_custom_gcode, D
return plate_extruders;
}
bool PartPlate::check_objects_empty_and_gcode3mf(std::vector<int> &result) const
{
if (m_model->objects.empty()) {//objects is empty
if (wxGetApp().plater()->is_gcode_3mf()) { // if gcode.3mf file
for (int i = 0; i < slice_filaments_info.size(); i++) {
result.push_back(slice_filaments_info[i].id + 1);
}
}
return true;
}
return false;
}
std::vector<int> PartPlate::get_extruders_without_support(bool conside_custom_gcode) const
{
std::vector<int> plate_extruders;
// if gcode.3mf file
if (m_model->objects.empty()) {
for (int i = 0; i < slice_filaments_info.size(); i++) {
plate_extruders.push_back(slice_filaments_info[i].id + 1);
}
return plate_extruders;
}
if (check_objects_empty_and_gcode3mf(plate_extruders)) {
return plate_extruders;
}
// if 3mf file
const DynamicPrintConfig& glb_config = wxGetApp().preset_bundle->prints.get_edited_preset().config;
@ -1679,13 +1682,9 @@ std::vector<int> PartPlate::get_extruders_without_support(bool conside_custom_gc
std::vector<int> PartPlate::get_used_extruders()
{
std::vector<int> used_extruders;
// if gcode.3mf file
if (m_model->objects.empty()) {
for (int i = 0; i < slice_filaments_info.size(); i++) {
used_extruders.push_back(slice_filaments_info[i].id + 1);
}
return used_extruders;
}
if (check_objects_empty_and_gcode3mf(used_extruders)) {
return used_extruders;
}
GCodeProcessorResult* result = get_slice_result();
if (!result)

1
src/slic3r/GUI/PartPlate.hpp
View file

@ -320,6 +320,7 @@ public:
Vec3d get_origin() { return m_origin; }
Vec3d estimate_wipe_tower_size(const DynamicPrintConfig & config, const double w, const double d, int plate_extruder_size = 0, bool use_global_objects = false) const;
arrangement::ArrangePolygon estimate_wipe_tower_polygon(const DynamicPrintConfig & config, int plate_index, int plate_extruder_size = 0, bool use_global_objects = false) const;
bool check_objects_empty_and_gcode3mf(std::vector<int> &result) const;
std::vector<int> get_extruders(bool conside_custom_gcode = false) const;
std::vector<int> get_extruders_under_cli(bool conside_custom_gcode, DynamicPrintConfig& full_config) const;
std::vector<int> get_extruders_without_support(bool conside_custom_gcode = false) const;