From 712e37c85216c6099c6685aa566c87f5dc17df03 Mon Sep 17 00:00:00 2001
From: Joseph Mirabel <jmirabel@laas.fr>
Date: Thu, 2 Apr 2015 16:18:34 +0200
Subject: [PATCH] Do not pass a GraphicsContext to WindowsManager::createWindow
---
.../gepetto/viewer/corba/windows-manager.h | 3 +-
src/windows-manager.cpp | 30 +++++++++----------
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/include/gepetto/viewer/corba/windows-manager.h b/include/gepetto/viewer/corba/windows-manager.h
index fd78813..f05bee8 100644
--- a/include/gepetto/viewer/corba/windows-manager.h
+++ b/include/gepetto/viewer/corba/windows-manager.h
@@ -67,6 +67,7 @@ namespace graphics {
\brief Default constructor
*/
WindowsManager ();
+ WindowID addWindow (std::string winName, WindowManagerPtr_t newWindow);
public:
static WindowsManagerPtr_t create ();
@@ -77,7 +78,7 @@ namespace graphics {
virtual bool setRate(const int& rate);
virtual void refresh();
- virtual WindowID createWindow(const char* windowNameCorba, osg::GraphicsContext* gc = 0);
+ virtual WindowID createWindow(const char* windowNameCorba);
virtual WindowID getWindowID (const char* windowNameCorba);
virtual void createScene(const char* sceneNameCorba);
diff --git a/src/windows-manager.cpp b/src/windows-manager.cpp
index 2c5498c..dd2ce36 100644
--- a/src/windows-manager.cpp
+++ b/src/windows-manager.cpp
@@ -41,6 +41,15 @@ namespace graphics {
{
}
+ WindowsManager::WindowID WindowsManager::addWindow (std::string winName,
+ WindowManagerPtr_t newWindow)
+ {
+ WindowID windowId = windowManagers_.size ();
+ windowIDmap_ [winName] = windowId;
+ windowManagers_.push_back (newWindow);
+ return windowId;
+ }
+
WindowsManagerPtr_t WindowsManager::create ()
{
WindowsManagerPtr_t shPtr (new WindowsManager());
@@ -192,23 +201,14 @@ namespace graphics {
}
}
- WindowsManager::WindowID WindowsManager::createWindow (const char* winName,
- osg::GraphicsContext* gc)
+ WindowsManager::WindowID WindowsManager::createWindow (const char* winName)
{
std::string wn (winName);
- WindowManagerPtr_t newWindow;
- if (gc == 0)
- newWindow = WindowManager::create ();
- else
- newWindow = WindowManager::create (gc);
- WindowID windowId = windowManagers_.size ();
- windowIDmap_ [wn] = windowId;
- windowManagers_.push_back (newWindow);
- if (gc == 0) {
- boost::thread refreshThread (boost::bind
- (&WindowsManager::threadRefreshing,
- this, newWindow));
- }
+ WindowManagerPtr_t newWindow = WindowManager::create ();
+ WindowID windowId = addWindow (wn, newWindow);
+ boost::thread refreshThread (boost::bind
+ (&WindowsManager::threadRefreshing,
+ this, newWindow));
return windowId;
}
--
GitLab