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

New selection -> removed select by parts

Browse source
This commit is contained in:
Enrico Turri 2018-10-09 09:07:49 +02:00
parent 928c146aef
commit 47fc109837
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/slic3r/GUI/Plater.cpp
View file

@ -689,7 +689,9 @@ struct Plater::priv
void on_action_cut(SimpleEvent&); void on_action_cut(SimpleEvent&);
void on_action_settings(SimpleEvent&); void on_action_settings(SimpleEvent&);
void on_action_layersediting(SimpleEvent&); void on_action_layersediting(SimpleEvent&);
#if !ENABLE_EXTENDED_SELECTION
void on_action_selectbyparts(SimpleEvent&); void on_action_selectbyparts(SimpleEvent&);
#endif // !ENABLE_EXTENDED_SELECTION
void on_viewport_changed(SimpleEvent&); void on_viewport_changed(SimpleEvent&);
void on_right_click(Vec2dEvent&); void on_right_click(Vec2dEvent&);
@ -803,7 +805,9 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) :
canvas3D->Bind(EVT_GLTOOLBAR_CUT, &priv::on_action_cut, this); canvas3D->Bind(EVT_GLTOOLBAR_CUT, &priv::on_action_cut, this);
canvas3D->Bind(EVT_GLTOOLBAR_SETTINGS, &priv::on_action_settings, this); canvas3D->Bind(EVT_GLTOOLBAR_SETTINGS, &priv::on_action_settings, this);
canvas3D->Bind(EVT_GLTOOLBAR_LAYERSEDITING, &priv::on_action_layersediting, this); canvas3D->Bind(EVT_GLTOOLBAR_LAYERSEDITING, &priv::on_action_layersediting, this);
#if !ENABLE_EXTENDED_SELECTION
canvas3D->Bind(EVT_GLTOOLBAR_SELECTBYPARTS, &priv::on_action_selectbyparts, this); canvas3D->Bind(EVT_GLTOOLBAR_SELECTBYPARTS, &priv::on_action_selectbyparts, this);
#endif // !ENABLE_EXTENDED_SELECTION
// Preview events: // Preview events:
preview->get_wxglcanvas()->Bind(EVT_GLCANVAS_VIEWPORT_CHANGED, &priv::on_viewport_changed, this); preview->get_wxglcanvas()->Bind(EVT_GLCANVAS_VIEWPORT_CHANGED, &priv::on_viewport_changed, this);
@ -1156,15 +1160,20 @@ void Plater::priv::selection_changed()
_3DScene::enable_toolbar_item(canvas3D, "layersediting", layers_height_allowed); _3DScene::enable_toolbar_item(canvas3D, "layersediting", layers_height_allowed);
#if !ENABLE_EXTENDED_SELECTION
bool can_select_by_parts = false; bool can_select_by_parts = false;
#endif // !ENABLE_EXTENDED_SELECTION
if (have_sel) { if (have_sel) {
const auto *model_object = model.objects[*obj_idx]; const auto *model_object = model.objects[*obj_idx];
#if !ENABLE_EXTENDED_SELECTION
// XXX: ? // XXX: ?
can_select_by_parts = *obj_idx < 1000 && model_object->volumes.size() > 1; can_select_by_parts = *obj_idx < 1000 && model_object->volumes.size() > 1;
#endif // !ENABLE_EXTENDED_SELECTION
_3DScene::enable_toolbar_item(canvas3D, "fewer", model_object->instances.size() > 1); _3DScene::enable_toolbar_item(canvas3D, "fewer", model_object->instances.size() > 1);
} }
#if !ENABLE_EXTENDED_SELECTION
if (can_select_by_parts) { if (can_select_by_parts) {
// first disable to let the item in the toolbar to switch to the unpressed state // XXX: ? // first disable to let the item in the toolbar to switch to the unpressed state // XXX: ?
_3DScene::enable_toolbar_item(canvas3D, "selectbyparts", false); _3DScene::enable_toolbar_item(canvas3D, "selectbyparts", false);
@ -1173,6 +1182,7 @@ void Plater::priv::selection_changed()
_3DScene::enable_toolbar_item(canvas3D, "selectbyparts", false); _3DScene::enable_toolbar_item(canvas3D, "selectbyparts", false);
_3DScene::set_select_by(canvas3D, "object"); _3DScene::set_select_by(canvas3D, "object");
} }
#endif // !ENABLE_EXTENDED_SELECTION
if (have_sel) { if (have_sel) {
const auto *model_object = model.objects[*obj_idx]; const auto *model_object = model.objects[*obj_idx];
@ -1398,11 +1408,12 @@ void Plater::priv::on_action_layersediting(SimpleEvent&)
// TODO // TODO
} }
#if !ENABLE_EXTENDED_SELECTION
void Plater::priv::on_action_selectbyparts(SimpleEvent&) void Plater::priv::on_action_selectbyparts(SimpleEvent&)
{ {
// TODO // TODO
} }
#endif // !ENABLE_EXTENDED_SELECTION
void Plater::priv::on_viewport_changed(SimpleEvent& evt) void Plater::priv::on_viewport_changed(SimpleEvent& evt)
{ {