Commit 3f6f6107 authored by schurade's avatar schurade
Browse files

[Merge] with 5e6af559731ef98c8299b1abcbd1037bd0636665

parents 22090386 a6912804
......@@ -134,6 +134,7 @@ void WKernel::threadMain()
// default modules
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( "Fiber Display Module" ) ) , true );
// actually there is nothing more to do here
waitForStop();
......
......@@ -34,7 +34,6 @@
#include "../../dataHandler/io/WIOTools.hpp"
#include "../../dataHandler/WDataTexture3D.h"
#include "WMData.h"
WMData::WMData():
......
......@@ -94,6 +94,12 @@ osg::ref_ptr< osg::Geode > WMFiberDisplay::genFiberGeode(
return geode;
}
void WMFiberDisplay::connectToGui()
{
WKernel::getRunningKernel()->getGui()->connectProperties( m_properties );
WKernel::getRunningKernel()->getGui()->addModuleToBrowser( shared_from_this() );
}
void WMFiberDisplay::moduleMain()
{
// ready();
......
......@@ -73,6 +73,12 @@ public:
*/
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:
/**
* 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