X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2FContour%2FContourExtractData.h;h=7003fcd421b3f42b4bb63c5a86ebf38109d5d15b;hb=751ae064f0944a8c2fbe0d21a8a0f58874b75119;hp=658f5d4319b521f4fe3205e71a1726642d81d3c8;hpb=42ef0b76d65a1b4cdde710db14ada2eed990a63b;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.h b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.h
index 658f5d4..7003fcd 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.h
@@ -18,8 +18,9 @@
 	void SetImage( vtkImageData* imagedata);
 	void SetZtoBeAnalys( int z );
 
-	void SetLstManualContourModel( std::vector<manualContourModel*> lstManConMod);
-	void GetValuesInsideCrown(	std::vector<double> *pLstValue,
+	void SetLstManualContourModel( std::vector<manualBaseModel*> lstManConMod);
+	void GetValuesInsideCrown(	int *numberOfPixels,
+								std::vector<double> *pLstValue,
 								std::vector<double> *pLstValuePosX,
 								std::vector<double> *pLstValuePosY,
 								std::vector<double> *pLstValuePosZ);
@@ -45,11 +46,27 @@
 								double *vol_average, double *vol_standardeviation);
 	  
 	  void ResetImageResult(int z);
-	  
+	  void SetScalarRange(double min, double max);
+	  void InitLstContoursLinesYPoints();
+	  bool isInside(int x, int y, int typeOperation );
+	
+	  //
+	  // Asigns the sizeImageY.
+	  // @param pSizeImageY - int
+	  void SetSizeImageY(int pSizeImageY);
 	  
   private:
+	double								scalarRange[2];
 	bool								okImagesResults;
-	std::vector<manualContourModel*>	lstManConMod;
+
+	//
+	// List of contours to obtain the respective statistics.
+	//
+	std::vector<manualBaseModel*>	lstManConMod;
+
+	//
+	// Operation Type (AND,OR,XOR...)
+	//
 	int									_typeOperation;
 
 	int									zImage;
@@ -57,21 +74,33 @@
 	vtkImageData						*imagedataValueResult;
 	vtkImageData						*imagedataMaskResult;
 
-	bool isInside(int x, int y, int typeOperation );
+	//Size Y
+	int _sizeImageY;
+	
+	//
+	// Asigns the minimum and maximum points of the contour model in parameter.
+	// @param *minPoint - int
+	// @param *maxPoint - int
+	// @param *manualcontourmodel - manualBaseModel
+	//
 	void GetMinMaxPoint(int *minPoint, 
 						int *maxPoint, 
-						manualContourModel *manualcontourmodel );
+						manualBaseModel *manualcontourmodel );
+	//
+	// Obtain the minimum and maximum point among the contours. The value is saved in the parameter
+	// pointers
+	// @param *minPoint - int pointer to the minPoint
+	// @param *maxPoint - int pointer to the maxPoint
+	//
 	void GetMinMaxPoint_Of_LstManConMod(	int *minPoint, 
 											int *maxPoint);
 
-	int AnalisisContourInside(	int x, 
-								int y, 
-								manualContourModel *manualcontourmodel );
+	int AnalisisContourInsideV2(int x, int y, int iContour );
+	  
 	double GetDataValue(int x, int y, int z);
 	void PutVtkImageDataResultValue( int x, int y,int z, double value );
 	void InitVtkImagesResult();
 
-
 	  //--Volume Statistics--
 	  int		vol_rCountRange;
 	  int		vol_rsize;
@@ -83,6 +112,16 @@
 							   double minValue,double maxValue,
 							   double acum_average, double acum_standardeviation);
 	  
+	  // Optimize IsInside
+	  // List of contours , list of linesY, list of points over the line
+	  std::vector< std::vector< std::vector<double> > >		_lstlstlstVecX1;
+	  std::vector< std::vector< std::vector<double> > >		_lstlstlstVecY1;
+	  std::vector< std::vector< std::vector<double> > >		_lstlstlstVecX2;
+	  std::vector< std::vector< std::vector<double> > >		_lstlstlstVecY2;
+	  void Fill_lstlstlstVecXY(int iContour, int sizeY);
+	  
+
+
   };