Menu
▾
▴
[Robotflow-cvs] RobotFlow/Vision/include Bt848.h,1.4,1.5 CPoint.h,1.4,1.5 CRect.h,1.6,1.7 CSymbol.h,1.3,1.4 CTextLine.h,1.3,1.4 Cell.h,1.4,1.5 ColorLookup.h,1.4,1.5 Components.h,1.4,1.5 ComponentsData.h,1.5,1.6 Image.h,1.8,1.9 ImagePool.h,1.4,1.5 lines.h,1.3,1.4 types.h,1.1,1.2
|
From: Dominic L. <ma...@us...> - 2005-03-29 15:21:36
|
Update of /cvsroot/robotflow/RobotFlow/Vision/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10496/Vision/include Modified Files: Bt848.h CPoint.h CRect.h CSymbol.h CTextLine.h Cell.h ColorLookup.h Components.h ComponentsData.h Image.h ImagePool.h lines.h types.h Log Message: Now using the RobotFlow namespace and the FD namespace Index: CTextLine.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/CTextLine.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CTextLine.h 2 Jan 2005 14:44:00 -0000 1.3 --- CTextLine.h 29 Mar 2005 15:20:47 -0000 1.4 *************** *** 23,26 **** --- 23,27 ---- #include "CSymbol.h" + namespace RobotFlow { bool IsBefore(void*, void*); *************** *** 34,38 **** /////////////////////////////////////////////////////////////////////////////// ! class CTextLine : public Object { public: --- 35,39 ---- /////////////////////////////////////////////////////////////////////////////// ! class CTextLine : public FD::Object { public: *************** *** 99,101 **** --- 100,103 ---- }; + }//namespace RobotFlow #endif Index: Image.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/Image.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Image.h 2 Jan 2005 14:44:00 -0000 1.8 --- Image.h 29 Mar 2005 15:20:47 -0000 1.9 *************** *** 20,24 **** #include "Object.h" ! class Image : public Object { friend class ImagePool; --- 20,26 ---- #include "Object.h" ! namespace RobotFlow { ! ! class Image : public FD::Object { friend class ImagePool; *************** *** 85,87 **** --- 87,91 ---- }; + }//namespace RobotFlow + #endif Index: CPoint.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/CPoint.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CPoint.h 2 Jan 2005 14:44:00 -0000 1.4 --- CPoint.h 29 Mar 2005 15:20:47 -0000 1.5 *************** *** 25,28 **** --- 25,29 ---- #include "Object.h" + namespace RobotFlow { /** CPoint. *************** *** 37,41 **** \end{verbatim} */ ! class CPoint : public Object{ public: --- 38,42 ---- \end{verbatim} */ ! class CPoint : public FD::Object{ public: *************** *** 84,88 **** }; ! #endif --- 85,89 ---- }; ! }//namespace RobotFlow #endif Index: CSymbol.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/CSymbol.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CSymbol.h 2 Jan 2005 14:44:00 -0000 1.3 --- CSymbol.h 29 Mar 2005 15:20:47 -0000 1.4 *************** *** 23,26 **** --- 23,27 ---- #include <vector> + namespace RobotFlow { /** CSymbol. *************** *** 31,35 **** @version $Revision$ */ ! class CSymbol : public Object { public: --- 32,36 ---- @version $Revision$ */ ! class CSymbol : public FD::Object { public: *************** *** 70,72 **** --- 71,74 ---- }; + }//namespace RobotFlow #endif Index: Components.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/Components.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Components.h 2 Jan 2005 14:44:00 -0000 1.4 --- Components.h 29 Mar 2005 15:20:47 -0000 1.5 *************** *** 28,31 **** --- 28,32 ---- #include "Image.h" + namespace RobotFlow { #define MAX_COLOR 32 //THIS ALGORITHM CANNOT ALLOW MORE THAN 32 COLORS (CAUSE 32bits for unsigned int) *************** *** 38,43 **** int CRect_compare(const void *a, const void *b); ! ! class Components : public BufferedNode { --- 39,43 ---- int CRect_compare(const void *a, const void *b); ! class Components : public FD::BufferedNode { *************** *** 46,50 **** Components(); ! Components(std::string nodeName, ParameterSet params); ~Components(); --- 46,50 ---- Components(); ! Components(std::string nodeName, FD::ParameterSet params); ~Components(); *************** *** 62,66 **** void draw_rectangles(int color, unsigned short *image_16bits, unsigned short value); ! void calculate(int output_id, int count, Buffer &out); void reset(); --- 62,66 ---- void draw_rectangles(int color, unsigned short *image_16bits, unsigned short value); ! void calculate(int output_id, int count, FD::Buffer &out); void reset(); *************** *** 100,106 **** int m_num_colors; ! ObjectRef m_components_data; }; #endif --- 100,108 ---- int m_num_colors; ! FD::ObjectRef m_components_data; }; + }//namespace RobotFlow + #endif Index: ImagePool.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/ImagePool.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ImagePool.h 2 Jan 2005 14:44:00 -0000 1.4 --- ImagePool.h 29 Mar 2005 15:20:47 -0000 1.5 *************** *** 27,30 **** --- 27,31 ---- #include "Image.h" + namespace RobotFlow { class ImagePool { *************** *** 105,108 **** }; ! #endif --- 106,109 ---- }; ! }//namespace RobotFlow #endif Index: ComponentsData.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/ComponentsData.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ComponentsData.h 2 Jan 2005 14:44:00 -0000 1.5 --- ComponentsData.h 29 Mar 2005 15:20:47 -0000 1.6 *************** *** 22,27 **** #include "Components.h" ! class ComponentsData : public Object { public: --- 22,28 ---- #include "Components.h" + namespace RobotFlow { ! class ComponentsData : public FD::Object { public: *************** *** 67,71 **** }; ! #endif --- 68,72 ---- }; ! }//namespace RobotFlow #endif Index: lines.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/lines.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lines.h 2 Jan 2005 14:44:00 -0000 1.3 --- lines.h 29 Mar 2005 15:20:47 -0000 1.4 *************** *** 21,24 **** --- 21,26 ---- #include <iostream> + namespace RobotFlow { + struct line { *************** *** 36,40 **** }; ! class LineArray : public Object { public: --- 38,42 ---- }; ! class LineArray : public FD::Object { public: *************** *** 61,64 **** --- 63,67 ---- }; + }//namespace RobotFlow #endif Index: ColorLookup.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/ColorLookup.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ColorLookup.h 2 Jan 2005 14:44:00 -0000 1.4 --- ColorLookup.h 29 Mar 2005 15:20:47 -0000 1.5 *************** *** 20,24 **** #include "Object.h" ! class ColorLookup : public Object { public: --- 20,26 ---- #include "Object.h" ! namespace RobotFlow { ! ! class ColorLookup : public FD::Object { public: *************** *** 46,48 **** --- 48,51 ---- }; + }//namespace RobotFlow #endif Index: types.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/types.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** types.h 26 Apr 2002 23:39:37 -0000 1.1 --- types.h 29 Mar 2005 15:20:47 -0000 1.2 *************** *** 24,27 **** --- 24,29 ---- #include <math.h> + namespace RobotFlow { + typedef unsigned short word; typedef unsigned char byte; *************** *** 45,47 **** --- 47,51 ---- #define EDGE 0 + }//namespace RobotFlow + #endif Index: Bt848.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/Bt848.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Bt848.h 2 Jan 2005 14:44:00 -0000 1.4 --- Bt848.h 29 Mar 2005 15:20:47 -0000 1.5 *************** *** 25,30 **** #include <sys/signal.h> ! class Bt848 : public BufferedNode { --- 25,31 ---- #include <sys/signal.h> + namespace RobotFlow { ! class Bt848 : public FD::BufferedNode { *************** *** 35,43 **** void newframe(int sig); ! Bt848(std::string nodeName, ParameterSet params); virtual ~Bt848(); ! virtual void calculate(int output_id, int count, Buffer &out); static const int MODE_16BITS; --- 36,44 ---- void newframe(int sig); ! Bt848(std::string nodeName, FD::ParameterSet params); virtual ~Bt848(); ! virtual void calculate(int output_id, int count, FD::Buffer &out); static const int MODE_16BITS; *************** *** 77,81 **** void *mmbuf; ! ObjectRef m_image; int outputID; --- 78,82 ---- void *mmbuf; ! FD::ObjectRef m_image; int outputID; *************** *** 86,89 **** }; ! #endif --- 87,90 ---- }; ! }//namespace RobotFlow #endif Index: Cell.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/Cell.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Cell.h 2 Jan 2005 14:44:00 -0000 1.4 --- Cell.h 29 Mar 2005 15:20:47 -0000 1.5 *************** *** 26,29 **** --- 26,30 ---- #include "CPoint.h" + namespace RobotFlow { /** ImageCell. *************** *** 38,42 **** \end{verbatim} */ ! class ImageCell : public Object { public: --- 39,43 ---- \end{verbatim} */ ! class ImageCell : public FD::Object { public: *************** *** 135,138 **** }; ! #endif --- 136,139 ---- }; ! }//namespace RobotFlow #endif Index: CRect.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/CRect.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CRect.h 2 Jan 2005 14:44:00 -0000 1.6 --- CRect.h 29 Mar 2005 15:20:47 -0000 1.7 *************** *** 27,30 **** --- 27,31 ---- #include "Cell.h" + namespace RobotFlow { /** CRect. *************** *** 40,44 **** \end{verbatim} */ ! class CRect : public Object { public: --- 41,45 ---- \end{verbatim} */ ! class CRect : public FD::Object { public: *************** *** 278,281 **** }; ! #endif --- 279,282 ---- }; ! }//namespace RobotFlow #endif |
