Commit 08cc85d3 authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum
Browse files

[CHANGE] - cleaned up some TODO's

parent 0e02a0ef
......@@ -68,9 +68,6 @@ public:
*/
void reset();
// TODO(ebaum): add more default settings and camera setups here
// TODO(ebaum): actually use this class
protected:
/**
......
......@@ -36,7 +36,6 @@
#include "WGEViewer.h"
WGraphicsEngine::WGraphicsEngine( std::string shaderPath ):
WThreadedRunner(),
m_shaderPath( shaderPath )
{
WLogger::getLogger()->addLogMessage( "Initializing Graphics Engine", "GE", LL_DEBUG );
......@@ -61,16 +60,6 @@ std::string WGraphicsEngine::getShaderPath()
return m_shaderPath;
}
void WGraphicsEngine::threadMain()
{
// TODO(ebaum): is this thread actually needed since each viewer runs in separate thread
// while( !m_FinishRequested )
// {
// currently a dummy
// sleep( 1 );
// }
}
boost::shared_ptr<WGEViewer> WGraphicsEngine::createViewer(
osg::ref_ptr<WindowData> wdata, int x, int y, int width, int height, WGECamera::ProjectionMode projectionMode )
{
......
......@@ -48,7 +48,7 @@
* engine.
* \ingroup ge
*/
class WGraphicsEngine: public WThreadedRunner
class WGraphicsEngine
{
public:
......@@ -98,11 +98,6 @@ protected:
*/
osg::ref_ptr<WGEScene> m_RootNode;
/**
* Handler for repainting and event handling. Gets executed in separate thread.
*/
virtual void threadMain();
/**
* All registered viewer.
*/
......
......@@ -129,11 +129,7 @@ int WKernel::run()
{
WLogger::getLogger()->addLogMessage( "Starting Kernel", "Kernel", LL_DEBUG );
// TODO(ebaum): add separate graphics thread here
m_graphicsEngine->run();
// run Gui
// TODO(all): clean up this option handler mess
m_gui->run();
// run? data handler stuff?
......@@ -152,9 +148,6 @@ int WKernel::run()
m_FinishRequested = true;
m_moduleContainer->stop();
// finally GE
m_graphicsEngine->wait( true );
// how to get QT return code from its thread?
return 0;
}
......@@ -180,11 +173,6 @@ void WKernel::init()
// initialize Datahandler
m_dataHandler = boost::shared_ptr< WDataHandler >( new WDataHandler() );
// m_gui->createMainWindow();
// TODO(ebaum): the old way
// m_dataHandler->getSignalAddDataset()->connect( boost::bind( &WKernel::slotFinishLoadData, this, _1 ) );
}
bool WKernel::findAppPath()
......
......@@ -109,11 +109,7 @@ void WModule::initialize()
// doing it twice is not allowed
if ( isInitialized() )
{
// TODO(ebaum): is this really needed?
std::ostringstream s;
s << "Could not initialize connectors for Module " << getName() << ". Reason: already initialized.";
throw WModuleConnectorInitFailed( s.str() );
throw WModuleConnectorInitFailed( "Could not initialize connectors for Module " + getName() + ". Reason: already initialized." );
}
connectors();
......
......@@ -260,11 +260,6 @@ public:
createModules();
initModules();
// init connectors
// TODO(ebaum): replace this with the module container, since the module container should manage this
// well actually this also tests the WModule::addConnector method and instantiation of WModuleInputConnector and
// WModuleOutputConnector.
// try initializing twice
TS_ASSERT_THROWS( m1->initialize(), WModuleConnectorInitFailed );
TS_ASSERT( m1->isInitialized() );
......
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