Commit a6912804 authored by Mathias Goldau's avatar Mathias Goldau
Browse files

[ADD #157] Fiber Display Module loads now automatically

parent 22e42c45
...@@ -134,6 +134,7 @@ void WKernel::threadMain() ...@@ -134,6 +134,7 @@ void WKernel::threadMain()
// default modules // default modules
m_moduleContainer->add( m_moduleFactory->create( m_moduleFactory->getPrototypeByName( "Navigation Slice Module" ) ) , true ); m_moduleContainer->add( m_moduleFactory->create( m_moduleFactory->getPrototypeByName( "Navigation Slice Module" ) ) , true );
m_moduleContainer->add( m_moduleFactory->create( m_moduleFactory->getPrototypeByName( "Coordinate System Module" ) ) , true ); m_moduleContainer->add( m_moduleFactory->create( m_moduleFactory->getPrototypeByName( "Coordinate System Module" ) ) , true );
m_moduleContainer->add( m_moduleFactory->create( m_moduleFactory->getPrototypeByName( "Fiber Display Module" ) ) , true );
// actually there is nothing more to do here // actually there is nothing more to do here
waitForStop(); waitForStop();
......
...@@ -82,8 +82,6 @@ void WMData::connectors() ...@@ -82,8 +82,6 @@ void WMData::connectors()
void WMData::properties() void WMData::properties()
{ {
// properties
// filename of file to load and handle // filename of file to load and handle
m_properties->addString( "filename" ); m_properties->addString( "filename" );
m_properties->hideProperty( "filename" ); m_properties->hideProperty( "filename" );
......
...@@ -94,6 +94,12 @@ osg::ref_ptr< osg::Geode > WMFiberDisplay::genFiberGeode( ...@@ -94,6 +94,12 @@ osg::ref_ptr< osg::Geode > WMFiberDisplay::genFiberGeode(
return geode; return geode;
} }
void WMFiberDisplay::connectToGui()
{
WKernel::getRunningKernel()->getGui()->connectProperties( m_properties );
WKernel::getRunningKernel()->getGui()->addModuleToBrowser( shared_from_this() );
}
void WMFiberDisplay::moduleMain() void WMFiberDisplay::moduleMain()
{ {
// ready(); // ready();
......
...@@ -73,6 +73,12 @@ public: ...@@ -73,6 +73,12 @@ public:
*/ */
virtual boost::shared_ptr< WModule > factory() const; virtual boost::shared_ptr< WModule > factory() const;
/**
* Takes all the relevant GUI signals and connects them to own member functions.
* NOTE: this is only temporal. See ticket 142.
*/
virtual void connectToGui();
protected: protected:
/** /**
* Entry point after loading the module. Runs in separate thread. * Entry point after loading the module. Runs in separate thread.
......
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