nsclspectcl-cvscommits

[Ron F. <ro...@us...>]

Update of /cvsroot/nsclspectcl/SpecTcl/contrib/scriptable
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20645/contrib/scriptable

Modified Files:
	CConfigurableObject.cpp CConfigurableObject.h 
Log Message:
Add the AddParameter function to the scripted CConfigurableObject in the
scripted SpecTcl so that we can support extended parameter types
(e.g. enums for 4pi).


Index: CConfigurableObject.h
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/contrib/scriptable/CConfigurableObject.h,v
retrieving revision 5.2
retrieving revision 5.3
diff -C2 -d -r5.2 -r5.3
*** CConfigurableObject.h	3 Jun 2005 15:19:38 -0000	5.2
--- CConfigurableObject.h	1 Feb 2006 13:42:23 -0000	5.3
***************
*** 392,395 ****
--- 392,396 ----
  				       CTCLResult& rResult, 
  				       int nArgs, char** pArgs); //!< list subcommand 
+   ParameterIterator AddParameter(CConfigurationParameter*);
    ParameterIterator AddIntParam (const STD(string)& sParamName, 
  				 int nDefault=0)   ; //!< Create an int.

Index: CConfigurableObject.cpp
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/contrib/scriptable/CConfigurableObject.cpp,v
retrieving revision 5.2
retrieving revision 5.3
diff -C2 -d -r5.2 -r5.3
*** CConfigurableObject.cpp	3 Jun 2005 15:19:38 -0000	5.2
--- CConfigurableObject.cpp	1 Feb 2006 13:42:23 -0000	5.3
***************
*** 531,534 ****
--- 531,548 ----
  
  /*!
+   Add a new type of arbitrary paramter to the configuration database.
+   \param parameter :CConfigurationParameter*
+       Pointer to the new parameter object.
+   \return ParmeterIterator
+   \retval iterator in the parameter set to the newly added parameter.
+ 
+  */
+ CConfigurableObject::ParameterIterator
+ CConfigurableObject::AddParameter(CConfigurationParameter* parameter)
+ {
+   m_Configuration.push_back(parameter);
+   return Find(parameter->getSwitch());
+ }
+ /*!
  
  Adds an integer configuration parameter to the
***************
*** 546,551 ****
    CIntConfigParam* pNewParam = new CIntConfigParam(sParamName,
                                                     nDefault);
!   m_Configuration.push_back(pNewParam);
!   return Find(sParamName);
  }  
  
--- 560,565 ----
    CIntConfigParam* pNewParam = new CIntConfigParam(sParamName,
                                                     nDefault);
!   return AddParameter(pNewParam);
! 
  }  
  
***************
*** 571,576 ****
                                              nArraySize,
                                              nDefault);
!   m_Configuration.push_back(pNew);
!   return Find(rParamName);
  
  }  
--- 585,589 ----
                                              nArraySize,
                                              nDefault);
!   return AddParameter(pNew);
  
  }  
***************
*** 593,598 ****
    CBoolConfigParam* pParam = new CBoolConfigParam(rName, 
                                                    fDefault);
!   m_Configuration.push_back(pParam);
!   return Find(rName);
  
  }
--- 606,611 ----
    CBoolConfigParam* pParam = new CBoolConfigParam(rName, 
                                                    fDefault);
!   return AddParameter(pParam);
! 
  
  }
***************
*** 610,615 ****
  {
    CStringConfigParam *p = new CStringConfigParam(rName);
!   m_Configuration.push_back(p);
!   return Find(rName);
  
  
--- 623,627 ----
  {
    CStringConfigParam *p = new CStringConfigParam(rName);
!   return AddParameter(p);
  
  
***************
*** 630,635 ****
  {
    CStringArrayparam* p = new CStringArrayparam(rName, nArraySize);
!   m_Configuration.push_back(p);
!   return Find(rName);
  
  }
--- 642,647 ----
  {
    CStringArrayparam* p = new CStringArrayparam(rName, nArraySize);
!   return AddParameter(p);
! 
  
  }