3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#7647 - Re-enabled 'Export to STL' command for volumes. It was working in 2.3.3 and got disabled somehow.

Browse Source
This commit is contained in:
enricoturri1966 2022-01-05 10:23:48 +01:00
parent 3aad2a9f4a
commit ffe678e0ea
2 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/GUI_Factories.cpp
View File

@ -716,7 +716,7 @@ void MenuFactory::append_menu_item_export_stl(wxMenu* menu)
[](wxCommandEvent&) { plater()->export_stl(false, true); }, "", nullptr, [](wxCommandEvent&) { plater()->export_stl(false, true); }, "", nullptr,
[]() { []() {
const Selection& selection = plater()->canvas3D()->get_selection(); const Selection& selection = plater()->canvas3D()->get_selection();
return selection.is_single_full_instance() || selection.is_single_full_object(); return selection.is_single_full_instance() || selection.is_single_full_object() || selection.is_single_volume();
}, m_parent); }, m_parent);
menu->AppendSeparator(); menu->AppendSeparator();
} }

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

@ -5765,34 +5765,29 @@ void Plater::export_stl(bool extended, bool selection_only)
if (selection_only) { if (selection_only) {
const ModelObject* model_object = p->model.objects[obj_idx]; const ModelObject* model_object = p->model.objects[obj_idx];
if (selection.get_mode() == Selection::Instance) if (selection.get_mode() == Selection::Instance)
{ mesh = mesh_to_export(model_object, selection.is_single_full_object() && model_object->instances.size() > 1);
if (selection.is_single_full_object()) else {
mesh = mesh_to_export(model_object, true);
else
mesh = mesh_to_export(model_object, false);
}
else
{
const GLVolume* volume = selection.get_volume(*selection.get_volume_idxs().begin()); const GLVolume* volume = selection.get_volume(*selection.get_volume_idxs().begin());
mesh = model_object->volumes[volume->volume_idx()]->mesh(); mesh = model_object->volumes[volume->volume_idx()]->mesh();
mesh.transform(volume->get_volume_transformation().get_matrix(), true); mesh.transform(volume->get_volume_transformation().get_matrix(), true);
mesh.translate(-model_object->origin_translation.cast<float>());
} }
if (!selection.is_single_full_object() || model_object->instances.size() == 1)
mesh.translate(-model_object->origin_translation.cast<float>());
} }
else { else {
for (const ModelObject *o : p->model.objects) for (const ModelObject* o : p->model.objects) {
mesh.merge(mesh_to_export(o, true)); mesh.merge(mesh_to_export(o, true));
}
} }
} }
else else {
{
// This is SLA mode, all objects have only one volume. // This is SLA mode, all objects have only one volume.
// However, we must have a look at the backend to load // However, we must have a look at the backend to load
// hollowed mesh and/or supports // hollowed mesh and/or supports
const PrintObjects& objects = p->sla_print.objects(); const PrintObjects& objects = p->sla_print.objects();
for (const SLAPrintObject* object : objects) for (const SLAPrintObject* object : objects) {
{
const ModelObject* model_object = object->model_object(); const ModelObject* model_object = object->model_object();
if (selection_only) { if (selection_only) {
if (model_object->id() != p->model.objects[obj_idx]->id()) if (model_object->id() != p->model.objects[obj_idx]->id())
@ -5803,28 +5798,24 @@ void Plater::export_stl(bool extended, bool selection_only)
TriangleMesh pad_mesh; TriangleMesh pad_mesh;
bool has_pad_mesh = extended && object->has_mesh(slaposPad); bool has_pad_mesh = extended && object->has_mesh(slaposPad);
if (has_pad_mesh) if (has_pad_mesh) {
{
pad_mesh = object->get_mesh(slaposPad); pad_mesh = object->get_mesh(slaposPad);
pad_mesh.transform(mesh_trafo_inv); pad_mesh.transform(mesh_trafo_inv);
} }
TriangleMesh supports_mesh; TriangleMesh supports_mesh;
bool has_supports_mesh = extended && object->has_mesh(slaposSupportTree); bool has_supports_mesh = extended && object->has_mesh(slaposSupportTree);
if (has_supports_mesh) if (has_supports_mesh) {
{
supports_mesh = object->get_mesh(slaposSupportTree); supports_mesh = object->get_mesh(slaposSupportTree);
supports_mesh.transform(mesh_trafo_inv); supports_mesh.transform(mesh_trafo_inv);
} }
const std::vector<SLAPrintObject::Instance>& obj_instances = object->instances(); const std::vector<SLAPrintObject::Instance>& obj_instances = object->instances();
for (const SLAPrintObject::Instance& obj_instance : obj_instances) for (const SLAPrintObject::Instance& obj_instance : obj_instances) {
{
auto it = std::find_if(model_object->instances.begin(), model_object->instances.end(), auto it = std::find_if(model_object->instances.begin(), model_object->instances.end(),
[&obj_instance](const ModelInstance *mi) { return mi->id() == obj_instance.instance_id; }); [&obj_instance](const ModelInstance *mi) { return mi->id() == obj_instance.instance_id; });
assert(it != model_object->instances.end()); assert(it != model_object->instances.end());
if (it != model_object->instances.end()) if (it != model_object->instances.end()) {
{
bool one_inst_only = selection_only && ! selection.is_single_full_object(); bool one_inst_only = selection_only && ! selection.is_single_full_object();
int instance_idx = it - model_object->instances.begin(); int instance_idx = it - model_object->instances.begin();
@ -5834,15 +5825,13 @@ void Plater::export_stl(bool extended, bool selection_only)
TriangleMesh inst_mesh; TriangleMesh inst_mesh;
if (has_pad_mesh) if (has_pad_mesh) {
{
TriangleMesh inst_pad_mesh = pad_mesh; TriangleMesh inst_pad_mesh = pad_mesh;
inst_pad_mesh.transform(inst_transform, is_left_handed); inst_pad_mesh.transform(inst_transform, is_left_handed);
inst_mesh.merge(inst_pad_mesh); inst_mesh.merge(inst_pad_mesh);
} }
if (has_supports_mesh) if (has_supports_mesh) {
{
TriangleMesh inst_supports_mesh = supports_mesh; TriangleMesh inst_supports_mesh = supports_mesh;
inst_supports_mesh.transform(inst_transform, is_left_handed); inst_supports_mesh.transform(inst_transform, is_left_handed);
inst_mesh.merge(inst_supports_mesh); inst_mesh.merge(inst_supports_mesh);