Commit 67507638 authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum
Browse files

[CHANGE] - modified connectors

parent 5aa68e7e
...@@ -209,7 +209,7 @@ std::set< boost::shared_ptr< WModule > > WModuleFactory::getCompatiblePrototypes ...@@ -209,7 +209,7 @@ std::set< boost::shared_ptr< WModule > > WModuleFactory::getCompatiblePrototypes
} }
// check whether the outputs are compatible with the inputs of the prototypes // check whether the outputs are compatible with the inputs of the prototypes
if ( ( *cons.begin() )->connectable( *pcons.begin() ) ) if ( ( *cons.begin() )->connectable( *pcons.begin() ) && ( *pcons.begin() )->connectable( *cons.begin() ) )
{ {
// it is compatible -> add to list // it is compatible -> add to list
compatibles.insert( *listIter ); compatibles.insert( *listIter );
......
...@@ -102,8 +102,8 @@ void WMDistanceMap::connectors() ...@@ -102,8 +102,8 @@ void WMDistanceMap::connectors()
{ {
// initialize connectors // initialize connectors
m_input = boost::shared_ptr<WModuleInputData< boost::shared_ptr< WDataSet > > >( m_input = boost::shared_ptr<WModuleInputData< WDataSet > >(
new WModuleInputData< boost::shared_ptr< WDataSet > >( shared_from_this(), new WModuleInputData< WDataSet >( shared_from_this(),
"in", "Dataset to compute isosurface for." ) "in", "Dataset to compute isosurface for." )
); );
......
...@@ -88,7 +88,7 @@ protected: ...@@ -88,7 +88,7 @@ protected:
virtual void properties(); virtual void properties();
private: private:
boost::shared_ptr< WModuleInputData< boost::shared_ptr< WDataSet > > > m_input; //!< Input connector required by this module. boost::shared_ptr< WModuleInputData< WDataSet > > m_input; //!< Input connector required by this module.
/** /**
* Function to create a distance map from Anatomy data set. * Function to create a distance map from Anatomy data set.
......
...@@ -168,8 +168,8 @@ void WMMarchingCubes::connectors() ...@@ -168,8 +168,8 @@ void WMMarchingCubes::connectors()
{ {
// initialize connectors // initialize connectors
m_input = boost::shared_ptr<WModuleInputData< boost::shared_ptr< WDataSet > > >( m_input = boost::shared_ptr<WModuleInputData< WDataSetSingle > >(
new WModuleInputData< boost::shared_ptr< WDataSet > >( shared_from_this(), new WModuleInputData< WDataSetSingle >( shared_from_this(),
"in", "Dataset to compute isosurface for." ) "in", "Dataset to compute isosurface for." )
); );
......
...@@ -181,7 +181,7 @@ private: ...@@ -181,7 +181,7 @@ private:
*/ */
void renderMesh( WTriangleMesh* mesh ); void renderMesh( WTriangleMesh* mesh );
boost::shared_ptr< WModuleInputData< boost::shared_ptr< WDataSet > > > m_input; //!< Input connector required by this module. boost::shared_ptr< WModuleInputData< WDataSetSingle > > m_input; //!< Input connector required by this module.
static const unsigned int m_edgeTable[256]; //!< Lookup table for edges used in the construction of the isosurface. static const unsigned int m_edgeTable[256]; //!< Lookup table for edges used in the construction of the isosurface.
static const int m_triTable[256][16]; //!< Lookup table for triangles used in the construction of the isosurface. static const int m_triTable[256][16]; //!< Lookup table for triangles used in the construction of the isosurface.
......
...@@ -89,8 +89,8 @@ void WMNavSlices::connectors() ...@@ -89,8 +89,8 @@ void WMNavSlices::connectors()
// initialize connectors // initialize connectors
// XXX to add a new connector and to offer it, these simple steps need to be done // XXX to add a new connector and to offer it, these simple steps need to be done
// initialize it first // initialize it first
m_input= boost::shared_ptr<WModuleInputData<std::list<boost::shared_ptr<WDataSet> > > >( m_input= boost::shared_ptr<WModuleInputData< WDataSet > >(
new WModuleInputData<std::list<boost::shared_ptr<WDataSet> > >( shared_from_this(), new WModuleInputData< WDataSet >( shared_from_this(),
"in1", "List of datasets to show on the slices." ) "in1", "List of datasets to show on the slices." )
); );
......
...@@ -159,7 +159,7 @@ private: ...@@ -159,7 +159,7 @@ private:
/** /**
* Input connector required by this module. * Input connector required by this module.
*/ */
boost::shared_ptr<WModuleInputData<std::list<boost::shared_ptr<WDataSet> > > > m_input; boost::shared_ptr<WModuleInputData< WDataSet > > m_input;
/** /**
* lock to prevent concurrent threads trying to update the osg node * lock to prevent concurrent threads trying to update the osg node
......
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