Skip to content
Snippets Groups Projects
Commit f8dcf462 authored by Joseph Mirabel's avatar Joseph Mirabel Committed by Joseph Mirabel
Browse files

Remove OSGWidget::attachToWindow and BodyTreeItem::attachToWindow

parent e1dc0d0b
No related branches found
No related tags found
No related merge requests found
......@@ -56,7 +56,6 @@ namespace gepetto {
virtual void onHome();
void addFloor();
void attachToWindow (const std::string nodeName);
protected:
virtual void paintEvent(QPaintEvent* event);
......
......@@ -270,9 +270,8 @@ namespace gepetto {
osg()->addSceneToWindow("hpp-gui", centralWidget_->windowID());
connect(ui_->actionAdd_floor, SIGNAL (triggered()), centralWidget_, SLOT (addFloor()));
actionSearchBar_->addAction(new NodeAction("Attach camera to selected node", osgWidget, this));
}
actionSearchBar_->addAction(new NodeAction("Attach camera " + osgWidget->objectName() + " to selected node", osgWidget, this));
osgWidget->addAction(actionSearchBar_->showAction());
osgWindows_.append(osgWidget);
}
......
......@@ -79,7 +79,7 @@ namespace gepetto {
n->setVisibilityMode(graphics::ALWAYS_ON_TOP);
break;
case ATTACH_TO_WINDOW:
window_->attachToWindow(n->getID());
window_->osg()->addSceneToWindow(n->getID(), window_->windowID());
break;
case ATTACH_CAMERA_TO_NODE:
window_->osg()->osgFrameMutex().lock();
......
......@@ -200,10 +200,5 @@ namespace gepetto {
{
wsm_->addFloor("hpp-gui/floor");
}
void OSGWidget::attachToWindow(const std::string nodeName)
{
wsm_->addSceneToWindow(nodeName, wid_);
}
} // namespace gui
} // namespace gepetto
......@@ -106,11 +106,6 @@ namespace gepetto {
mode.toLocal8Bit().data());
}
void BodyTreeItem::attachToWindow(unsigned int windowID)
{
MainWindow::instance()->osg()->addSceneToWindow (node_->getID(), windowID);
}
void BodyTreeItem::removeFromGroup()
{
if (parentGroup_.empty()) return;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment