[Robotflow-cvs] RobotFlow/MARIE/include MarieDataMap.h,NONE,1.1 Makefile.am,1.9,1.10

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

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

Modified Files:
	Makefile.am 
Added Files:
	MarieDataMap.h 
Log Message:
Reading MarieDataMap

--- NEW FILE: MarieDataMap.h ---
/*
*    MARIE - Mobile and Autonomous Robotics Integration Environment
*    Copyright (C) 2004 Dominic Letourneau
*
*    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_MAP_H_
#define _MARIE_DATA_MAP_H_

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

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

namespace marie
{
  class MarieDataMap : public MarieObject, public DataMap {
     
     public:
                 
     MarieDataMap();  
     MarieDataMap (const DataMap &data);
         
     //from BufferedNode   
     MarieDataMap(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);   
     
     private:
     
     bool m_isNode;
        
     //inputs
     int m_inputID;
     
     //outputs
     int m_outputID;
  };
}
#endif


Index: Makefile.am
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.am	2 Sep 2004 18:20:22 -0000	1.9
--- Makefile.am	22 Sep 2004 13:55:53 -0000	1.10
***************
*** 4,9 ****
  	MarieCommandMotor.h \
  	MarieDataLaser.h \
!   MarieDataIR.h \
!   MarieDataBumper.h \
  	MarieDataSonar.h \
  	MarieDataNull.h \
--- 4,9 ----
  	MarieCommandMotor.h \
  	MarieDataLaser.h \
!   	MarieDataIR.h \
!   	MarieDataBumper.h \
  	MarieDataSonar.h \
  	MarieDataNull.h \
***************
*** 16,21 ****
  	MariePeek.h \
  	MariePush.h \
!   MarieDataRaw.h \
!   MarieCommandJoystick.h
  
  include_HEADERS = MarieObject.h
--- 16,22 ----
  	MariePeek.h \
  	MariePush.h \
!   	MarieDataRaw.h \
!   	MarieCommandJoystick.h \
! 	MarieDataMap.h
  
  include_HEADERS = MarieObject.h