mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 16:57:53 -06:00
Merge branch 'master-remote' into feature/1.5
Signed-off-by: SoftFever <softfeverever@gmail.com> # Conflicts: # bbl/i18n/BambuStudio.pot # bbl/i18n/de/BambuStudio_de.po # bbl/i18n/en/BambuStudio_en.po # bbl/i18n/es/BambuStudio_es.po # bbl/i18n/fr/BambuStudio_fr.po # bbl/i18n/hu/BambuStudio_hu.po # bbl/i18n/it/BambuStudio_it.po # bbl/i18n/nl/BambuStudio_nl.po # bbl/i18n/sv/BambuStudio_sv.po # bbl/i18n/zh_cn/BambuStudio_zh_CN.po # deps/Boost/Boost.cmake # deps/wxWidgets/wxWidgets.cmake # resources/config.json # resources/i18n/de/BambuStudio.mo # resources/i18n/en/BambuStudio.mo # resources/i18n/es/BambuStudio.mo # resources/i18n/fr/BambuStudio.mo # resources/i18n/hu/BambuStudio.mo # resources/i18n/it/BambuStudio.mo # resources/i18n/nl/BambuStudio.mo # resources/i18n/sv/BambuStudio.mo # resources/i18n/zh_cn/BambuStudio.mo # resources/images/tips_arrow.svg # resources/profiles/Anycubic.json # resources/profiles/Anycubic/filament/Anycubic Generic ABS.json # resources/profiles/Anycubic/filament/Anycubic Generic ASA.json # resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json # resources/profiles/Anycubic/filament/Anycubic Generic PA.json # resources/profiles/Anycubic/filament/Anycubic Generic PC.json # resources/profiles/Anycubic/filament/Anycubic Generic PETG.json # resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json # resources/profiles/Anycubic/filament/Anycubic Generic PLA.json # resources/profiles/Anycubic/filament/Anycubic Generic PVA.json # resources/profiles/Anycubic/filament/Anycubic Generic TPU.json # resources/profiles/Anycubic/filament/fdm_filament_common.json # resources/profiles/Anycubic/machine/Anycubic 4Max Pro 0.4 nozzle.json # resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json # resources/profiles/Anycubic/process/0.20mm Standard @4MaxPro.json # resources/profiles/Anycubic/process/fdm_process_common.json # resources/profiles/BBL.json # resources/profiles/BBL/machine/Bambu Lab P1P 0.2 nozzle.json # resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json # resources/profiles/BBL/machine/Bambu Lab P1P 0.6 nozzle.json # resources/profiles/BBL/machine/Bambu Lab P1P 0.8 nozzle.json # resources/profiles/BBL/machine/Bambu Lab X1 0.2 nozzle.json # resources/profiles/BBL/machine/Bambu Lab X1 0.4 nozzle.json # resources/profiles/BBL/machine/Bambu Lab X1 0.6 nozzle.json # resources/profiles/BBL/machine/Bambu Lab X1 0.8 nozzle.json # resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.2 nozzle.json # resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.4 nozzle.json # resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.6 nozzle.json # resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.8 nozzle.json # resources/profiles/BBL/machine/fdm_bbl_3dp_001_common.json # resources/profiles/Voron.json # resources/web/data/text.js # resources/web/image/printer/Anycubic 4Max Pro_cover.png # src/BambuStudio.cpp # src/libslic3r/GCode.cpp # src/libslic3r/GCode.hpp # src/libslic3r/GCode/GCodeProcessor.cpp # src/libslic3r/GCodeWriter.hpp # src/libslic3r/PerimeterGenerator.cpp # src/libslic3r/PresetBundle.cpp # src/libslic3r/Print.cpp # src/libslic3r/Print.hpp # src/libslic3r/PrintConfig.cpp # src/libslic3r/PrintConfig.hpp # src/libslic3r/PrintObject.cpp # src/slic3r/GUI/AMSMaterialsSetting.cpp # src/slic3r/GUI/AMSMaterialsSetting.hpp # src/slic3r/GUI/AmsMappingPopup.cpp # src/slic3r/GUI/AmsMappingPopup.hpp # src/slic3r/GUI/Auxiliary.cpp # src/slic3r/GUI/BackgroundSlicingProcess.cpp # src/slic3r/GUI/ConfigManipulation.cpp # src/slic3r/GUI/DeviceManager.cpp # src/slic3r/GUI/DeviceManager.hpp # src/slic3r/GUI/ExtrusionCalibration.cpp # src/slic3r/GUI/GCodeViewer.cpp # src/slic3r/GUI/GCodeViewer.hpp # src/slic3r/GUI/GUI_App.cpp # src/slic3r/GUI/IMSlider.cpp # src/slic3r/GUI/Jobs/PrintJob.cpp # src/slic3r/GUI/Jobs/PrintJob.hpp # src/slic3r/GUI/Jobs/SendJob.cpp # src/slic3r/GUI/Jobs/SendJob.hpp # src/slic3r/GUI/MainFrame.cpp # src/slic3r/GUI/MainFrame.hpp # src/slic3r/GUI/MediaPlayCtrl.cpp # src/slic3r/GUI/OptionsGroup.cpp # src/slic3r/GUI/PhysicalPrinterDialog.cpp # src/slic3r/GUI/Plater.cpp # src/slic3r/GUI/PrintHostDialogs.cpp # src/slic3r/GUI/Printer/BambuTunnel.h # src/slic3r/GUI/Printer/PrinterFileSystem.cpp # src/slic3r/GUI/Printer/gstbambusrc.c # src/slic3r/GUI/Printer/gstbambusrc.h # src/slic3r/GUI/ReleaseNote.cpp # src/slic3r/GUI/ReleaseNote.hpp # src/slic3r/GUI/SelectMachine.cpp # src/slic3r/GUI/SendToPrinter.cpp # src/slic3r/GUI/SetBedTypeDialog.cpp # src/slic3r/GUI/StatusPanel.cpp # src/slic3r/GUI/StatusPanel.hpp # src/slic3r/GUI/Tab.cpp # src/slic3r/GUI/Widgets/AMSControl.cpp # src/slic3r/GUI/Widgets/AMSControl.hpp # src/slic3r/GUI/Widgets/ImageSwitchButton.cpp # src/slic3r/GUI/Widgets/Label.cpp # src/slic3r/GUI/WipeTowerDialog.cpp # src/slic3r/Utils/Process.cpp # src/slic3r/Utils/bambu_networking.hpp # version.inc
This commit is contained in:
SoftFever
commit
5ef51f6c8a
339 changed files with 37169 additions and 5445 deletions
|
|
@ -246,6 +246,9 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n
|
|||
osteps.emplace_back(posSimplifyPath);
|
||||
osteps.emplace_back(posSimplifySupportPath);
|
||||
steps.emplace_back(psSkirtBrim);
|
||||
}
|
||||
else if (opt_key == "z_hop_types") {
|
||||
osteps.emplace_back(posDetectOverhangsForLift);
|
||||
} else {
|
||||
// for legacy, if we can't handle this option let's invalidate all steps
|
||||
//FIXME invalidate all steps of all objects as well?
|
||||
|
|
@ -354,10 +357,21 @@ std::vector<unsigned int> Print::support_material_extruders() const
|
|||
}
|
||||
|
||||
// returns 0-based indices of used extruders
|
||||
std::vector<unsigned int> Print::extruders() const
|
||||
std::vector<unsigned int> Print::extruders(bool conside_custom_gcode) const
|
||||
{
|
||||
std::vector<unsigned int> extruders = this->object_extruders();
|
||||
append(extruders, this->support_material_extruders());
|
||||
|
||||
if (conside_custom_gcode) {
|
||||
//BBS
|
||||
for (auto plate_data : m_model.plates_custom_gcodes) {
|
||||
for (auto item : plate_data.second.gcodes) {
|
||||
if (item.type == CustomGCode::Type::ToolChange)
|
||||
extruders.push_back((unsigned int)item.extruder);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sort_remove_duplicates(extruders);
|
||||
return extruders;
|
||||
}
|
||||
|
|
@ -1135,34 +1149,35 @@ StringObjectException Print::validate(StringObjectException *warning, Polygons*
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
const ConfigOptionDef* bed_type_def = print_config_def.get("curr_bed_type");
|
||||
assert(bed_type_def != nullptr);
|
||||
|
||||
if (is_BBL_printer()) {
|
||||
const t_config_enum_values* bed_type_keys_map = bed_type_def->enum_keys_map;
|
||||
for (unsigned int extruder_id : extruders) {
|
||||
const ConfigOptionInts* bed_temp_opt = m_config.option<ConfigOptionInts>(get_bed_temp_key(m_config.curr_bed_type));
|
||||
for (unsigned int extruder_id : extruders) {
|
||||
int curr_bed_temp = bed_temp_opt->get_at(extruder_id);
|
||||
if (curr_bed_temp == 0 && bed_type_keys_map != nullptr) {
|
||||
std::string bed_type_name;
|
||||
for (auto item : *bed_type_keys_map) {
|
||||
if (item.second == m_config.curr_bed_type) {
|
||||
bed_type_name = item.first;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (is_BBL_printer()) {
|
||||
const t_config_enum_values* bed_type_keys_map = bed_type_def->enum_keys_map;
|
||||
for (unsigned int extruder_id : extruders) {
|
||||
const ConfigOptionInts* bed_temp_opt = m_config.option<ConfigOptionInts>(get_bed_temp_key(m_config.curr_bed_type));
|
||||
for (unsigned int extruder_id : extruders) {
|
||||
int curr_bed_temp = bed_temp_opt->get_at(extruder_id);
|
||||
if (curr_bed_temp == 0 && bed_type_keys_map != nullptr) {
|
||||
std::string bed_type_name;
|
||||
for (auto item : *bed_type_keys_map) {
|
||||
if (item.second == m_config.curr_bed_type) {
|
||||
bed_type_name = item.first;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
StringObjectException except;
|
||||
except.string = format(L("Plate %d: %s does not support filament %s"), this->get_plate_index() + 1, L(bed_type_name), extruder_id + 1);
|
||||
except.string += "\n";
|
||||
except.type = STRING_EXCEPT_FILAMENT_NOT_MATCH_BED_TYPE;
|
||||
except.params.push_back(std::to_string(this->get_plate_index() + 1));
|
||||
except.params.push_back(L(bed_type_name));
|
||||
except.params.push_back(std::to_string(extruder_id + 1));
|
||||
except.object = nullptr;
|
||||
return except;
|
||||
}
|
||||
StringObjectException except;
|
||||
except.string = format(L("Plate %d: %s does not support filament %s"), this->get_plate_index() + 1, L(bed_type_name), extruder_id + 1);
|
||||
except.string += "\n";
|
||||
except.type = STRING_EXCEPT_FILAMENT_NOT_MATCH_BED_TYPE;
|
||||
except.params.push_back(std::to_string(this->get_plate_index() + 1));
|
||||
except.params.push_back(L(bed_type_name));
|
||||
except.params.push_back(std::to_string(extruder_id+1));
|
||||
except.object = nullptr;
|
||||
return except;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1307,7 +1322,6 @@ void PrintObject::clear_shared_object()
|
|||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": this=%1%, clear previous shared object data %2%")%this %m_shared_object;
|
||||
m_layers.clear();
|
||||
m_support_layers.clear();
|
||||
m_tree_support_layers.clear();
|
||||
|
||||
m_shared_object = nullptr;
|
||||
|
||||
|
|
@ -1320,7 +1334,6 @@ void PrintObject::copy_layers_from_shared_object()
|
|||
if (m_shared_object) {
|
||||
m_layers.clear();
|
||||
m_support_layers.clear();
|
||||
m_tree_support_layers.clear();
|
||||
|
||||
firstLayerObjSliceByVolume.clear();
|
||||
firstLayerObjSliceByGroups.clear();
|
||||
|
|
@ -1328,7 +1341,6 @@ void PrintObject::copy_layers_from_shared_object()
|
|||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": this=%1%, copied layers from object %2%")%this%m_shared_object;
|
||||
m_layers = m_shared_object->layers();
|
||||
m_support_layers = m_shared_object->support_layers();
|
||||
m_tree_support_layers = m_shared_object->tree_support_layers();
|
||||
|
||||
firstLayerObjSliceByVolume = m_shared_object->firstLayerObjSlice();
|
||||
firstLayerObjSliceByGroups = m_shared_object->firstLayerObjGroups();
|
||||
|
|
@ -1660,6 +1672,17 @@ void Print::process(bool use_cache)
|
|||
}
|
||||
}
|
||||
|
||||
// BBS
|
||||
for (PrintObject* obj : m_objects) {
|
||||
if (need_slicing_objects.count(obj) != 0) {
|
||||
obj->detect_overhangs_for_lift();
|
||||
}
|
||||
else {
|
||||
if (obj->set_started(posDetectOverhangsForLift))
|
||||
obj->set_done(posDetectOverhangsForLift);
|
||||
}
|
||||
}
|
||||
|
||||
BOOST_LOG_TRIVIAL(info) << "Slicing process finished." << log_memory_info();
|
||||
}
|
||||
|
||||
|
|
@ -1732,13 +1755,6 @@ void Print::_make_skirt()
|
|||
break;
|
||||
layer->support_fills.collect_points(object_points);
|
||||
}
|
||||
// BBS
|
||||
for (const TreeSupportLayer* layer : object->m_tree_support_layers) {
|
||||
if (layer->print_z > skirt_height_z)
|
||||
break;
|
||||
|
||||
layer->support_fills.collect_points(object_points);
|
||||
}
|
||||
|
||||
object_convex_hulls.insert({ object, Slic3r::Geometry::convex_hull(object_points) });
|
||||
|
||||
|
|
@ -1885,12 +1901,12 @@ Polygons Print::first_layer_islands() const
|
|||
Polygons object_islands;
|
||||
for (ExPolygon &expoly : object->m_layers.front()->lslices)
|
||||
object_islands.push_back(expoly.contour);
|
||||
if (! object->support_layers().empty())
|
||||
object->support_layers().front()->support_fills.polygons_covered_by_spacing(object_islands, float(SCALED_EPSILON));
|
||||
if (! object->tree_support_layers().empty()) {
|
||||
ExPolygons& expolys_first_layer = object->m_tree_support_layers.front()->lslices;
|
||||
for (ExPolygon &expoly : expolys_first_layer) {
|
||||
object_islands.push_back(expoly.contour);
|
||||
if (!object->support_layers().empty()) {
|
||||
if (object->support_layers().front()->support_type==stInnerNormal)
|
||||
object->support_layers().front()->support_fills.polygons_covered_by_spacing(object_islands, float(SCALED_EPSILON));
|
||||
else if(object->support_layers().front()->support_type==stInnerTree) {
|
||||
ExPolygons &expolys_first_layer = object->m_support_layers.front()->lslices;
|
||||
for (ExPolygon &expoly : expolys_first_layer) { object_islands.push_back(expoly.contour); }
|
||||
}
|
||||
}
|
||||
islands.reserve(islands.size() + object_islands.size() * object->instances().size());
|
||||
|
|
@ -2241,7 +2257,7 @@ std::string PrintStatistics::finalize_output_path(const std::string &path_in) co
|
|||
#define JSON_SUPPORT_LAYER_ISLANDS "support_islands"
|
||||
#define JSON_SUPPORT_LAYER_FILLS "support_fills"
|
||||
#define JSON_SUPPORT_LAYER_INTERFACE_ID "interface_id"
|
||||
|
||||
#define JSON_SUPPORT_LAYER_TYPE "support_type"
|
||||
|
||||
#define JSON_LAYER_REGION_CONFIG_HASH "config_hash"
|
||||
#define JSON_LAYER_REGION_SLICES "slices"
|
||||
|
|
@ -2872,6 +2888,7 @@ void extract_layer(const json& layer_json, Layer& layer) {
|
|||
void extract_support_layer(const json& support_layer_json, SupportLayer& support_layer) {
|
||||
extract_layer(support_layer_json, support_layer);
|
||||
|
||||
support_layer.support_type = support_layer_json[JSON_SUPPORT_LAYER_TYPE];
|
||||
//support_islands
|
||||
int islands_count = support_layer_json[JSON_SUPPORT_LAYER_ISLANDS].size();
|
||||
for (int islands_index = 0; islands_index < islands_count; islands_index++)
|
||||
|
|
@ -2900,27 +2917,6 @@ void extract_support_layer(const json& support_layer_json, SupportLayer& support
|
|||
return;
|
||||
}
|
||||
|
||||
void extract_tree_support_layer(const json& tree_support_layer_json, TreeSupportLayer& tree_support_layer) {
|
||||
extract_layer(tree_support_layer_json, tree_support_layer);
|
||||
|
||||
//support_fills
|
||||
tree_support_layer.support_fills.no_sort = tree_support_layer_json[JSON_SUPPORT_LAYER_FILLS][JSON_EXTRUSION_NO_SORT];
|
||||
int treesupport_fills_entities_count = tree_support_layer_json[JSON_SUPPORT_LAYER_FILLS][JSON_EXTRUSION_ENTITIES].size();
|
||||
for (int treesupport_fills_entities_index = 0; treesupport_fills_entities_index < treesupport_fills_entities_count; treesupport_fills_entities_index++)
|
||||
{
|
||||
const json& extrusion_entity_json = tree_support_layer_json[JSON_SUPPORT_LAYER_FILLS][JSON_EXTRUSION_ENTITIES][treesupport_fills_entities_index];
|
||||
bool ret = convert_extrusion_from_json(extrusion_entity_json, tree_support_layer.support_fills);
|
||||
if (!ret) {
|
||||
BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(": error parsing fills found at tree_support_layer %1%, print_z %2%")%tree_support_layer.id() %tree_support_layer.print_z;
|
||||
char error_buf[1024];
|
||||
::sprintf(error_buf, "Error while parsing fills at tree_support_layer %d, print_z %f", tree_support_layer.id(), tree_support_layer.print_z);
|
||||
throw Slic3r::FileIOError(error_buf);
|
||||
}
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
int Print::export_cached_data(const std::string& directory, bool with_space)
|
||||
{
|
||||
int ret = 0;
|
||||
|
|
@ -2986,7 +2982,7 @@ int Print::export_cached_data(const std::string& directory, bool with_space)
|
|||
std::string file_name = directory +"/obj_"+std::to_string(arrange_order)+".json";
|
||||
|
||||
try {
|
||||
json root_json, layers_json = json::array(), support_layers_json = json::array(), tree_support_layers_json = json::array();
|
||||
json root_json, layers_json = json::array(), support_layers_json = json::array();
|
||||
|
||||
root_json[JSON_OBJECT_NAME] = model_obj->name;
|
||||
root_json[JSON_ARRANGE_ORDER] = arrange_order;
|
||||
|
|
@ -3031,6 +3027,7 @@ int Print::export_cached_data(const std::string& directory, bool with_space)
|
|||
convert_layer_to_json(support_layer_json, support_layer);
|
||||
|
||||
support_layer_json[JSON_SUPPORT_LAYER_INTERFACE_ID] = support_layer->interface_id();
|
||||
support_layer_json[JSON_SUPPORT_LAYER_TYPE] = support_layer->support_type;
|
||||
|
||||
//support_islands
|
||||
for (const ExPolygon& support_island : support_layer->support_islands.expolygons) {
|
||||
|
|
@ -3094,136 +3091,6 @@ int Print::export_cached_data(const std::string& directory, bool with_space)
|
|||
} // for each layer*/
|
||||
root_json[JSON_SUPPORT_LAYERS] = std::move(support_layers_json);
|
||||
|
||||
//export the tree support layers
|
||||
std::vector<json> tree_support_layers_json_vector(obj->tree_support_layer_count());
|
||||
tbb::parallel_for(
|
||||
tbb::blocked_range<size_t>(0, obj->tree_support_layer_count()),
|
||||
[&tree_support_layers_json_vector, obj, convert_layer_to_json](const tbb::blocked_range<size_t>& tree_support_layer_range) {
|
||||
for (size_t ts_layer_index = tree_support_layer_range.begin(); ts_layer_index < tree_support_layer_range.end(); ++ ts_layer_index) {
|
||||
const TreeSupportLayer *tree_support_layer = obj->get_tree_support_layer(ts_layer_index);
|
||||
json treesupport_layer_json, treesupport_fills_json, treesupportfills_entities_json = json::array();
|
||||
//json overhang_areas_json = json::array(), roof_areas_json = json::array(), roof_1st_layer_json = json::array(), floor_areas_json = json::array(), base_areas_json = json::array();
|
||||
|
||||
convert_layer_to_json(treesupport_layer_json, tree_support_layer);
|
||||
|
||||
//tree_support_fills
|
||||
treesupport_fills_json[JSON_EXTRUSION_NO_SORT] = tree_support_layer->support_fills.no_sort;
|
||||
treesupport_fills_json[JSON_EXTRUSION_ENTITY_TYPE] = JSON_EXTRUSION_TYPE_COLLECTION;
|
||||
for (const ExtrusionEntity* extrusion_entity : tree_support_layer->support_fills.entities) {
|
||||
json treesupportfill_entity_json, treesupportfill_entity_paths_json = json::array();
|
||||
bool ret = convert_extrusion_to_json(treesupportfill_entity_json, treesupportfill_entity_paths_json, extrusion_entity);
|
||||
if (!ret)
|
||||
continue;
|
||||
|
||||
treesupportfills_entities_json.push_back(std::move(treesupportfill_entity_json));
|
||||
}
|
||||
treesupport_fills_json[JSON_EXTRUSION_ENTITIES] = std::move(treesupportfills_entities_json);
|
||||
treesupport_layer_json[JSON_SUPPORT_LAYER_FILLS] = std::move(treesupport_fills_json);
|
||||
|
||||
//following data are not needed in the later stage
|
||||
//overhang_areas
|
||||
/*for (const ExPolygon& overhang_area : tree_support_layer->overhang_areas) {
|
||||
json overhang_area_json = overhang_area;
|
||||
overhang_areas_json.push_back(std::move(overhang_area_json));
|
||||
}
|
||||
treesupport_layer_json["overhang_areas"] = std::move(overhang_areas_json);
|
||||
|
||||
//roof_areas
|
||||
for (const ExPolygon& roof_area : tree_support_layer->roof_areas) {
|
||||
json roof_area_json = roof_area;
|
||||
roof_areas_json.push_back(std::move(roof_area_json));
|
||||
}
|
||||
treesupport_layer_json["roof_areas"] = std::move(roof_areas_json);
|
||||
|
||||
//roof_1st_layer
|
||||
for (const ExPolygon& layer_poly : tree_support_layer->roof_1st_layer) {
|
||||
json layer_poly_json = layer_poly;
|
||||
roof_1st_layer_json.push_back(std::move(layer_poly_json));
|
||||
}
|
||||
treesupport_layer_json["roof_1st_layer"] = std::move(roof_1st_layer_json);
|
||||
|
||||
//floor_areas
|
||||
for (const ExPolygon& floor_area : tree_support_layer->floor_areas) {
|
||||
json floor_area_json = floor_area;
|
||||
floor_areas_json.push_back(std::move(floor_area_json));
|
||||
}
|
||||
treesupport_layer_json["floor_areas"] = std::move(floor_areas_json);
|
||||
|
||||
//base_areas
|
||||
for (const ExPolygon& base_area : tree_support_layer->base_areas) {
|
||||
json base_area_json = base_area;
|
||||
base_areas_json.push_back(std::move(base_area_json));
|
||||
}
|
||||
treesupport_layer_json["base_areas"] = std::move(base_areas_json);*/
|
||||
|
||||
tree_support_layers_json_vector[ts_layer_index] = std::move(treesupport_layer_json);
|
||||
}
|
||||
}
|
||||
);
|
||||
for (int ts_index = 0; ts_index < tree_support_layers_json_vector.size(); ts_index++) {
|
||||
tree_support_layers_json.push_back(std::move(tree_support_layers_json_vector[ts_index]));
|
||||
}
|
||||
tree_support_layers_json_vector.clear();
|
||||
#if 0
|
||||
for (const TreeSupportLayer *tree_support_layer : obj->tree_support_layers()) {
|
||||
json treesupport_layer_json, treesupport_fills_json, treesupportfills_entities_json = json::array();
|
||||
json overhang_areas_json = json::array(), roof_areas_json = json::array(), roof_1st_layer_json = json::array(), floor_areas_json = json::array(), base_areas_json = json::array();
|
||||
|
||||
convert_layer_to_json(treesupport_layer_json, tree_support_layer);
|
||||
|
||||
//tree_support_fills
|
||||
treesupport_fills_json[JSON_EXTRUSION_NO_SORT] = tree_support_layer->support_fills.no_sort;
|
||||
treesupport_fills_json[JSON_EXTRUSION_ENTITY_TYPE] = JSON_EXTRUSION_TYPE_COLLECTION;
|
||||
for (const ExtrusionEntity* extrusion_entity : tree_support_layer->support_fills.entities) {
|
||||
json treesupportfill_entity_json, treesupportfill_entity_paths_json = json::array();
|
||||
bool ret = convert_extrusion_to_json(treesupportfill_entity_json, treesupportfill_entity_paths_json, extrusion_entity);
|
||||
if (!ret)
|
||||
continue;
|
||||
|
||||
treesupportfills_entities_json.push_back(std::move(treesupportfill_entity_json));
|
||||
}
|
||||
treesupport_fills_json[JSON_EXTRUSION_ENTITIES] = std::move(treesupportfills_entities_json);
|
||||
treesupport_layer_json[JSON_SUPPORT_LAYER_FILLS] = std::move(treesupport_fills_json);
|
||||
|
||||
//overhang_areas
|
||||
/*for (const ExPolygon& overhang_area : tree_support_layer->overhang_areas) {
|
||||
json overhang_area_json = overhang_area;
|
||||
overhang_areas_json.push_back(std::move(overhang_area_json));
|
||||
}
|
||||
treesupport_layer_json["overhang_areas"] = std::move(overhang_areas_json);
|
||||
|
||||
//roof_areas
|
||||
for (const ExPolygon& roof_area : tree_support_layer->roof_areas) {
|
||||
json roof_area_json = roof_area;
|
||||
roof_areas_json.push_back(std::move(roof_area_json));
|
||||
}
|
||||
treesupport_layer_json["roof_areas"] = std::move(roof_areas_json);
|
||||
|
||||
//roof_1st_layer
|
||||
for (const ExPolygon& layer_poly : tree_support_layer->roof_1st_layer) {
|
||||
json layer_poly_json = layer_poly;
|
||||
roof_1st_layer_json.push_back(std::move(layer_poly_json));
|
||||
}
|
||||
treesupport_layer_json["roof_1st_layer"] = std::move(roof_1st_layer_json);
|
||||
|
||||
//floor_areas
|
||||
for (const ExPolygon& floor_area : tree_support_layer->floor_areas) {
|
||||
json floor_area_json = floor_area;
|
||||
floor_areas_json.push_back(std::move(floor_area_json));
|
||||
}
|
||||
treesupport_layer_json["floor_areas"] = std::move(floor_areas_json);
|
||||
|
||||
//base_areas
|
||||
for (const ExPolygon& base_area : tree_support_layer->base_areas) {
|
||||
json base_area_json = base_area;
|
||||
base_areas_json.push_back(std::move(base_area_json));
|
||||
}
|
||||
treesupport_layer_json["base_areas"] = std::move(base_areas_json);*/
|
||||
|
||||
tree_support_layers_json.push_back(std::move(treesupport_layer_json));
|
||||
} // for each layer
|
||||
#endif
|
||||
root_json[JSON_TREE_SUPPORT_LAYERS] = std::move(tree_support_layers_json);
|
||||
|
||||
filename_vector.push_back(file_name);
|
||||
json_vector.push_back(std::move(root_json));
|
||||
|
|
@ -3302,7 +3169,6 @@ int Print::load_cached_data(const std::string& directory)
|
|||
|
||||
obj->clear_layers();
|
||||
obj->clear_support_layers();
|
||||
obj->clear_tree_support_layers();
|
||||
|
||||
int arrange_order = model_instance->arrange_order;
|
||||
if (arrange_order <= 0) {
|
||||
|
|
@ -3354,13 +3220,12 @@ int Print::load_cached_data(const std::string& directory)
|
|||
|
||||
std::string name = root_json.at(JSON_OBJECT_NAME);
|
||||
int order = root_json.at(JSON_ARRANGE_ORDER);
|
||||
int layer_count = 0, support_layer_count = 0, treesupport_layer_count = 0;
|
||||
int layer_count = 0, support_layer_count = 0;
|
||||
|
||||
layer_count = root_json[JSON_LAYERS].size();
|
||||
support_layer_count = root_json[JSON_SUPPORT_LAYERS].size();
|
||||
treesupport_layer_count = root_json[JSON_TREE_SUPPORT_LAYERS].size();
|
||||
|
||||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__<<boost::format(":will load %1%, arrange_order %2%, layer_count %3%, support_layer_count %4%, treesupport_layer_count %5%")%name %order %layer_count %support_layer_count %treesupport_layer_count;
|
||||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__<<boost::format(":will load %1%, arrange_order %2%, layer_count %3%, support_layer_count %4%")%name %order %layer_count %support_layer_count;
|
||||
|
||||
Layer* previous_layer = NULL;
|
||||
//create layer and layer regions
|
||||
|
|
@ -3441,35 +3306,6 @@ int Print::load_cached_data(const std::string& directory)
|
|||
}
|
||||
);
|
||||
|
||||
//tree support layers
|
||||
Layer* previous_tree_support_layer = NULL;
|
||||
//create tree_support_layers
|
||||
for (int index = 0; index < treesupport_layer_count; index++)
|
||||
{
|
||||
json& layer_json = root_json[JSON_TREE_SUPPORT_LAYERS][index];
|
||||
TreeSupportLayer* new_tree_support_layer = obj->add_tree_support_layer(layer_json[JSON_LAYER_ID], layer_json[JSON_LAYER_HEIGHT], layer_json[JSON_LAYER_PRINT_Z], layer_json[JSON_LAYER_SLICE_Z]);
|
||||
if (!new_tree_support_layer) {
|
||||
BOOST_LOG_TRIVIAL(error) <<__FUNCTION__<< boost::format(":add_support_layer failed, out of memory");
|
||||
return CLI_OUT_OF_MEMORY;
|
||||
}
|
||||
if (previous_tree_support_layer) {
|
||||
previous_tree_support_layer->upper_layer = new_tree_support_layer;
|
||||
new_tree_support_layer->lower_layer = previous_tree_support_layer;
|
||||
}
|
||||
previous_tree_support_layer = new_tree_support_layer;
|
||||
}
|
||||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__<< boost::format(": finished load support_layers, start to load treesupport_layers.");
|
||||
tbb::parallel_for(
|
||||
tbb::blocked_range<size_t>(0, obj->tree_support_layer_count()),
|
||||
[&root_json, &obj](const tbb::blocked_range<size_t>& tree_support_layer_range) {
|
||||
for (size_t layer_index = tree_support_layer_range.begin(); layer_index < tree_support_layer_range.end(); ++ layer_index) {
|
||||
const json& layer_json = root_json[JSON_TREE_SUPPORT_LAYERS][layer_index];
|
||||
TreeSupportLayer* tree_support_layer = obj->get_tree_support_layer(layer_index);
|
||||
extract_tree_support_layer(layer_json, *tree_support_layer);
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
count ++;
|
||||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__<< boost::format(": load object %1% from %2% successfully.")%count%object_filenames[obj_index].first;
|
||||
}
|
||||
|
|
@ -3489,4 +3325,4 @@ int Print::load_cached_data(const std::string& directory)
|
|||
return ret;
|
||||
}
|
||||
|
||||
} // namespace Slic3r
|
||||
} // namespace Slic3r
|
||||
Loading…
Add table
Add a link
Reference in a new issue