Commit 9953402c authored by Mathias Goldau's avatar Mathias Goldau
Browse files

[MERGE]

parents 4db9902b 7ebe619a
[usersubs]
wiebel@informatik.uni-leipzig.de = *
math@informatik.uni-leipzig.de = *
ebaum@informatik.uni-leipzig.de = *
\ No newline at end of file
......@@ -76,7 +76,7 @@ public:
virtual const T operator()() const;
/**
* Wait for the flag to change its value.
* Wait for the flag to change its value. For WConditionOneShot is also recognizes if the flag has changed before.
*/
virtual void wait() const;
......
......@@ -252,10 +252,11 @@ void WKernel::loadDataSets( std::vector< std::string > fileNames )
using boost::shared_ptr;
for( std::vector< std::string >::iterator iter = fileNames.begin(); iter != fileNames.end(); ++iter )
{
std::cout<< *iter << std::endl;
shared_ptr< WModule > mod = m_moduleFactory->create( m_moduleFactory->getPrototypeByName( "Data Module" ) );
mod->getProperties()->setValue( "filename" , ( *iter ) );
m_moduleContainer->add( mod );
// serialize loading of a couple of data sets
mod->isReady().wait();
}
}
......
......@@ -232,6 +232,11 @@ const WBoolFlag& WModule::isUseable() const
//return isInitialized() && isAssociated();
}
const WBoolFlag& WModule::isReady() const
{
return m_isReady;
}
void WModule::notifyConnectionEstablished( boost::shared_ptr< WModuleConnector > /*here*/,
boost::shared_ptr< WModuleConnector > /*there*/ )
{
......
......@@ -120,6 +120,13 @@ public:
*/
const WBoolFlag& isAssociated() const;
/**
* Checks whether this module is ready.
*
* \return true if ready.
*/
const WBoolFlag& isReady() const;
/**
* The container this module is associated with.
*
......
......@@ -46,7 +46,7 @@ MODULE_SIGNAL;
// **************************************************************************************************************************
/**
* Signal for generic events like "READY".
* Signal for generic events like "WM_READY".
*
* \param module The module emitting the signal.
*
......
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