From f8dcf462b5c739907323a46dbf8584627313e4a8 Mon Sep 17 00:00:00 2001
From: Joseph Mirabel <jmirabel@laas.fr>
Date: Tue, 6 Mar 2018 15:25:27 +0100
Subject: [PATCH] Remove OSGWidget::attachToWindow and
BodyTreeItem::attachToWindow
---
include/gepetto/gui/osgwidget.hh | 1 -
src/gui/mainwindow.cc | 3 +--
src/gui/node-action.cc | 2 +-
src/gui/osgwidget.cc | 5 -----
src/gui/tree-item.cc | 5 -----
5 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/include/gepetto/gui/osgwidget.hh b/include/gepetto/gui/osgwidget.hh
index 1e78a03..d4769c0 100644
--- a/include/gepetto/gui/osgwidget.hh
+++ b/include/gepetto/gui/osgwidget.hh
@@ -56,7 +56,6 @@ namespace gepetto {
virtual void onHome();
void addFloor();
- void attachToWindow (const std::string nodeName);
protected:
virtual void paintEvent(QPaintEvent* event);
diff --git a/src/gui/mainwindow.cc b/src/gui/mainwindow.cc
index 92dfd5f..9ab2306 100644
--- a/src/gui/mainwindow.cc
+++ b/src/gui/mainwindow.cc
@@ -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);
}
diff --git a/src/gui/node-action.cc b/src/gui/node-action.cc
index d3eaf15..a6cc319 100644
--- a/src/gui/node-action.cc
+++ b/src/gui/node-action.cc
@@ -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();
diff --git a/src/gui/osgwidget.cc b/src/gui/osgwidget.cc
index 73a83ca..d5ce8e9 100644
--- a/src/gui/osgwidget.cc
+++ b/src/gui/osgwidget.cc
@@ -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
diff --git a/src/gui/tree-item.cc b/src/gui/tree-item.cc
index 9ad0d14..75fbf0f 100644
--- a/src/gui/tree-item.cc
+++ b/src/gui/tree-item.cc
@@ -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;
--
GitLab