[Robotflow-cvs] RobotFlow/MARIE/src MarieDataCamera.cpp,1.2,1.3 MarieDataLaser.cpp,1.3,1.4 MarieDataOdometry.cpp,1.2,1.3 MarieDataSonar.cpp,1.2,1.3

[Dominic L. <ma...@us...>]

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

Modified Files:
	MarieDataCamera.cpp MarieDataLaser.cpp MarieDataOdometry.cpp 
	MarieDataSonar.cpp 
Log Message:
fixed problems when input is nil

Index: MarieDataSonar.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataSonar.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MarieDataSonar.cpp	31 May 2004 14:10:09 -0000	1.2
--- MarieDataSonar.cpp	10 Jun 2004 20:47:53 -0000	1.3
***************
*** 71,77 ****
    void MarieDataSonar::calculate(int output_id, int count, Buffer &out)
    {
!      if (m_isNode)
       {
!         RCPtr<MarieDataSonar> sonarObject = getInput(m_inputID,count);
       
          unsigned int size = sonarObject->getNbSonar();
--- 71,79 ----
    void MarieDataSonar::calculate(int output_id, int count, Buffer &out)
    {
!      ObjectRef InputValue = getInput(m_inputID,count);
! 
!      if (m_isNode && !InputValue->isNil())
       {
!         RCPtr<MarieDataSonar> sonarObject = InputValue;
       
          unsigned int size = sonarObject->getNbSonar();

Index: MarieDataOdometry.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataOdometry.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MarieDataOdometry.cpp	31 May 2004 14:10:09 -0000	1.2
--- MarieDataOdometry.cpp	10 Jun 2004 20:47:53 -0000	1.3
***************
*** 115,121 ****
    void MarieDataOdometry::calculate(int output_id, int count, Buffer &out)
    {
!      if (m_isNode)
       {
!         RCPtr<MarieDataOdometry> odometryObject = getInput(m_inputID,count);
          
          int x,y,z,yaw,pitch,roll, linspeed, sidespeed,rotspeed;
--- 115,125 ----
    void MarieDataOdometry::calculate(int output_id, int count, Buffer &out)
    {
! 
!     ObjectRef InputValue = getInput(m_inputID,count);
! 
! 
!     if (m_isNode && !InputValue->isNil())
       {
!         RCPtr<MarieDataOdometry> odometryObject = InputValue;
          
          int x,y,z,yaw,pitch,roll, linspeed, sidespeed,rotspeed;

Index: MarieDataLaser.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataLaser.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MarieDataLaser.cpp	10 Jun 2004 20:34:23 -0000	1.3
--- MarieDataLaser.cpp	10 Jun 2004 20:47:53 -0000	1.4
***************
*** 72,78 ****
    void MarieDataLaser::calculate(int output_id, int count, Buffer &out)
    {
!      if (m_isNode) 
       {
!         RCPtr<MarieDataLaser> dataLaserObject = getInput(m_inputID,count);
       
          unsigned int size = dataLaserObject->getNbLaser();
--- 72,81 ----
    void MarieDataLaser::calculate(int output_id, int count, Buffer &out)
    {
! 
!      ObjectRef InputValue = getInput(m_inputID,count);
! 
!      if (m_isNode && !InputValue->isNil()) 
       {
!         RCPtr<MarieDataLaser> dataLaserObject = InputValue;
       
          unsigned int size = dataLaserObject->getNbLaser();

Index: MarieDataCamera.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataCamera.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MarieDataCamera.cpp	31 May 2004 14:10:09 -0000	1.2
--- MarieDataCamera.cpp	10 Jun 2004 20:47:53 -0000	1.3
***************
*** 106,112 ****
    void MarieDataCamera::calculate(int output_id, int count, Buffer &out)
    {
!      if (m_isNode)
       {   
!         RCPtr<MarieDataCamera> dataCameraObject = getInput(m_inputID,count);
          
          int pan, tilt, zoom;      
--- 106,114 ----
    void MarieDataCamera::calculate(int output_id, int count, Buffer &out)
    {
! 
!      ObjectRef InputValue = getInput(m_inputID,count);
!      if (m_isNode && !InputValue->isNil())
       {   
!        RCPtr<MarieDataCamera> dataCameraObject = InputValue;
          
          int pan, tilt, zoom;