[Robotflow-cvs] RobotFlow/Probes/src VisualROISelection.cc,1.1,1.2

[Pierre M. <sid...@us...>]

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

Modified Files:
	VisualROISelection.cc 
Log Message:
Added methods for rectangular ROI.

Index: VisualROISelection.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/VisualROISelection.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VisualROISelection.cc	2 Jun 2005 16:58:29 -0000	1.1
--- VisualROISelection.cc	2 Jun 2005 20:11:02 -0000	1.2
***************
*** 30,35 ****
  #include "VisualROI.h"
  
- using namespace std;
  using namespace FD;
  
  namespace RobotFlow {
--- 30,35 ----
  #include "VisualROI.h"
  
  using namespace FD;
+ using namespace std;
  
  namespace RobotFlow {
***************
*** 60,63 ****
--- 60,68 ----
   * @parameter_description Number of channels of the video frame.
   *
+  * @parameter_name ROI_REGION_TYPE
+  * @parameter_type int
+  * @parameter_value 0
+  * @parameter_description Geometric type for the ROI region (refer to enum e_VISUALROI_type in VisualROI.h).
+  *
   * @input_name IN_IMAGE
   * @input_type Image
***************
*** 91,94 ****
--- 96,100 ----
  		m_height = dereference_cast<int>(parameters.get("HEIGHT"));
  		m_numChannels = dereference_cast<int>(parameters.get("NUM_CHANNELS"));
+ 		m_roiType = dereference_cast<int>(parameters.get("ROI_REGION_TYPE"));
  		
  		m_numBytesInFrame = m_width*m_height*m_numChannels;
***************
*** 273,277 ****
  				int yCen = m_BBy1+hsY+1;
  				cout << "Creating a new ROI: xCen=" << xCen << " yCen=" << yCen << " hsX=" << hsX << " hsY=" << hsY << endl;
! 				m_roi = new VisualROI(e_VISUALROI_elliptical, xCen, yCen, hsX, hsY, 0);
  			}
  
--- 279,283 ----
  				int yCen = m_BBy1+hsY+1;
  				cout << "Creating a new ROI: xCen=" << xCen << " yCen=" << yCen << " hsX=" << hsX << " hsY=" << hsY << endl;
! 				m_roi = new VisualROI(e_VISUALROI_type(m_roiType), xCen, yCen, hsX, hsY, 0);
  			}
  
***************
*** 336,339 ****
--- 342,346 ----
  	ObjectRef m_imageRef;
  	VisualROI *m_roi;
+ 	int m_roiType;
  	IplImage *m_curFrame;
  };