[Robotflow-cvs] RobotFlow/MARIE/src MarieDataLocalisation.cpp,1.1,1.2

[Carle C. <car...@us...>]

Update of /cvsroot/robotflow/RobotFlow/MARIE/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1279

Modified Files:
	MarieDataLocalisation.cpp 
Log Message:
change id type to int

Index: MarieDataLocalisation.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataLocalisation.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieDataLocalisation.cpp	30 Aug 2004 19:21:55 -0000	1.1
--- MarieDataLocalisation.cpp	31 Aug 2004 19:53:19 -0000	1.2
***************
*** 55,59 ****
     *
     * @input_name ID
!    * @input_type string
     * @input_description input id, nilObject if not used
     *    
--- 55,59 ----
     *
     * @input_name ID
!    * @input_type Int
     * @input_description input id, nilObject if not used
     *    
***************
*** 79,83 ****
     *
     * @output_name ID
!    * @output_type string
     * @output_description output ID
     *    
--- 79,83 ----
     *
     * @output_name ID
!    * @output_type Int
     * @output_description output ID
     *    
***************
*** 130,134 ****
           MarieDataLocalisation *data = NULL;
           float x,y,z,strength = 0;
!          string id = "";
           
           //get all inputs       
--- 130,134 ----
           MarieDataLocalisation *data = NULL;
           float x,y,z,strength = 0;
!          int id = 0;
           
           //get all inputs       
***************
*** 185,189 ****
               if (!idInValue->isNil())
               {
!                 RCPtr<String> idPtr = idInValue;
                  id = *idPtr;
                  data->setID(id);
--- 185,189 ----
               if (!idInValue->isNil())
               {
!                 RCPtr<Int> idPtr = idInValue;
                  id = *idPtr;
                  data->setID(id);
***************
*** 203,207 ****
       (*outputs[m_zOutID].buffer)[count] = ObjectRef(Float::alloc(z));
       (*outputs[m_strengthOutID].buffer)[count] = ObjectRef(Float::alloc(strength));
!      (*outputs[m_idOutID].buffer)[count] = ObjectRef(new String(id));
  	 }
  	 else
--- 203,207 ----
       (*outputs[m_zOutID].buffer)[count] = ObjectRef(Float::alloc(z));
       (*outputs[m_strengthOutID].buffer)[count] = ObjectRef(Float::alloc(strength));
!      (*outputs[m_idOutID].buffer)[count] = ObjectRef(Int::alloc(id));
  	 }
  	 else