[Robotflow-cvs] RobotFlow/Probes/include LaserProbe.h,1.2,1.3 MapDef.h,1.1,1.2 PTZControl.h,1.6,1.7 SymbolKeypad.h,1.2,1.3 VirtualJoystick.h,1.5,1.6

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

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

Modified Files:
	LaserProbe.h MapDef.h PTZControl.h SymbolKeypad.h 
	VirtualJoystick.h 
Log Message:
Now using the RobotFlow namespace and the FD namespace

Index: SymbolKeypad.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Probes/include/SymbolKeypad.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SymbolKeypad.h	2 Jan 2005 14:43:59 -0000	1.2
--- SymbolKeypad.h	29 Mar 2005 15:20:46 -0000	1.3
***************
*** 7,12 ****
  #include <map>
  
  
! class SymbolKeypad : public Node {
  
    //callbacks
--- 7,13 ----
  #include <map>
  
+ namespace RobotFlow {
  
! class SymbolKeypad : public FD::Node {
  
    //callbacks
***************
*** 86,90 ****
    public:
  
!    SymbolKeypad(std::string nodeName, ParameterSet params);
  
     virtual ~SymbolKeypad();
--- 87,91 ----
    public:
  
!    SymbolKeypad(std::string nodeName, FD::ParameterSet params);
  
     virtual ~SymbolKeypad();
***************
*** 101,105 ****
        and for the 'count' iteration */
  
!    virtual ObjectRef getOutput(int output_id, int count); 
  
     static const int pad_0_number;
--- 102,106 ----
        and for the 'count' iteration */
  
!    virtual FD::ObjectRef getOutput(int output_id, int count); 
  
     static const int pad_0_number;
***************
*** 141,144 ****
  };
  
! 
  #endif
--- 142,145 ----
  };
  
! }//namespace RobotFlow
  #endif

Index: MapDef.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Probes/include/MapDef.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MapDef.h	6 Jun 2002 12:09:23 -0000	1.1
--- MapDef.h	29 Mar 2005 15:20:46 -0000	1.2
***************
*** 4,7 ****
--- 4,9 ----
  #define _MAPDEF_H_
  
+ namespace RobotFlow {
+ 
  #define MAP_MAX_ROW                 500
  #define MAP_MAX_COLUMN              500
***************
*** 46,48 ****
--- 48,52 ----
  };
  
+ }//namespace RobotFlow
+ 
  #endif  // _MAPDEF_H_

Index: LaserProbe.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Probes/include/LaserProbe.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LaserProbe.h	2 Jan 2005 14:43:59 -0000	1.2
--- LaserProbe.h	29 Mar 2005 15:20:46 -0000	1.3
***************
*** 8,12 ****
  #include "MapDef.h"
  
! class LaserProbe : public Probe
  {
    protected:
--- 8,14 ----
  #include "MapDef.h"
  
! namespace RobotFlow {
! 
! class LaserProbe : public FD::Probe
  {
    protected:
***************
*** 22,26 ****
    public:
  
!    LaserProbe(std::string nodeName, ParameterSet params);
  
     virtual ~LaserProbe();
--- 24,28 ----
    public:
  
!    LaserProbe(std::string nodeName, FD::ParameterSet params);
  
     virtual ~LaserProbe();
***************
*** 49,52 ****
  };
  
! 
  #endif
--- 51,54 ----
  };
  
! }//namespace RobotFlow
  #endif

Index: VirtualJoystick.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Probes/include/VirtualJoystick.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** VirtualJoystick.h	2 Jan 2005 14:43:59 -0000	1.5
--- VirtualJoystick.h	29 Mar 2005 15:20:46 -0000	1.6
***************
*** 8,16 ****
  #include <gnome.h>
  
  /**
  Virtual Joystick is a visual probe that shows a joystick with 2 standard buttons and 2 toggle buttons.
  \author Dominic Letourneau
  */
! class VirtualJoystick : public BufferedNode {
  
    protected:
--- 8,18 ----
  #include <gnome.h>
  
+ namespace RobotFlow {
+ 
  /**
  Virtual Joystick is a visual probe that shows a joystick with 2 standard buttons and 2 toggle buttons.
  \author Dominic Letourneau
  */
! class VirtualJoystick : public FD::BufferedNode {
  
    protected:
***************
*** 50,54 ****
       \param params The parameters passed at construction
    */
!   VirtualJoystick(std::string nodeName, ParameterSet params);
    
    ///Destructor
--- 52,56 ----
       \param params The parameters passed at construction
    */
!   VirtualJoystick(std::string nodeName, FD::ParameterSet params);
    
    ///Destructor
***************
*** 67,71 ****
       \param out the buffer where to  write the result
    */
!   virtual void calculate(int output_id, int count, Buffer &out);
    
    /** 
--- 69,73 ----
       \param out the buffer where to  write the result
    */
!   virtual void calculate(int output_id, int count, FD::Buffer &out);
    
    /** 
***************
*** 83,86 ****
  };
  
! 
  #endif
--- 85,88 ----
  };
  
! }//namespace RobotFlow
  #endif

Index: PTZControl.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Probes/include/PTZControl.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PTZControl.h	2 Jan 2005 14:43:59 -0000	1.6
--- PTZControl.h	29 Mar 2005 15:20:46 -0000	1.7
***************
*** 7,12 ****
  #include <list>
  
  
! class PTZControl : public BufferedNode {
  
    protected:
--- 7,13 ----
  #include <list>
  
+ namespace RobotFlow {
  
! class PTZControl : public FD::BufferedNode {
  
    protected:
***************
*** 37,41 ****
    public:
    
!   PTZControl(std::string nodeName, ParameterSet params);
    
    virtual ~PTZControl();
--- 38,42 ----
    public:
    
!   PTZControl(std::string nodeName, FD::ParameterSet params);
    
    virtual ~PTZControl();
***************
*** 45,49 ****
    virtual void initialize();
    
!   virtual void calculate(int output_id, int count, Buffer &out);
  
    void addAbsPanCommand(int command);
--- 46,50 ----
    virtual void initialize();
    
!   virtual void calculate(int output_id, int count, FD::Buffer &out);
  
    void addAbsPanCommand(int command);
***************
*** 55,59 ****
    
  };
! 
  
  #endif
--- 56,60 ----
    
  };
! }//namespace RobotFlow
  
  #endif