suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ improve MeshSelection class

Browse Source
This commit is contained in:
wmayer 2016-03-31 13:35:55 +02:00
parent 7dbcbc0f76
commit 031711120d
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Mod/Mesh/Gui/MeshSelection.cpp
View File

@ -76,19 +76,28 @@ unsigned char MeshSelection::cross_mask_bitmap[] = {
};
MeshSelection::MeshSelection()
: onlyPointToUserTriangles(false), onlyVisibleTriangles(false), _activeCB(0)
: onlyPointToUserTriangles(false)
, onlyVisibleTriangles(false)
, activeCB(0)
, selectionCB(0)
{
setCallback(selectGLCallback);
}
MeshSelection::~MeshSelection()
{
if (_activeCB) {
if (this->activeCB) {
Gui::View3DInventorViewer* viewer = this->getViewer();
if (viewer)
stopInteractiveCallback(viewer);
}
}
void MeshSelection::setCallback(SoEventCallbackCB *cb)
{
selectionCB = cb;
}
void MeshSelection::setObjects(const std::vector<Gui::SelectionObject>& obj)
{
meshObjects = obj;
@ -145,22 +154,20 @@ Gui::View3DInventorViewer* MeshSelection::getViewer() const
void MeshSelection::startInteractiveCallback(Gui::View3DInventorViewer* viewer,SoEventCallbackCB *cb)
{
if (this->_activeCB)
if (this->activeCB)
return;
viewer->setEditing(true);
viewer->addEventCallback(SoMouseButtonEvent::getClassTypeId(), cb, this);
this->_activeCB = cb;
this->activeCB = cb;
}
void MeshSelection::stopInteractiveCallback(Gui::View3DInventorViewer* viewer)
{
if (!this->_activeCB)
if (!this->activeCB)
return;
if (viewer->isEditing()) {
viewer->setEditing(false);
viewer->removeEventCallback(SoMouseButtonEvent::getClassTypeId(), this->_activeCB, this);
this->_activeCB = 0;
}
viewer->setEditing(false);
viewer->removeEventCallback(SoMouseButtonEvent::getClassTypeId(), this->activeCB, this);
this->activeCB = 0;
}
void MeshSelection::prepareBrushSelection(bool add,SoEventCallbackCB *cb)
@ -168,6 +175,8 @@ void MeshSelection::prepareBrushSelection(bool add,SoEventCallbackCB *cb)
// a rubberband to select a rectangle area of the meshes
Gui::View3DInventorViewer* viewer = this->getViewer();
if (viewer) {
// Note: It is possible that the mouse selection mode can be stopped
// but then the callback function is still active.
stopInteractiveCallback(viewer);
startInteractiveCallback(viewer, cb);
viewer->navigationStyle()->stopSelection();
@ -189,12 +198,12 @@ void MeshSelection::prepareBrushSelection(bool add,SoEventCallbackCB *cb)
void MeshSelection::startSelection()
{
prepareBrushSelection(true, selectGLCallback);
prepareBrushSelection(true, selectionCB);
}
void MeshSelection::startDeselection()
{
prepareBrushSelection(false, selectGLCallback);
prepareBrushSelection(false, selectionCB);
}
void MeshSelection::stopSelection()

4
src/Mod/Mesh/Gui/MeshSelection.h
View File

@ -69,6 +69,7 @@ public:
std::vector<App::DocumentObject*> getObjects() const;
protected:
void setCallback(SoEventCallbackCB *cb);
std::list<ViewProviderMesh*> getViewProviders() const;
Gui::View3DInventorViewer* getViewer() const;
void prepareBrushSelection(bool,SoEventCallbackCB *cb);
@ -83,7 +84,8 @@ private:
private:
bool onlyPointToUserTriangles, onlyVisibleTriangles;
bool addToSelection, addComponent, removeComponent;
SoEventCallbackCB *_activeCB;
SoEventCallbackCB *activeCB;
SoEventCallbackCB *selectionCB;
mutable std::vector<Gui::SelectionObject> meshObjects;
static unsigned char cross_bitmap[];