robotflow-cvs

[clement r. <kl...@us...>]

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

Modified Files:
	Makefile.am MarieCommandBehavior.h MarieCommandCamera.h 
	MarieCommandJoystick.h MarieCommandMotor.h MarieDataBumper.h 
	MarieDataCamera.h MarieDataIR.h MarieDataLaser.h 
	MarieDataLocalisation.h MarieDataMap.h MarieDataNull.h 
	MarieDataOdometry.h MarieDataRaw.h MarieDataSonar.h 
	MarieObject.h MarieRequestSystem.h 
Log Message:
remove useless inheritance of BuffuredNode by MarieObject


Index: MarieDataBumper.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataBumper.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MarieDataBumper.h	29 Mar 2005 15:20:41 -0000	1.3
--- MarieDataBumper.h	7 Sep 2005 21:12:48 -0000	1.4
***************
*** 25,29 ****
  
  //FlowDesigner include
- #include "Object.h"
  #include "MarieObject.h"
  
--- 25,28 ----
***************
*** 36,64 ****
       
       public:
!        
       MarieDataBumper();  
       MarieDataBumper(const DataBumper &command);
       
!      //from BufferedNode   
!      MarieDataBumper(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out);        
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);
-      
-      private:
-      
-      bool m_isNode;
-         
-      //inputs
-      int m_commandInID;   
-      int m_nbBumpersInID;
-      int m_bumperStateInID;
-      
-      //outputs
-      int m_commandOutID;   
-      int m_nbBumpersOutID;
-      int m_bumperStateOutID;     
-                 
    };
  }
--- 35,46 ----
       
       public:
!      
       MarieDataBumper();  
       MarieDataBumper(const DataBumper &command);
       
!      //from MarieObject
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);
    };
  }

Index: MarieCommandJoystick.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandJoystick.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MarieCommandJoystick.h	29 Mar 2005 15:20:41 -0000	1.3
--- MarieCommandJoystick.h	7 Sep 2005 21:12:48 -0000	1.4
***************
*** 25,29 ****
  
  //FlowDesigner include
- #include "Object.h"
  #include "MarieObject.h"
  
--- 25,28 ----
***************
*** 36,76 ****
       
       public:
!        
!      MarieCommandJoystick();  
       MarieCommandJoystick(const CommandJoystick &command);
       
!      //from BufferedNode   
!      MarieCommandJoystick(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out);        
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);
       
-      private:
-      
-      bool m_isNode;
-         
-      //inputs
-      int m_commandInID;   
-      int m_xInID;
-      int m_yInID;
-      int m_xminInID;
-      int m_yminInID;
-      int m_xmaxInID;
-      int m_ymaxInID;
-      int m_nbButtonsInID;
-      int m_buttonStateInID;
-      
-      //outputs
-      int m_commandOutID;   
-      int m_xOutID;
-      int m_yOutID;
-      int m_xminOutID;
-      int m_yminOutID;
-      int m_xmaxOutID;
-      int m_ymaxOutID;
-      int m_nbButtonsOutID;
-      int m_buttonStateOutID;     
-                 
    };
  }
--- 35,47 ----
       
       public:
!      
!      MarieCommandJoystick();
       MarieCommandJoystick(const CommandJoystick &command);
       
!      //from MarieObject
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);
       
    };
  }

Index: MarieDataNull.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataNull.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MarieDataNull.h	29 Mar 2005 15:20:41 -0000	1.3
--- MarieDataNull.h	7 Sep 2005 21:12:48 -0000	1.4
***************
*** 25,29 ****
  
  //FlowDesigner include
- #include "Object.h"
  #include "MarieObject.h"
  
--- 25,28 ----
***************
*** 40,46 ****
       MarieDataNull(const DataNull &command);
       
!      //from BufferedNode   
!      MarieDataNull(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out);        
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
--- 39,43 ----
       MarieDataNull(const DataNull &command);
       
!      //from MarieObject
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
***************
*** 49,63 ****
       //from Object
       virtual bool isNil() const {return true;}
-      
-      private:
-      
-      bool m_isNode;
-         
-      //outputs
-      int m_dataNullOutID;
- 
-      //same dataNull object
-      FD::ObjectRef m_dataNullObject;
-                 
    };
  }
--- 46,49 ----

Index: MarieDataLaser.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataLaser.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MarieDataLaser.h	29 Mar 2005 15:20:41 -0000	1.3
--- MarieDataLaser.h	7 Sep 2005 21:12:48 -0000	1.4
***************
*** 25,29 ****
  
  //FlowDesigner include
- #include "Object.h"
  #include "MarieObject.h"
  
--- 25,28 ----
***************
*** 40,55 ****
       MarieDataLaser (const DataLaser &data);
       
!      //from BufferedNode
!      MarieDataLaser(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out);       
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);  
-      
-      private:
-      
-      int m_inputID;
-      int m_outputID;
-      bool m_isNode;  
    };
  }
--- 39,46 ----
       MarieDataLaser (const DataLaser &data);
       
!      //from MarieObject
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);  
    };
  }

Index: MarieDataRaw.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataRaw.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MarieDataRaw.h	29 Mar 2005 15:20:41 -0000	1.3
--- MarieDataRaw.h	7 Sep 2005 21:12:48 -0000	1.4
***************
*** 25,29 ****
  
  //FlowDesigner include
- #include "Object.h"
  #include "MarieObject.h"
  
--- 25,28 ----
***************
*** 40,59 ****
       MarieDataRaw (const DataRaw &data);
       
!      //from BufferedNode
!      MarieDataRaw(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out);       
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);  
-      
-      private:
-      
-      int m_rawMarieInID;
-      int m_rawMarieOutID;
-      int m_objRefInID;
-      int m_customIDOutID;
-      int m_objRefOutID;
-      int m_customIDInID;
-      bool m_isNode;  
    };
  }
--- 39,46 ----
       MarieDataRaw (const DataRaw &data);
       
!      //from MarieObject
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);  
    };
  }

Index: MarieDataMap.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataMap.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MarieDataMap.h	29 Mar 2005 15:20:41 -0000	1.4
--- MarieDataMap.h	7 Sep 2005 21:12:48 -0000	1.5
***************
*** 24,28 ****
  
  //FlowDesigner include
- #include "Object.h"
  #include "MarieObject.h"
  
--- 24,27 ----
***************
*** 38,58 ****
       MarieDataMap();  
       MarieDataMap (const DataAssociativeMap &data);
!          
!      //from BufferedNode   
!      MarieDataMap(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out); 
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);   
-      
-      private:
-      
-      bool m_isNode;
-         
-      //inputs
-      int m_inputID;
-      
-      //outputs
-      int m_outputID;
    };
  }
--- 37,45 ----
       MarieDataMap();  
       MarieDataMap (const DataAssociativeMap &data);
!      
!      //from MarieObject
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);   
    };
  }

Index: Makefile.am
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile.am	28 Jun 2005 00:44:48 -0000	1.13
--- Makefile.am	7 Sep 2005 21:12:48 -0000	1.14
***************
*** 11,16 ****
  	MarieDataCamera.h \
  	MarieDataOdometry.h \
- 	MarieLoad.h \
- 	MarieSave.h \
  	MariePull.h \
  	MariePeek.h \
--- 11,14 ----

Index: MarieObject.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieObject.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MarieObject.h	29 Mar 2005 15:20:41 -0000	1.3
--- MarieObject.h	7 Sep 2005 21:12:48 -0000	1.4
***************
*** 19,23 ****
  *    You can contact MARIE development team at http://marie.sourceforge.net
  */
! // Prevent Multiple Inclusion
  //
  // C++ Interface: MARIEObject
--- 19,23 ----
  *    You can contact MARIE development team at http://marie.sourceforge.net
  */
! 
  //
  // C++ Interface: MARIEObject
***************
*** 31,46 ****
  //
  //
  #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"
--- 31,38 ----
  //
  //
+ // Prevent Multiple Inclusion
  #ifndef _MARIE_OBJECT_H_
  #define _MARIE_OBJECT_H_
  
  #include "Object.h"
  #include "DataAbstract.h"
***************
*** 49,62 ****
  namespace marie
  {
!   class MarieObject : public FD::BufferedNode {
!   
!    public:
!      
!      MarieObject(std::string nodeName, FD::ParameterSet params) : FD::BufferedNode(nodeName,params) {}
!      virtual void copyDataAbstract(DataAbstract *data) = 0;
        
!    private:
!   
!   };
  }
  #endif
--- 41,51 ----
  namespace marie
  {
!    class MarieObject : public FD::Object{
        
!       public:
!       
!       MarieObject() {};
!       virtual void copyDataAbstract(DataAbstract *data) = 0;
!    };
  }
  #endif

Index: MarieDataCamera.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataCamera.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MarieDataCamera.h	29 Mar 2005 15:20:41 -0000	1.3
--- MarieDataCamera.h	7 Sep 2005 21:12:48 -0000	1.4
***************
*** 25,29 ****
  
  //FlowDesigner include
- #include "Object.h"
  #include "MarieObject.h"
  
--- 25,28 ----
***************
*** 38,66 ****
                   
       MarieDataCamera();  
!      MarieDataCamera (const DataCamera &data);
!          
!      //from BufferedNode   
!      MarieDataCamera(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out); 
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::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;
-      
    };
  }
--- 37,46 ----
                   
       MarieDataCamera();  
!      MarieDataCamera(const DataCamera &data);
!      
!      //from MarieObject
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);   
    };
  }

Index: MarieDataOdometry.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataOdometry.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MarieDataOdometry.h	29 Mar 2005 15:20:41 -0000	1.3
--- MarieDataOdometry.h	7 Sep 2005 21:12:48 -0000	1.4
***************
*** 24,28 ****
  
  //FlowDesigner include
- #include "Object.h"
  #include "MarieObject.h"
  
--- 24,27 ----
***************
*** 39,66 ****
       MarieDataOdometry (const DataOdometry &data);  
       
!      //from BufferedNode
!      MarieDataOdometry(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out);   
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::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;
    };
  }
--- 38,45 ----
       MarieDataOdometry (const DataOdometry &data);  
       
!      //from MarieObject
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);   
       virtual void copyDataAbstract(DataAbstract *data); 
    };
  }

Index: MarieDataLocalisation.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataLocalisation.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MarieDataLocalisation.h	27 Jun 2005 17:43:18 -0000	1.3
--- MarieDataLocalisation.h	7 Sep 2005 21:12:48 -0000	1.4
***************
*** 25,29 ****
  
  //FlowDesigner include
- #include "Object.h"
  #include "MarieObject.h"
  
--- 25,28 ----
***************
*** 40,63 ****
       MarieDataLocalisation(const DataLocalisation &command);
       
!      //from BufferedNode   
!      MarieDataLocalisation(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out);        
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);
-      
-      private:
-      
-      bool m_isNode;
-         
-      //inputs
-      int m_dataInID;   
-      int m_vectorInID;
-      
-      //outputs
-      int m_dataOutID;
-      int m_vectorOutID;
- 
-                 
    };
  }
--- 39,46 ----
       MarieDataLocalisation(const DataLocalisation &command);
       
!      //from MarieObject
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);
    };
  }

Index: MarieDataIR.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataIR.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MarieDataIR.h	29 Mar 2005 15:20:41 -0000	1.3
--- MarieDataIR.h	7 Sep 2005 21:12:48 -0000	1.4
***************
*** 25,29 ****
  
  //FlowDesigner include
- #include "Object.h"
  #include "MarieObject.h"
  
--- 25,28 ----
***************
*** 40,55 ****
       MarieDataIR (const DataIR &data);
       
!      //from BufferedNode
!      MarieDataIR(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out);       
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);  
-      
-      private:
-      
-      int m_inputID;
-      int m_outputID;
-      bool m_isNode;  
    };
  }
--- 39,46 ----
       MarieDataIR (const DataIR &data);
       
!      //from MarieObject
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);  
    };
  }

Index: MarieCommandBehavior.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandBehavior.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MarieCommandBehavior.h	9 Jun 2005 20:37:20 -0000	1.5
--- MarieCommandBehavior.h	7 Sep 2005 21:12:48 -0000	1.6
***************
*** 24,28 ****
  
  //FlowDesigner include
- #include "Object.h"
  #include "MarieObject.h"
  
--- 24,27 ----
***************
*** 39,63 ****
       MarieCommandBehavior(const CommandBehavior &command);  
       
!      //from BufferedNode   
!      MarieCommandBehavior(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out);    
       virtual void printOn(std::ostream &out) const;
!      virtual void readFrom(std::istream &in=std::cin);  
       virtual void copyDataAbstract(DataAbstract *data);
       
-      private:
-      
-      bool m_isNode;
-         
-      //inputs
-      int m_commandInID;
-      int m_behaviorNameInID;
-      int m_behaviorActivationInID;
-      int m_behaviorExploitationInID;
-      int m_behaviorResultsInID;
-      
-      //outputs
-      int m_commandOutID;
-      int m_RobotFlowActivationOutID;
    };
  }
--- 38,46 ----
       MarieCommandBehavior(const CommandBehavior &command);  
       
!      //from MarieObject
       virtual void printOn(std::ostream &out) const;
!      virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);
       
    };
  }

Index: MarieRequestSystem.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieRequestSystem.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MarieRequestSystem.h	29 Mar 2005 15:20:41 -0000	1.3
--- MarieRequestSystem.h	7 Sep 2005 21:12:48 -0000	1.4
***************
*** 25,29 ****
  
  //FlowDesigner include
- #include "Object.h"
  #include "MarieObject.h"
  
--- 25,28 ----
***************
*** 39,62 ****
       MarieRequestSystem();  
       MarieRequestSystem (const RequestSystem &data);
!          
!      //from BufferedNode   
!      MarieRequestSystem(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out); 
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);   
-      
-      private:
-      
-      bool m_isNode;
-         
-      //inputs
-      int m_inputID;
-      
-      //outputs
-      int m_commandID;
-      int m_dataID;
-      int m_requestIDID;
-      int m_stateID; 
    };
  }
--- 38,46 ----
       MarieRequestSystem();  
       MarieRequestSystem (const RequestSystem &data);
!      
!      //from MarieObject
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);   
    };
  }

Index: MarieCommandMotor.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandMotor.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MarieCommandMotor.h	29 Mar 2005 15:20:41 -0000	1.3
--- MarieCommandMotor.h	7 Sep 2005 21:12:48 -0000	1.4
***************
*** 25,29 ****
  
  //FlowDesigner include
- #include "Object.h"
  #include "MarieObject.h"
  
--- 25,28 ----
***************
*** 37,63 ****
       public:
       
-        
       MarieCommandMotor();    
       MarieCommandMotor(const CommandMotor &command);
       
!      //from BufferedNode   
!      MarieCommandMotor(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out);        
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::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;
    };
  }
--- 36,46 ----
       public:
       
       MarieCommandMotor();    
       MarieCommandMotor(const CommandMotor &command);
       
!      //from MarieObject
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);   
    };
  }

Index: MarieDataSonar.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataSonar.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MarieDataSonar.h	29 Mar 2005 15:20:41 -0000	1.3
--- MarieDataSonar.h	7 Sep 2005 21:12:48 -0000	1.4
***************
*** 24,28 ****
  
  //FlowDesigner include
- #include "Object.h"
  #include "MarieObject.h"
  
--- 24,27 ----
***************
*** 39,55 ****
       MarieDataSonar (const DataSonar &data);  
       
!      //from BufferedNode
!      MarieDataSonar(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out);       
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data); 
-         
-      private:
-         
-      int m_inputID;
-      int m_rangeID;
-      bool m_isNode;
-         
    };
  }
--- 38,45 ----
       MarieDataSonar (const DataSonar &data);  
       
!      //from MarieObject
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data); 
    };
  }

Index: MarieCommandCamera.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandCamera.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MarieCommandCamera.h	29 Mar 2005 15:20:41 -0000	1.4
--- MarieCommandCamera.h	7 Sep 2005 21:12:48 -0000	1.5
***************
*** 25,29 ****
  
  //FlowDesigner include
- #include "Object.h"
  #include "MarieObject.h"
  
--- 25,28 ----
***************
*** 37,80 ****
       public:
         
!      MarieCommandCamera();  
       MarieCommandCamera(const CommandCamera &command);
       
!      //from BufferedNode   
!      MarieCommandCamera(std::string nodeName, FD::ParameterSet params);
!      virtual void calculate(int output_id, int count, FD::Buffer &out);        
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);
-      
-      private:
-      
-      bool m_isNode;
-         
-      //inputs
-      int m_commandInID;   
-      int m_relBrightnessInID;
-      int m_relContrastInID;
-      int m_relPanInID;
-      int m_relTiltInID;
-      int m_relZoomInID;
-      int m_absBrightnessInID;
-      int m_absContrastInID;
-      int m_absPanInID;
-      int m_absTiltInID;
-      int m_absZoomInID;
-      
-      //outputs
-      int m_commandOutID;
-      int m_relBrightnessOutID;
-      int m_relContrastOutID;
-      int m_relPanOutID;
-      int m_relTiltOutID;
-      int m_relZoomOutID;
-      int m_absBrightnessOutID;
-      int m_absContrastOutID;
-      int m_absPanOutID;
-      int m_absTiltOutID;
-      int m_absZoomOutID;
-                 
    };
  }
--- 36,46 ----
       public:
         
!      MarieCommandCamera();
       MarieCommandCamera(const CommandCamera &command);
       
!      //from MarieObject
       virtual void printOn(std::ostream &out) const;
       virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);
    };
  }