[Robotflow-cvs] RobotFlow/Vision/include IntegralColorExtraction.h,1.1,1.2 IntegralEdgesOriExtraction.h,1.1,1.2 IntegralLBPExtraction.h,1.1,1.2

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

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

Modified Files:
	IntegralColorExtraction.h IntegralEdgesOriExtraction.h 
	IntegralLBPExtraction.h 
Log Message:
Added color boundary detection, rectangle difference features and fixed some issues in order to make this class an Object and a BufferedNode.

Index: IntegralLBPExtraction.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/IntegralLBPExtraction.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IntegralLBPExtraction.h	2 Jun 2005 16:49:38 -0000	1.1
--- IntegralLBPExtraction.h	9 Jun 2005 17:08:38 -0000	1.2
***************
*** 42,46 ****
  		int i_numChannels, int i_numHoriIntRect, int i_numVertIntRect,
  		int i_numSamples, int i_predicate, bool i_doInterpolation,
! 		bool i_useUniform, int i_startAngle, double i_maxValue);
  
  	//
--- 42,47 ----
  		int i_numChannels, int i_numHoriIntRect, int i_numVertIntRect,
  		int i_numSamples, int i_predicate, bool i_doInterpolation,
! 		bool i_useUniform, int i_startAngle, double i_maxValue,
! 		bool i_useRectDiff);
  
  	//
***************
*** 159,162 ****
--- 160,169 ----
  	int m_numValidPattern;
  	
+ 	double m_maxFeatValue;
+ 	
+ 	bool m_useRectDiff;
+ 	double *m_tmpMeanFeatures;
+ 	double *m_curMeanVal;
+ 	
  	// Precalculated table of interpolation points.
  	CvPoint *m_samplePoints;

Index: IntegralColorExtraction.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/IntegralColorExtraction.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IntegralColorExtraction.h	2 Jun 2005 16:49:38 -0000	1.1
--- IntegralColorExtraction.h	9 Jun 2005 17:08:38 -0000	1.2
***************
*** 41,45 ****
  	IntegralColorExtraction(int i_width, int i_height, 
  		int i_numChannels, int i_numHoriIntRect, int i_numVertIntRect,
! 		double i_maxValue);
  
  	//
--- 41,46 ----
  	IntegralColorExtraction(int i_width, int i_height, 
  		int i_numChannels, int i_numHoriIntRect, int i_numVertIntRect,
! 		double i_maxValue, bool i_useRectDiff, bool i_useBoundary, 
! 		double i_boundaryMeanDiffThresh);
  
  	//
***************
*** 74,77 ****
--- 75,80 ----
  	void calculate(int output_id, int count, FD::Buffer &out);
  	
+ 	void Preprocess(IplImage *i_srcImg);
+ 	
  	void Preprocess(const unsigned char *i_src);
  	
***************
*** 119,125 ****
--- 122,136 ----
  	int m_numVertIntRect;
  	int m_numIntRect;
+ 	int m_numFeatures;
  	// Maximum pixel channel value
  	double m_maxValue;
  	
+ 	bool m_useRectDiff;
+ 	double *m_tmpMeanFeatures;
+ 	double *m_curMeanVal;
+ 	
+ 	bool m_useBoundary;
+ 	double m_boundaryMeanDiffThresh;
+ 	
  	// Integral color descriptor for region of interest
  	FD::RCPtr<FD::Vector<VisualFeatureDesc<double> *> > m_featVect;

Index: IntegralEdgesOriExtraction.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Vision/include/IntegralEdgesOriExtraction.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IntegralEdgesOriExtraction.h	2 Jun 2005 16:49:38 -0000	1.1
--- IntegralEdgesOriExtraction.h	9 Jun 2005 17:08:38 -0000	1.2
***************
*** 40,45 ****
  	//
  	IntegralEdgesOriExtraction(int i_width, int i_height, 
! 		int i_numChannels, int i_numOriBins, double i_edgesStrTresh,
! 		double i_maxStrengthValue);
  
  	//
--- 40,46 ----
  	//
  	IntegralEdgesOriExtraction(int i_width, int i_height, 
! 		int i_numChannels, int i_numHoriIntRect, int i_numVertIntRect,
! 		int i_numOriBins, double i_edgesStrTresh,
! 		double i_maxStrengthValue, bool i_useRectDiff);
  
  	//
***************
*** 125,128 ****
--- 126,134 ----
  	// Maximum strength channel value
  	double m_maxStrengthValue;
+ 	double m_maxFeatValue;
+ 	
+ 	bool m_useRectDiff;
+ 	double *m_tmpMeanFeatures;
+ 	double *m_curMeanVal;
  	
  	// Integral color descriptor for region of interest