[Robotflow-cvs] RobotFlow/MARIE/include Makefile.am,NONE,1.1 MarieCommandBehavior.h,NONE,1.1 MarieCommandCamera.h,NONE,1.1 MarieCommandMotor.h,NONE,1.1 MarieDataCamera.h,NONE,1.1 MarieDataLaser.h,NONE,1.1 MarieDataOdometry.h,NONE,1.1 MarieDataSonar.h,NONE,1.1 MarieLoad.h,NONE,1.1 MarieObject.h,NONE,1.1 MarieSave.h,NONE,1.1

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

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

Added Files:
	Makefile.am MarieCommandBehavior.h MarieCommandCamera.h 
	MarieCommandMotor.h MarieDataCamera.h MarieDataLaser.h 
	MarieDataOdometry.h MarieDataSonar.h MarieLoad.h MarieObject.h 
	MarieSave.h 
Log Message:
first MARIE blocks merged, fixed configure to support MARIE

--- NEW FILE: MarieCommandMotor.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_COMMAND_MOTOR_H_
#define _MARIE_COMMAND_MOTOR_H_


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

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

namespace marie
{
  class MarieCommandMotor : public MarieObject, public CommandMotor {
     
     public:
     
       
     MarieCommandMotor();    
     MarieCommandMotor(const CommandMotor &command);
     
     //from BufferedNode   
     MarieCommandMotor(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_commandInID;
     int m_velocityInID;
     int m_rotationInID;
              
     //outputs
     int m_commandOutID;
     int m_velocityOutID;
     int m_rotationOutID;
  };
}

#endif


--- NEW FILE: MarieLoad.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_LOAD_H_
#define _MARIE_LOAD_H_

#include "BufferedNode.h"
#include "MarieXMLDataFactory.h"

namespace marie
{
  class MarieLoad : public BufferedNode {
  
  private: 
     
     int m_inputID;  
     int m_outputID;
     
     MarieXMLDataFactory m_factory;
     
  public:
  
     MarieLoad(string nodeName, ParameterSet params);
     void calculate(int output_id, int count, Buffer &out);   
  };
}
#endif

--- NEW FILE: MarieObject.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
//
// C++ Interface: MARIEObject
//
// Description: 
//
//
// Author: Dominic Letourneau <do...@la...>, (C) 2004
//
// Copyright: See COPYING file that comes with this distribution
//
//
#ifndef _MARIE_OBJECT_H_
#define _MARIE_OBJECT_H_

//#include "MarieDataLaser.h"
//#include "MarieDataSonar.h"
//#include "MarieDataCamera.h"            
//#include "MarieDataOdometry.h"
//#include "MarieCommandBehavior.h"            
//#include "MarieCommandCamera.h"            
//#include "MarieCommandMotor.h"

#include "BufferedNode.h"
#include "Object.h"
#include "DataAbstract.h"


namespace marie
{
  class MarieObject : public BufferedNode {
  
   public:
     
     MarieObject(string nodeName, ParameterSet params) : BufferedNode(nodeName,params) {}
     virtual void copyDataAbstract(DataAbstract *data) = 0;
      
   private:
  
  };
}
#endif

--- NEW FILE: MarieDataSonar.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_SONAR_H_
#define _MARIE_DATA_SONAR_H_

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

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

namespace marie
{
  class MarieDataSonar : public MarieObject, public DataSonar {
     
     public:
       
     MarieDataSonar();  
     MarieDataSonar (const DataSonar &data);  
     
     //from BufferedNode
     MarieDataSonar(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:
        
     int m_inputID;
     int m_rangeID;
     bool m_isNode;
        
  };
}
#endif

--- NEW FILE: MarieCommandCamera.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_COMMAND_CAMERA_H_
#define _MARIE_COMMAND_CAMERA_H_


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

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

namespace marie
{
  class MarieCommandCamera : public MarieObject, public CommandCamera {
     
     public:
       
     MarieCommandCamera();  
     MarieCommandCamera(const CommandCamera &command);
     
     //from BufferedNode   
     MarieCommandCamera(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_commandInID;   
     int m_brightnessInID;
     int m_contrastInID;
     int m_panInID;
     int m_tiltInID;
     int m_zoomInID;
     
     //outputs
     int m_commandOutID;
     int m_brightnessOutID;
     int m_contrastOutID;
     int m_panOutID;
     int m_tiltOutID;
     int m_zoomOutID;
                
  };
}
#endif

--- NEW FILE: MarieCommandBehavior.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_COMMAND_BEHAVIOR_H_
#define _MARIE_COMMAND_BEHAVIOR_H_

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

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

namespace marie
{
  class MarieCommandBehavior : public MarieObject, public CommandBehavior {
     
     public:
     
     MarieCommandBehavior();
     MarieCommandBehavior(const CommandBehavior &command);  
     
     //from BufferedNode   
     MarieCommandBehavior(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_commandInID;
     int m_behaviorNameInID;
     int m_behaviorActivationInID;
     
     //outputs
     int m_commandOutID;
     int m_RobotFlowActivationOutID;
  };
}
#endif

--- NEW FILE: MarieDataCamera.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_CAMERA_H_
#define _MARIE_DATA_CAMERA_H_


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

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

namespace marie
{
  class MarieDataCamera : public MarieObject, public DataCamera {
     
     public:
                 
     MarieDataCamera();  
     MarieDataCamera (const DataCamera &data);
         
     //from BufferedNode   
     MarieDataCamera(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_panID;
     int m_tiltID;
     int m_zoomID;
     int m_imageWidthID;
     int m_imageHeightID;
     int m_imageID;
     int m_imageFormatID;
     
  };
}
#endif


--- NEW FILE: MarieDataLaser.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_LASER_H_
#define _MARIE_DATA_LASER_H_


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

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

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

--- NEW FILE: MarieDataOdometry.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_ODOMETRY_H_
#define _MARIE_DATA_ODOMETRY_H_

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

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

namespace marie
{
  class MarieDataOdometry : public MarieObject, public DataOdometry {
     
     public:
       
     MarieDataOdometry();  
     MarieDataOdometry (const DataOdometry &data);  
     
     //from BufferedNode
     MarieDataOdometry(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;
        
     //input
     int m_inputID;
     
     //outputs
     int m_XposID;
     int m_YposID;
     int m_ZposID;
     int m_yawID;
     int m_pitchID;
     int m_rollID;
     int m_linSpeedID;
     int m_sideSpeedID;
     int m_rotSpeedID;
  };
}
#endif

--- NEW FILE: Makefile.am ---
AUTOMAKE_OPTIONS = no-dependencies

noinst_HEADERS = MarieCommandBehavior.h \
		 MarieCommandMotor.h \
		 MarieDataLaser.h \
	     	 MarieDataSonar.h \
		 MarieObject.h \
		 MarieCommandCamera.h \
	      	 MarieDataCamera.h \
	      	 MarieDataOdometry.h \
		 MarieLoad.h \
	    	 MarieSave.h



--- NEW FILE: MarieSave.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_SAVE_H_
#define _MARIE_SAVE_H_

#include "BufferedNode.h"

namespace marie
{
  class MarieSave : public BufferedNode {
     
     int m_inputID;
     int m_streamID;
     int m_outputID;
      
  public:
  
     MarieSave(string nodeName, ParameterSet params);
  
     void calculate(int output_id, int count, Buffer &out);
       
  };
}
#endif