[Robotflow-cvs] RobotFlow/MARIE/include MarieDataNull.h,NONE,1.1 Makefile.am,1.1,1.2

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

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

Modified Files:
	Makefile.am 
Added Files:
	MarieDataNull.h 
Log Message:
added MarieDataNull

--- NEW FILE: MarieDataNull.h ---
/*
*    MARIE - Mobile and Autonomous Robotics Integration Environment
*    Copyright (C) 2004 Carle Cote
*
*    This library is free software; you can redistribute it and/or
*    modify it under the terms of the GNU Lesser General Public
*    License as published by the Free Software Foundation; either
*    version 2.1 of the License, or (at your option) any later version.
*
*    This library is distributed in the hope that it will be useful,
*    but WITHOUT ANY WARRANTY; without even the implied warranty of
*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
*    Lesser General Public License for more details.
*
*    You should have received a copy of the GNU Lesser General Public
*    License along with this library; if not, write to the Free Software
*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*    You can contact MARIE development team at http://marie.sourceforge.net
*/
// Prevent Multiple Inclusion
#ifndef _MARIE_DATA_NULL_H_
#define _MARIE_DATA_NULL_H_


//FlowDesigner include
#include "Object.h"
#include "MarieObject.h"

//MARIE data types include
#include "DataNull.h"            

namespace marie
{
  class MarieDataNull : public MarieObject, public DataNull {
     
     public:
       
     MarieDataNull();  
     MarieDataNull(const DataNull &command);
     
     //from BufferedNode   
     MarieDataNull(string nodeName, ParameterSet params);
     virtual void calculate(int output_id, int count, Buffer &out);        
     virtual void printOn(ostream &out) const;
     virtual void readFrom(istream &in=cin);
     virtual void copyDataAbstract(DataAbstract *data);
     
     //from Object
     virtual bool isNil() const {return true;}
     
     private:
     
     bool m_isNode;
        
     //outputs
     int m_dataNullOutID;

     //same dataNull object
     ObjectRef m_dataNullObject;
                
  };
}
#endif

Index: Makefile.am
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	30 May 2004 12:34:07 -0000	1.1
--- Makefile.am	7 Jun 2004 15:10:10 -0000	1.2
***************
*** 2,14 ****
  
  noinst_HEADERS = MarieCommandBehavior.h \
! 		 MarieCommandMotor.h \
! 		 MarieDataLaser.h \
! 	     	 MarieDataSonar.h \
! 		 MarieObject.h \
! 		 MarieCommandCamera.h \
! 	      	 MarieDataCamera.h \
! 	      	 MarieDataOdometry.h \
! 		 MarieLoad.h \
! 	    	 MarieSave.h
  
  
--- 2,15 ----
  
  noinst_HEADERS = MarieCommandBehavior.h \
! 	MarieCommandMotor.h \
! 	MarieDataLaser.h \
! 	MarieDataSonar.h \
! 	MarieDataNull.h \
! 	MarieObject.h \
! 	MarieCommandCamera.h \
! 	MarieDataCamera.h \
! 	MarieDataOdometry.h \
! 	MarieLoad.h \
! 	MarieSave.h