...

[cpPlugins.git] / lib / cpPlugins / Interface / Parameters.cxx

diff --git a/lib/cpPlugins/Interface/Parameters.cxx b/lib/cpPlugins/Interface/Parameters.cxx
index 7e2459cafbc686459ba8f56859fb6e14197fde10..e6db0e3541a6246665dbb91915e69371f723da5a 100644 (file)
--- a/lib/cpPlugins/Interface/Parameters.cxx
+++ b/lib/cpPlugins/Interface/Parameters.cxx
@@ -44,7 +44,7 @@ Clear( )
 
 // -------------------------------------------------------------------------
 void cpPlugins::Interface::Parameters::
-GetNames( std::vector< TString >& container ) const
+GetNames( std::vector< std::string >& container ) const
 {
   container.clear( );
   TParameters::const_iterator i = this->m_Parameters.begin( );
@@ -55,7 +55,7 @@ GetNames( std::vector< TString >& container ) const
 // -------------------------------------------------------------------------
 cpPlugins::Interface::Parameters::
 Type cpPlugins::Interface::Parameters::
-GetType( const TString& name ) const
+GetType( const std::string& name ) const
 {
   auto i = this->m_Parameters.find( name );
   if( i != this->m_Parameters.end( ) )
@@ -70,7 +70,7 @@ GetType( const TString& name ) const
     return( #Y )
 
 std::string cpPlugins::Interface::Parameters::
-GetTypeAsString( const TString& name ) const
+GetTypeAsString( const std::string& name ) const
 {
   auto i = this->m_Parameters.find( name );
   cpPlugins_Parameters_TypeAsString( String );
@@ -78,9 +78,6 @@ GetTypeAsString( const TString& name ) const
   else cpPlugins_Parameters_TypeAsString( Int );
   else cpPlugins_Parameters_TypeAsString( Uint );
   else cpPlugins_Parameters_TypeAsString( Real );
-  else cpPlugins_Parameters_TypeAsString( Index );
-  else cpPlugins_Parameters_TypeAsString( Point );
-  else cpPlugins_Parameters_TypeAsString( Vector );
   else cpPlugins_Parameters_TypeAsString( OpenFileName );
   else cpPlugins_Parameters_TypeAsString( SaveFileName );
   else cpPlugins_Parameters_TypeAsString( PathName );
@@ -89,9 +86,6 @@ GetTypeAsString( const TString& name ) const
   else cpPlugins_Parameters_TypeAsString( IntList );
   else cpPlugins_Parameters_TypeAsString( UintList );
   else cpPlugins_Parameters_TypeAsString( RealList );
-  else cpPlugins_Parameters_TypeAsString( IndexList );
-  else cpPlugins_Parameters_TypeAsString( PointList );
-  else cpPlugins_Parameters_TypeAsString( VectorList );
   else cpPlugins_Parameters_TypeAsString( OpenFileNameList );
   else cpPlugins_Parameters_TypeAsString( SaveFileNameList );
   else cpPlugins_Parameters_TypeAsString( PathNameList );
@@ -113,9 +107,6 @@ GetTypeFromString( const std::string& t )
   else cpPlugins_Parameters_TypeFromString( Int, t );
   else cpPlugins_Parameters_TypeFromString( Uint, t );
   else cpPlugins_Parameters_TypeFromString( Real, t );
-  else cpPlugins_Parameters_TypeFromString( Index, t );
-  else cpPlugins_Parameters_TypeFromString( Point, t );
-  else cpPlugins_Parameters_TypeFromString( Vector, t );
   else cpPlugins_Parameters_TypeFromString( OpenFileName, t );
   else cpPlugins_Parameters_TypeFromString( SaveFileName, t );
   else cpPlugins_Parameters_TypeFromString( PathName, t );
@@ -124,9 +115,6 @@ GetTypeFromString( const std::string& t )
   else cpPlugins_Parameters_TypeFromString( IntList, t );
   else cpPlugins_Parameters_TypeFromString( UintList, t );
   else cpPlugins_Parameters_TypeFromString( RealList, t );
-  else cpPlugins_Parameters_TypeFromString( IndexList, t );
-  else cpPlugins_Parameters_TypeFromString( PointList, t );
-  else cpPlugins_Parameters_TypeFromString( VectorList, t );
   else cpPlugins_Parameters_TypeFromString( OpenFileNameList, t );
   else cpPlugins_Parameters_TypeFromString( SaveFileNameList, t );
   else cpPlugins_Parameters_TypeFromString( PathNameList, t );
@@ -189,7 +177,7 @@ ConfigureAsChoices(
 
 // -------------------------------------------------------------------------
 std::vector< std::string > cpPlugins::Interface::Parameters::
-GetChoices( const TString& name ) const
+GetChoices( const std::string& name ) const
 {
   std::vector< std::string > choices;
 
@@ -236,19 +224,18 @@ GetSelectedChoice( const std::string& name ) const
 
 // -------------------------------------------------------------------------
 bool cpPlugins::Interface::Parameters::
-SetSelectedChoice( const TString& name, const TString& choice )
+SetSelectedChoice( const std::string& name, const std::string& choice )
 {
   auto i = this->m_Parameters.find( name );
   if( i != this->m_Parameters.end( ) )
   {
     if( i->second.first == Self::Choices )
     {
-      std::vector< std::string > c = this->GetChoices( name );
-      if( std::find( c.begin( ), c.end( ), choice ) != c.end( ) )
+      std::istringstream str_choices( i->second.second );
+      std::string choices;
+      std::getline( str_choices, choices, '@' );
+      if( choices.find( choice ) != std::string::npos )
       {
-        std::istringstream str_choices( i->second.second );
-        std::string choices;
-        std::getline( str_choices, choices, '@' );
         std::stringstream new_choices;
         new_choices << choices << "@" << choice;
         i->second.second = new_choices.str( );
@@ -264,24 +251,6 @@ SetSelectedChoice( const TString& name, const TString& choice )
     return( false );
 }
 
-// -------------------------------------------------------------------------
-#define cpPlugins_Parameters_ClearList( Y )                     \
-  void cpPlugins::Interface::Parameters::                       \
-  Clear##Y##List( const TString& name )                         \
-  {                                                             \
-    auto i = this->m_Parameters.find( name );                   \
-    if( i == this->m_Parameters.end( ) )                        \
-      return;                                                   \
-    if( i->second.first != Self::Y##List )                      \
-      return;                                                   \
-    i->second.second = "";                                      \
-    this->Modified( );                                          \
-  }
-
-cpPlugins_Parameters_ClearList( Index );
-cpPlugins_Parameters_ClearList( Point );
-cpPlugins_Parameters_ClearList( Vector );
-
 // -------------------------------------------------------------------------
 bool cpPlugins::Interface::Parameters::
 ToXML( TiXmlElement* parent_elem ) const