X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2FContour%2FContourExtractData.h;h=265d6d3db4ea3e836d0e1b81d4eb2fa290fbf370;hb=b2ac7f59e78e33f8e11065cffa2f2072aa9a9ee5;hp=b463709d2c5cb94ce79d37f1587e5f424a065475;hpb=5b48f9a5462110a1400b510b897b7d6a1758dca6;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.h b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.h
index b463709..265d6d3 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.h
@@ -1,3 +1,27 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
 
 #ifndef __ContourExtractData_h_INCLUDED_H__
 #define __ContourExtractData_h_INCLUDED_H__
@@ -19,7 +43,8 @@
 	void SetZtoBeAnalys( int z );
 
 	void SetLstManualContourModel( std::vector<manualBaseModel*> lstManConMod);
-	void GetValuesInsideCrown(	std::vector<double> *pLstValue,
+	void GetValuesInsideCrown(	int *numberOfPixels,
+								std::vector<double> *pLstValue,
 								std::vector<double> *pLstValuePosX,
 								std::vector<double> *pLstValuePosY,
 								std::vector<double> *pLstValuePosZ);
@@ -45,9 +70,17 @@
 								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;
 
 	//
@@ -65,8 +98,9 @@
 	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
@@ -109,7 +143,8 @@
 	  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();
+	  
+
 
   };