Commit 376eeee1 authored by Dirk Wilden's avatar Dirk Wilden
Browse files

updatedObjects split

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@5341 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 129de7bd
......@@ -60,7 +60,6 @@ void SelectionPlugin::selectionContextMenu(QAction* _action) {
else if ( _action->text() == "Boundary")
selectBoundary( objectId );
emit activeObjectChanged();
emit updatedObject(objectId);
}
......
......@@ -31,13 +31,12 @@ void SelectionPlugin::toggleSelection(QMouseEvent* _event)
if (sourceSelection_){
object->source( !object->source() );
emit updatedObject(object->id());
emit objectSelectionChanged(object->id());
} else {
object->target( !object->target() );
emit activeObjectChanged();
emit updatedObject(object->id());
emit objectSelectionChanged(object->id());
}
}
......@@ -399,12 +398,11 @@ void SelectionPlugin::handleLassoSelection(QMouseEvent* _event, bool _volume) {
{
if (sourceSelection_){
object->source( !deselection_ );
emit updatedObject(object->id());
emit objectSelectionChanged(object->id());
} else {
object->target( !deselection_ );
emit activeObjectChanged();
emit updatedObject(object->id());
emit objectSelectionChanged(object->id());
}
}
}
......@@ -567,14 +565,14 @@ bool SelectVolumeAction::operator()(BaseNode* _node, ACG::GLState& _state)
if (plugin_->sourceSelection_){
object->source( !plugin_->deselection_ );
emit plugin_->objectSelectionChanged( object->id() );
} else {
object->target( !plugin_->deselection_ );
emit plugin_->activeObjectChanged();
emit plugin_->objectSelectionChanged( object->id() );
}
}
if (selected)
emit plugin_->updatedObject(object->id());
} else if (selected)
emit plugin_->updatedObject( object->id() );
}
return true;
}
......
......@@ -106,7 +106,7 @@ class SelectionPlugin : public QObject, BaseInterface , MouseInterface, KeyInter
//BaseInterface
void updateView();
void updatedObject(int);
void activeObjectChanged();
void objectSelectionChanged(int);
//PickingInterface
void addHiddenPickMode( const std::string _mode );
void setPickModeMouseTracking( const std::string _mode, bool _mouseTracking);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment