X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2FContour%2FContourExtractData.h;h=a1d4ddc3ee27679360d2e12e89e763b73363413b;hb=61dfb8201f2762bceabe938f978e6ada6f9d0873;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..a1d4ddc 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.h
@@ -67,11 +67,12 @@
 	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 +84,15 @@
 							   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);
+	  void InitLstContoursLinesYPoints();
+
   };