Commit 6afb252c authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum
Browse files

[CHANGE] - modules now also provide the new WProperties2 and WPropertyVariable interface

parent 1e180271
......@@ -62,6 +62,7 @@ WModule::WModule():
{
// initialize members
m_properties = boost::shared_ptr< WProperties >( new WProperties() );
m_properties2 = boost::shared_ptr< WProperties2 >( new WProperties2() );
m_container = boost::shared_ptr< WModuleContainer >();
m_progress = boost::shared_ptr< WProgressCombiner >( new WProgressCombiner() );
......@@ -299,6 +300,11 @@ boost::shared_ptr< WProperties > WModule::getProperties() const
return m_properties;
}
boost::shared_ptr< WProperties2 > WModule::getProperties2() const
{
return m_properties2;
}
boost::shared_ptr< WProgressCombiner > WModule::getRootProgressCombiner()
{
return m_progress;
......
......@@ -44,6 +44,7 @@
#include "../common/WLogger.h"
#include "../common/WProperties.h"
#include "../common/WProperties2.h"
#include "../common/WProgressCombiner.h"
#include "../common/WProgress.h"
#include "../common/WThreadedRunner.h"
......@@ -116,10 +117,19 @@ public:
boost::shared_ptr< WModuleOutputConnector > getOutputConnector( std::string name ) const;
/**
* Return a pointer to the properties object of the module
* Return a pointer to the properties object of the module.
*
* \return the properties
*/
boost::shared_ptr< WProperties > getProperties() const;
/**
* Return a pointer to the properties object of the module.
*
* \return the properties.
*/
boost::shared_ptr< WProperties2 > getProperties2() const;
/**
* Determines whether the module instance is properly initialized.
*
......@@ -362,6 +372,11 @@ protected:
*/
boost::shared_ptr< WProperties > m_properties;
/**
* The property object for the module.
*/
boost::shared_ptr< WProperties2 > m_properties2;
/**
* Progress indicator used as parent for all progress' of this module.
*/
......
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