Commit 439b44cb authored by Mathias Goldau's avatar Mathias Goldau
Browse files

[CHANGE #165] Inlining function candidates of the fiber modules made inline.

parent 1ec7c317
......@@ -42,11 +42,6 @@ WFiberCluster::WFiberCluster( size_t index, const boost::shared_ptr< WDataSetFib
m_fibs = fibs;
}
bool WFiberCluster::empty() const
{
return m_memberIndices.empty();
}
void WFiberCluster::merge( WFiberCluster& other ) // NOLINT
{
std::list< size_t >::const_iterator cit = other.m_memberIndices.begin();
......@@ -90,26 +85,6 @@ void WFiberCluster::updateClusterIndices( std::vector< size_t >& cid, // NOLINT
}
}
void WFiberCluster::sort()
{
m_memberIndices.sort();
}
size_t WFiberCluster::size() const
{
return m_memberIndices.size();
}
void WFiberCluster::clear()
{
m_memberIndices.clear();
}
void WFiberCluster::setColor( WColor color )
{
m_color = color;
}
// void WFiberCluster::paintIntoFgePrimitive( FgeLineStrips *lstrips) const
// {
// typedef std::vector< FArray > Fiber;
......@@ -133,24 +108,3 @@ void WFiberCluster::setColor( WColor color )
// paintIntoFgePrimitive( lstrips );
// return lstrips;
// }
bool WFiberCluster::operator==( const WFiberCluster& other ) const
{
return m_memberIndices == other.m_memberIndices;
}
bool WFiberCluster::operator!=( const WFiberCluster& other ) const
{
return m_memberIndices != other.m_memberIndices;
}
const std::list< size_t > WFiberCluster::getIndices() const
{
return m_memberIndices;
}
std::ostream& operator<<( std::ostream& os, const WFiberCluster& c )
{
using string_utils::operator<<;
return os << c.getIndices();
}
......@@ -145,6 +145,50 @@ private:
WColor m_color;
};
std::ostream& operator<<( std::ostream& os, const WFiberCluster& c );
inline bool WFiberCluster::empty() const
{
return m_memberIndices.empty();
}
inline void WFiberCluster::sort()
{
m_memberIndices.sort();
}
inline size_t WFiberCluster::size() const
{
return m_memberIndices.size();
}
inline void WFiberCluster::clear()
{
m_memberIndices.clear();
}
inline void WFiberCluster::setColor( WColor color )
{
m_color = color;
}
inline bool WFiberCluster::operator==( const WFiberCluster& other ) const
{
return m_memberIndices == other.m_memberIndices;
}
inline bool WFiberCluster::operator!=( const WFiberCluster& other ) const
{
return m_memberIndices != other.m_memberIndices;
}
inline const std::list< size_t > WFiberCluster::getIndices() const
{
return m_memberIndices;
}
inline std::ostream& operator<<( std::ostream& os, const WFiberCluster& c )
{
using string_utils::operator<<;
return os << c.getIndices();
}
#endif // WFIBERCLUSTER_H
......@@ -58,16 +58,6 @@ WMFiberClustering::~WMFiberClustering()
{
}
const std::string WMFiberClustering::getName() const
{
return std::string( "FiberClustering" );
}
const std::string WMFiberClustering::getDescription() const
{
return std::string( "Clusters fibers from a WDataSetFibers" );
}
void WMFiberClustering::threadMain()
{
boost::shared_ptr< WDataHandler > dataHandler;
......
......@@ -139,4 +139,14 @@ private:
size_t m_lastFibsSize;
};
inline const std::string WMFiberClustering::getName() const
{
return std::string( "FiberClustering" );
}
inline const std::string WMFiberClustering::getDescription() const
{
return std::string( "Clusters fibers from a WDataSetFibers" );
}
#endif // WMFIBERCLUSTERING_H
......@@ -54,16 +54,6 @@ WMFiberCulling::~WMFiberCulling()
{
}
const std::string WMFiberCulling::getName() const
{
return std::string( "FiberCulling" );
}
const std::string WMFiberCulling::getDescription() const
{
return std::string( "Removes or culls out fibers from a WDataSetFibers" );
}
void WMFiberCulling::threadMain()
{
boost::shared_ptr< WDataHandler > dataHandler;
......
......@@ -70,6 +70,13 @@ protected:
*/
virtual void threadMain();
/**
* Detect and removes fibers that have a short distance in terms of the
* dSt metric and are below the threshold given via the member
* m_dSt_culling_t.
*
* \param fibers Fiber dataset, which should be processed.
*/
virtual void cullOutFibers( boost::shared_ptr< WDataSetFibers > fibers );
/**
......@@ -87,4 +94,14 @@ protected:
private:
};
inline const std::string WMFiberCulling::getName() const
{
return std::string( "FiberCulling" );
}
inline const std::string WMFiberCulling::getDescription() const
{
return std::string( "Removes or culls out fibers from a WDataSetFibers" );
}
#endif // WMFIBERCULLING_H
......@@ -47,16 +47,6 @@ WMFiberDisplay::~WMFiberDisplay()
{
}
const std::string WMFiberDisplay::getName() const
{
return std::string( "FiberTestModule" );
}
const std::string WMFiberDisplay::getDescription() const
{
return std::string( "Draws fibers out of a WDataSetFibers" );
}
osg::ref_ptr< osg::Geode > WMFiberDisplay::genFiberGeode( const wmath::WFiber &fib ) const
{
using osg::ref_ptr;
......
......@@ -78,4 +78,14 @@ protected:
private:
};
inline const std::string WMFiberDisplay::getName() const
{
return std::string( "FiberTestModule" );
}
inline const std::string WMFiberDisplay::getDescription() const
{
return std::string( "Draws fibers out of a WDataSetFibers" );
}
#endif // WMFIBERDISPLAY_H
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