X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FInterface%2FParameters.hxx;h=eecb2b6b08ebb74d201324a7cd79ec6039e685a1;hb=de874ea850042e77a99a456188f423c8df2e374f;hp=4b4e3424f699f8b167aa9b0fe6a7d394affb33f0;hpb=2e9a8218ec2792eb36b62731e2ae0c7dbb9ef436;p=cpPlugins.git

diff --git a/lib/cpPlugins/Interface/Parameters.hxx b/lib/cpPlugins/Interface/Parameters.hxx
index 4b4e342..eecb2b6 100644
--- a/lib/cpPlugins/Interface/Parameters.hxx
+++ b/lib/cpPlugins/Interface/Parameters.hxx
@@ -1,48 +1,18 @@
 #ifndef __CPPLUGINS__INTERFACE__PARAMETERS__HXX__
 #define __CPPLUGINS__INTERFACE__PARAMETERS__HXX__
 
-// -------------------------------------------------------------------------
-template< class I >
-void cpPlugins::Interface::Parameters::
-ConfigureAsIndex( const TString& name, const TUint& dim, const I& v )
-{
-  std::stringstream str;
-  str << v[ 0 ];
-  for( unsigned int d = 1; d < dim; ++d )
-    str << ";" << v[ d ];
-  std::string s = str.str( );
-  this->m_Parameters[ name ] =
-    TParameter( Self::Index, TValues( s, s ) );
-  this->Modified( );
-}
-
-// -------------------------------------------------------------------------
-template< class P >
-void cpPlugins::Interface::Parameters::
-ConfigureAsPoint( const TString& name, const TUint& dim, const P& v )
-{
-  std::stringstream str;
-  str << v[ 0 ];
-  for( unsigned int d = 1; d < dim; ++d )
-    str << ";" << v[ d ];
-  std::string s = str.str( );
-  this->m_Parameters[ name ] =
-    TParameter( Self::Point, TValues( s, s ) );
-  this->Modified( );
-}
-
 // -------------------------------------------------------------------------
 template< class I >
 I cpPlugins::Interface::Parameters::
-GetIndex( const TString& name, const TUint& dim ) const
+GetIndex( const std::string& name, const unsigned int& dim ) const
 {
   I v;
-  TParameters::const_iterator i = this->m_Parameters.find( name );
+  auto i = this->m_Parameters.find( name );
   if( i != this->m_Parameters.end( ) )
   {
     if( i->second.first == Self::Index )
     {
-      std::istringstream str( i->second.second.second );
+      std::istringstream str( i->second.second );
       std::string token;
       unsigned int d = 0;
       while( std::getline( str, token, ';' ) && d < dim )
@@ -66,20 +36,21 @@ GetIndex( const TString& name, const TUint& dim ) const
 // -------------------------------------------------------------------------
 template< class P >
 P cpPlugins::Interface::Parameters::
-GetPoint( const TString& name, const TUint& dim ) const
+GetPoint( const std::string& name, const unsigned int& dim ) const
 {
   P v;
-  TParameters::const_iterator i = this->m_Parameters.find( name );
+  auto i = this->m_Parameters.find( name );
   if( i != this->m_Parameters.end( ) )
   {
     if( i->second.first == Self::Point )
     {
-      std::istringstream str( i->second.second.second );
+      std::istringstream str( i->second.second );
       std::string token;
       unsigned int d = 0;
       while( std::getline( str, token, ';' ) && d < dim )
       {
-        v[ d ] = std::atof( token.c_str( ) );
+        std::istringstream tok_str( token );
+        tok_str >> v[ d ];
         d++;
 
       } // elihw
@@ -96,117 +67,211 @@ GetPoint( const TString& name, const TUint& dim ) const
 }
 
 // -------------------------------------------------------------------------
-template< class I >
-void cpPlugins::Interface::Parameters::
-GetIndexList(
-  std::vector< I >& lst, const TString& name, const TUint& dim
-  ) const
+template< class V >
+V cpPlugins::Interface::Parameters::
+GetVector( const std::string& name, const unsigned int& dim ) const
 {
-  lst.clear( );
-
-  TParameters::const_iterator i = this->m_Parameters.find( name );
-  if( i == this->m_Parameters.end( ) )
-    return;
-  if( i->second.first == Self::IndexList )
-    return;
-
-  std::istringstream str( i->second.second.second );
-  std::string token;
-  unsigned int d = 0;
-  while( std::getline( str, token, '#' ) )
+  V v;
+  auto i = this->m_Parameters.find( name );
+  if( i != this->m_Parameters.end( ) )
   {
-    std::istringstream str2( token );
-    std::string token2;
-    unsigned int d = 0;
-    I v;
-    while( std::getline( str2, token2, ';' ) && d < dim )
+    if( i->second.first == Self::Vector )
     {
-      v[ d ] = std::atoi( token.c_str( ) );
-      d++;
+      std::istringstream str( i->second.second );
+      std::string token;
+      unsigned int d = 0;
+      while( std::getline( str, token, ';' ) && d < dim )
+      {
+        std::istringstream tok_str( token );
+        tok_str >> v[ d ];
+        d++;
 
-    } // elihw
-    lst.push_back( v );
+      } // elihw
+      return( v );
+
+    } // fi
 
-  } // elihw
+  } // fi
+
+  // If parameter not found
+  for( unsigned int d = 0; d < dim; ++d )
+    v[ d ] = float( 0 );
+  return( v );
 }
 
 // -------------------------------------------------------------------------
-template< class P >
+template< class I >
 void cpPlugins::Interface::Parameters::
-GetPointList(
-  std::vector< P >& lst, const TString& name, const TUint& dim
-  ) const
+SetIndex( const std::string& name, const unsigned int& dim, const I& v )
 {
-  lst.clear( );
-
-  TParameters::const_iterator i = this->m_Parameters.find( name );
+  TParameters::iterator i = this->m_Parameters.find( name );
   if( i == this->m_Parameters.end( ) )
     return;
-  if( i->second.first == Self::PointList )
+  if( i->second.first != Self::Index )
     return;
 
-  std::istringstream str( i->second.second.second );
-  std::string token;
-  unsigned int d = 0;
-  while( std::getline( str, token, '#' ) )
-  {
-    std::istringstream str2( token );
-    std::string token2;
-    unsigned int d = 0;
-    P v;
-    while( std::getline( str2, token2, ';' ) && d < dim )
-    {
-      v[ d ] = std::atof( token.c_str( ) );
-      d++;
-
-    } // elihw
-    lst.push_back( v );
-
-  } // elihw
+  std::stringstream str;
+  str << v[ 0 ];
+  for( unsigned int d = 1; d < dim; ++d )
+    str << ";" << v[ d ];
+  i->second.second = str.str( );
+  this->Modified( );
 }
 
 // -------------------------------------------------------------------------
-template< class I >
+template< class P >
 void cpPlugins::Interface::Parameters::
-SetIndex( const TString& name, const TUint& dim, const I& v )
+SetPoint( const std::string& name, const unsigned int& dim, const P& v )
 {
   TParameters::iterator i = this->m_Parameters.find( name );
   if( i == this->m_Parameters.end( ) )
     return;
-  if( i->second.first != Self::Index )
+  if( i->second.first != Self::Point )
     return;
 
   std::stringstream str;
   str << v[ 0 ];
   for( unsigned int d = 1; d < dim; ++d )
     str << ";" << v[ d ];
-  i->second.second.second = str.str( );
+  i->second.second = str.str( );
   this->Modified( );
 }
 
 // -------------------------------------------------------------------------
-template< class P >
+template< class V >
 void cpPlugins::Interface::Parameters::
-SetPoint( const TString& name, const TUint& dim, const P& v )
+SetVector( const std::string& name, const unsigned int& dim, const V& v )
 {
   TParameters::iterator i = this->m_Parameters.find( name );
   if( i == this->m_Parameters.end( ) )
     return;
-  if( i->second.first != Self::Point )
+  if( i->second.first != Self::Vector )
     return;
 
   std::stringstream str;
   str << v[ 0 ];
   for( unsigned int d = 1; d < dim; ++d )
     str << ";" << v[ d ];
-  i->second.second.second = str.str( );
+  i->second.second = str.str( );
   this->Modified( );
 }
 
+// -------------------------------------------------------------------------
+template< class I >
+std::vector< I > cpPlugins::Interface::Parameters::
+GetIndexList( const std::string& name, const unsigned int& dim ) const
+{
+  std::vector< I > lst;
+  auto i = this->m_Parameters.find( name );
+  if( i != this->m_Parameters.end( ) )
+  {
+    if( i->second.first == Self::IndexList )
+    {
+      std::istringstream str( i->second.second );
+      std::string token;
+      unsigned int d = 0;
+      while( std::getline( str, token, '#' ) )
+      {
+        std::istringstream str2( token );
+        std::string token2;
+        unsigned int d = 0;
+        I v;
+        while( std::getline( str2, token2, ';' ) && d < dim )
+        {
+          v[ d ] = std::atoi( token.c_str( ) );
+          d++;
+
+        } // elihw
+        lst.push_back( v );
+
+      } // elihw
+
+    } // fi
+
+  } // fi
+  return( lst );
+}
+
+// -------------------------------------------------------------------------
+template< class P >
+std::vector< P > cpPlugins::Interface::Parameters::
+GetPointList( const std::string& name, const unsigned int& dim ) const
+{
+  std::vector< P > lst;
+
+  auto i = this->m_Parameters.find( name );
+  if( i != this->m_Parameters.end( ) )
+  {
+    if( i->second.first == Self::PointList )
+    {
+      std::istringstream str( i->second.second );
+      std::string token;
+      unsigned int d = 0;
+      while( std::getline( str, token, '#' ) )
+      {
+        std::istringstream str2( token );
+        std::string token2;
+        unsigned int d = 0;
+        P v;
+        while( std::getline( str2, token2, ';' ) && d < dim )
+        {
+          std::istringstream tok_str( token );
+          tok_str >> v[ d ];
+          d++;
+
+        } // elihw
+        lst.push_back( v );
+
+      } // elihw
+
+    } // fi
+
+  } // fi
+  return( lst );
+}
+
+// -------------------------------------------------------------------------
+template< class V >
+std::vector< V > cpPlugins::Interface::Parameters::
+GetVectorList( const std::string& name, const unsigned int& dim ) const
+{
+  std::vector< V > lst;
+
+  auto i = this->m_Parameters.find( name );
+  if( i != this->m_Parameters.end( ) )
+  {
+    if( i->second.first == Self::VectorList )
+    {
+      std::istringstream str( i->second.second );
+      std::string token;
+      unsigned int d = 0;
+      while( std::getline( str, token, '#' ) )
+      {
+        std::istringstream str2( token );
+        std::string token2;
+        unsigned int d = 0;
+        V v;
+        while( std::getline( str2, token2, ';' ) && d < dim )
+        {
+          std::istringstream tok_str( token );
+          tok_str >> v[ d ];
+          d++;
+
+        } // elihw
+        lst.push_back( v );
+
+      } // elihw
+
+    } // fi
+
+  } // fi
+  return( lst );
+}
+
 // -------------------------------------------------------------------------
 template< class I >
 void cpPlugins::Interface::Parameters::
-AddToIndexList( const TString& name, const TUint& dim, const I& v )
+AddToIndexList( const std::string& name, const unsigned int& dim, const I& v )
 {
   TParameters::iterator i = this->m_Parameters.find( name );
   if( i == this->m_Parameters.end( ) )
@@ -215,20 +280,20 @@ AddToIndexList( const TString& name, const TUint& dim, const I& v )
     return;
 
   std::stringstream str;
-  if( i->second.second.second == "" )
+  if( i->second.second == "" )
     str << v[ 0 ];
   else
     str << "#" << v[ 0 ];
   for( unsigned int d = 1; d < dim; ++d )
     str << ";" << v[ d ];
-  i->second.second.second += str.str( );
+  i->second.second += str.str( );
   this->Modified( );
 }
 
 // -------------------------------------------------------------------------
 template< class P >
 void cpPlugins::Interface::Parameters::
-AddToPointList( const TString& name, const TUint& dim, const P& v )
+AddToPointList( const std::string& name, const unsigned int& dim, const P& v )
 {
   TParameters::iterator i = this->m_Parameters.find( name );
   if( i == this->m_Parameters.end( ) )
@@ -237,13 +302,35 @@ AddToPointList( const TString& name, const TUint& dim, const P& v )
     return;
 
   std::stringstream str;
-  if( i->second.second.second == "" )
+  if( i->second.second == "" )
+    str << v[ 0 ];
+  else
+    str << "#" << v[ 0 ];
+  for( unsigned int d = 1; d < dim; ++d )
+    str << ";" << v[ d ];
+  i->second.second += str.str( );
+  this->Modified( );
+}
+
+// -------------------------------------------------------------------------
+template< class V >
+void cpPlugins::Interface::Parameters::
+AddToVectorList( const std::string& name, const unsigned int& dim, const V& v )
+{
+  TParameters::iterator i = this->m_Parameters.find( name );
+  if( i == this->m_Parameters.end( ) )
+    return;
+  if( i->second.first != Self::VectorList )
+    return;
+
+  std::stringstream str;
+  if( i->second.second == "" )
     str << v[ 0 ];
   else
     str << "#" << v[ 0 ];
   for( unsigned int d = 1; d < dim; ++d )
     str << ";" << v[ d ];
-  i->second.second.second += str.str( );
+  i->second.second += str.str( );
   this->Modified( );
 }