[Robotflow-cvs] RobotFlow/MARIE/src extractMarieCommandCamera.cpp,1.3,1.4

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

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

Modified Files:
	extractMarieCommandCamera.cpp 
Log Message:
returning nilObject if MarieDataNull input


Index: extractMarieCommandCamera.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieCommandCamera.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** extractMarieCommandCamera.cpp	29 Mar 2005 15:20:42 -0000	1.3
--- extractMarieCommandCamera.cpp	29 Jun 2005 19:26:51 -0000	1.4
***************
*** 137,209 ****
        try 
        {
! 	RCPtr<MarieCommandCamera> command = getInput(m_commandCameraID,count);
! 		
! 	int relPan, relTilt, relZoom, relContrast, relBrightness = 0;
! 	int absPan, absTilt, absZoom, absContrast, absBrightness = 0;
! 	std::bitset<10> state = command->getState();
! 
! 	//get camera data
! 	relPan = command->getRelativePan();
! 	relTilt = command->getRelativeTilt();
! 	relZoom = command->getRelativeZoom();
! 	relContrast = command->getRelativeContrast();
! 	relBrightness = command->getRelativeBrightness();
! 	
! 	absPan = command->getAbsolutePan();
! 	absTilt = command->getAbsoluteTilt();
! 	absZoom = command->getAbsoluteZoom();
! 	absContrast = command->getAbsoluteContrast();
! 	absBrightness = command->getAbsoluteBrightness();
! 
! 
! 	if(state[CommandCamera::REL_PAN] == 1)
! 	  (*outputs[m_relPanOutID].buffer)[count] = ObjectRef(Int::alloc(relPan));
! 	else 
! 	  (*outputs[m_relPanOutID].buffer)[count] = nilObject;
! 
! 	if(state[CommandCamera::REL_TILT] == 1)
! 	  (*outputs[m_relTiltOutID].buffer)[count] = ObjectRef(Int::alloc(relTilt)); 	
! 	else
! 	  (*outputs[m_relTiltOutID].buffer)[count] = nilObject; 
! 	
! 	if(state[CommandCamera::REL_ZOOM] == 1) 
! 	  (*outputs[m_relZoomOutID].buffer)[count] = ObjectRef(Int::alloc(relZoom)); 
! 	else
! 	  (*outputs[m_relZoomOutID].buffer)[count] = nilObject; 
! 
! 	if(state[CommandCamera::REL_BRIGHTNESS] == 1)
! 	  (*outputs[m_relBrightnessOutID].buffer)[count] = ObjectRef(Int::alloc(relBrightness));
! 	else
! 	  (*outputs[m_relBrightnessOutID].buffer)[count] = nilObject; 
! 
! 	if(state[CommandCamera::REL_CONTRAST] == 1)
! 	  (*outputs[m_relContrastOutID].buffer)[count] = ObjectRef(Int::alloc(relContrast)); 
! 	else
! 	  (*outputs[m_relContrastOutID].buffer)[count] = nilObject; 
! 
! 	if(state[CommandCamera::ABS_PAN] == 1)
! 	  (*outputs[m_absPanOutID].buffer)[count] = ObjectRef(Int::alloc(absPan));
! 	else
! 	  (*outputs[m_absPanOutID].buffer)[count] = nilObject;
!      
! 	if(state[CommandCamera::ABS_TILT] == 1)
! 	  (*outputs[m_absTiltOutID].buffer)[count] = ObjectRef(Int::alloc(absTilt)); 
! 	else
! 	  (*outputs[m_absTiltOutID].buffer)[count] = nilObject; 
!      
! 	if(state[CommandCamera::ABS_ZOOM] == 1)
! 	  (*outputs[m_absZoomOutID].buffer)[count] = ObjectRef(Int::alloc(absZoom)); 
! 	else
! 	  (*outputs[m_absZoomOutID].buffer)[count] = nilObject; 
  	
! 	if(state[CommandCamera::ABS_BRIGHTNESS] == 1)
! 	  (*outputs[m_absBrightnessOutID].buffer)[count] = ObjectRef(Int::alloc(absBrightness));
! 	else
! 	  (*outputs[m_absBrightnessOutID].buffer)[count] = nilObject; 
!      
! 	if(state[CommandCamera::ABS_CONTRAST] == 1)
! 	  (*outputs[m_absContrastOutID].buffer)[count] = ObjectRef(Int::alloc(absContrast)); 
! 	else
! 	  (*outputs[m_absContrastOutID].buffer)[count] = nilObject; 	 
        }
        catch (BaseException *e)
--- 137,217 ----
        try 
        {
! 	ObjectRef inputValue = getInput(m_commandCameraID,count);
  	
! 	if (!inputValue->isNil()) {
! 	  
! 	  RCPtr<MarieCommandCamera> command = inputValue;
! 	  
! 	  int relPan, relTilt, relZoom, relContrast, relBrightness = 0;
! 	  int absPan, absTilt, absZoom, absContrast, absBrightness = 0;
! 	  std::bitset<10> state = command->getState();
! 	  
! 	  //get camera data
! 	  relPan = command->getRelativePan();
! 	  relTilt = command->getRelativeTilt();
! 	  relZoom = command->getRelativeZoom();
! 	  relContrast = command->getRelativeContrast();
! 	  relBrightness = command->getRelativeBrightness();
! 	  
! 	  absPan = command->getAbsolutePan();
! 	  absTilt = command->getAbsoluteTilt();
! 	  absZoom = command->getAbsoluteZoom();
! 	  absContrast = command->getAbsoluteContrast();
! 	  absBrightness = command->getAbsoluteBrightness();
! 	  
! 	  
! 	  if(state[CommandCamera::REL_PAN] == 1)
! 	    (*outputs[m_relPanOutID].buffer)[count] = ObjectRef(Int::alloc(relPan));
! 	  else 
! 	    (*outputs[m_relPanOutID].buffer)[count] = nilObject;
! 	  
! 	  if(state[CommandCamera::REL_TILT] == 1)
! 	    (*outputs[m_relTiltOutID].buffer)[count] = ObjectRef(Int::alloc(relTilt)); 	
! 	  else
! 	    (*outputs[m_relTiltOutID].buffer)[count] = nilObject; 
! 	  
! 	  if(state[CommandCamera::REL_ZOOM] == 1) 
! 	    (*outputs[m_relZoomOutID].buffer)[count] = ObjectRef(Int::alloc(relZoom)); 
! 	  else
! 	    (*outputs[m_relZoomOutID].buffer)[count] = nilObject; 
! 	  
! 	  if(state[CommandCamera::REL_BRIGHTNESS] == 1)
! 	    (*outputs[m_relBrightnessOutID].buffer)[count] = ObjectRef(Int::alloc(relBrightness));
! 	  else
! 	    (*outputs[m_relBrightnessOutID].buffer)[count] = nilObject; 
! 	  
! 	  if(state[CommandCamera::REL_CONTRAST] == 1)
! 	    (*outputs[m_relContrastOutID].buffer)[count] = ObjectRef(Int::alloc(relContrast)); 
! 	  else
! 	    (*outputs[m_relContrastOutID].buffer)[count] = nilObject; 
! 	  
! 	  if(state[CommandCamera::ABS_PAN] == 1)
! 	    (*outputs[m_absPanOutID].buffer)[count] = ObjectRef(Int::alloc(absPan));
! 	  else
! 	    (*outputs[m_absPanOutID].buffer)[count] = nilObject;
! 	  
! 	  if(state[CommandCamera::ABS_TILT] == 1)
! 	    (*outputs[m_absTiltOutID].buffer)[count] = ObjectRef(Int::alloc(absTilt)); 
! 	  else
! 	    (*outputs[m_absTiltOutID].buffer)[count] = nilObject; 
! 	  
! 	  if(state[CommandCamera::ABS_ZOOM] == 1)
! 	    (*outputs[m_absZoomOutID].buffer)[count] = ObjectRef(Int::alloc(absZoom)); 
! 	  else
! 	    (*outputs[m_absZoomOutID].buffer)[count] = nilObject; 
! 	  
! 	  if(state[CommandCamera::ABS_BRIGHTNESS] == 1)
! 	    (*outputs[m_absBrightnessOutID].buffer)[count] = ObjectRef(Int::alloc(absBrightness));
! 	  else
! 	    (*outputs[m_absBrightnessOutID].buffer)[count] = nilObject; 
! 	  
! 	  if(state[CommandCamera::ABS_CONTRAST] == 1)
! 	    (*outputs[m_absContrastOutID].buffer)[count] = ObjectRef(Int::alloc(absContrast)); 
! 	  else
! 	    (*outputs[m_absContrastOutID].buffer)[count] = nilObject; 	 
! 	}
! 	else {
! 	  out[count] = nilObject;
! 	}
        }
        catch (BaseException *e)