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

Suppress to switch to SLA-technology printer, if an object has a modifier(s)

Browse source 
+ WIP: ptSLA : Hide modifiers on 3DScene.
Waiting for @enricoturri1966 review/reworking
This commit is contained in:
YuSanka 2022-12-15 11:21:41 +01:00
parent 999c49c8e8
commit 473c8a26a4
6 changed files with 59 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/slic3r/GUI/Selection.cpp
View file

@ -157,6 +157,11 @@ void Selection::add(unsigned int volume_idx, bool as_single_selection, bool chec
return;
const GLVolume* volume = (*m_volumes)[volume_idx];
if (wxGetApp().plater()->printer_technology() == ptSLA && volume->is_modifier &&
m_model->objects[volume->object_idx()]->volumes[volume->volume_idx()]->is_modifier())
return;
// wipe tower is already selected
if (is_wipe_tower() && volume->is_wipe_tower)
return;
@ -482,8 +487,14 @@ void Selection::instances_changed(const std::vector<size_t> &instance_ids_select
assert(m_valid);
assert(m_mode == Instance);
m_list.clear();
const PrinterTechnology pt = wxGetApp().plater()->printer_technology();
for (unsigned int volume_idx = 0; volume_idx < (unsigned int)m_volumes->size(); ++ volume_idx) {
const GLVolume *volume = (*m_volumes)[volume_idx];
if (pt == ptSLA && volume->is_modifier &&
m_model->objects[volume->object_idx()]->volumes[volume->volume_idx()]->is_modifier())
continue;
auto it = std::lower_bound(instance_ids_selected.begin(), instance_ids_selected.end(), volume->geometry_id.second);
if (it != instance_ids_selected.end() && *it == volume->geometry_id.second)
this->do_add_volume(volume_idx);
@ -1940,9 +1951,16 @@ std::vector<unsigned int> Selection::get_volume_idxs_from_object(unsigned int ob
{
std::vector<unsigned int> idxs;
const PrinterTechnology pt = wxGetApp().plater()->printer_technology();
for (unsigned int i = 0; i < (unsigned int)m_volumes->size(); ++i) {
if ((*m_volumes)[i]->object_idx() == (int)object_idx)
const GLVolume* v = (*m_volumes)[i];
if (v->object_idx() == (int)object_idx) {
if (pt == ptSLA && v->is_modifier &&
m_model->objects[object_idx]->volumes[v->volume_idx()]->is_modifier())
continue;
idxs.push_back(i);
}
}
return idxs;
@ -1952,8 +1970,13 @@ std::vector<unsigned int> Selection::get_volume_idxs_from_instance(unsigned int
{
std::vector<unsigned int> idxs;
const PrinterTechnology pt = wxGetApp().plater()->printer_technology();
for (unsigned int i = 0; i < (unsigned int)m_volumes->size(); ++i) {
const GLVolume* v = (*m_volumes)[i];
if (pt == ptSLA && v->is_modifier &&
m_model->objects[object_idx]->volumes[i]->is_modifier())
continue;
if (v->object_idx() == (int)object_idx && v->instance_idx() == (int)instance_idx)
idxs.push_back(i);
}
@ -2911,7 +2934,12 @@ bool Selection::is_from_fully_selected_instance(unsigned int volume_idx) const
return false;
unsigned int count = (unsigned int)std::count_if(m_list.begin(), m_list.end(), SameInstance(object_idx, volume->instance_idx(), *m_volumes));
return count == (unsigned int)m_model->objects[object_idx]->volumes.size();
PrinterTechnology pt = wxGetApp().plater()->printer_technology();
const ModelVolumePtrs& volumes = m_model->objects[object_idx]->volumes;
const unsigned int vol_cnt = (unsigned int)std::count_if(volumes.begin(), volumes.end(), [pt](const ModelVolume* volume) { return pt == ptFFF || !volume->is_modifier(); });
return count == vol_cnt;
}
void Selection::paste_volumes_from_clipboard()