X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fkernel_ManagerContour_NDimensions%2FKernelManagerContour.h;h=029ecd9a6ec1c21027028ce7f0f641cd7080a3ad;hb=refs%2Fheads%2Fvtk9itk4wx3-macos;hp=d89f6c4de6c10a239b57c1a0ce76d3e83b246fe7;hpb=dfdd7c80dbd20fea642090201b64eb7119a144bf;p=creaContours.git

diff --git a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h
index d89f6c4..029ecd9 100644
--- a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h
+++ b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# 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 __KERNELMANAGERCONTOUR__
 #define __KERNELMANAGERCONTOUR__
 
@@ -13,13 +38,16 @@
 #include "OutlineModelManager.h"
 #include "OutlineModelBuilder.h"
 #include "time.h"
-
+#ifdef ParserOsirix_BUILD
+#include "OsirixParser.h"
+#endif
 #include "ContourPropagation.h"
 
 #include "manualContourModel.h"
 #include "manualContourModelCircle.h"
 #include "manualContourModelLine.h"
 #include "manualContourModelRoi.h"
+#include "manualContourModelPolygon.h"
 
 #include <vtkImageChangeInformation.h>
 
@@ -44,19 +72,22 @@ public:
 	std::vector<vtkImageData*> getVectImages();
 	void setVectImages(std::vector<vtkImageData*> vectimg);
 
+	void GetSpacing(double *vecspc, int iImage);
+
+	
 	/**
 	**	This method returns the source of the image data selected by the user.
 	*/
 	vtkImageData* getSourceImage();
 
-	
+
 
 	void initializeEnvironment(std::string datadir);
 
 
 	/**
 	**	This methods connect the event in the class interfNewContourMenu with the world of the appli
-	**/	
+	**/
 
 	std::string createOutline(manualBaseModel * manModelContour,std::vector<int> instantVector);
 	/////////////////////////////////
@@ -86,7 +117,7 @@ public:
 	void setInstant(Instant* theInstant);
 	void setInstant(std::vector<int> vectInstant);
 	std::string createCopyContourOf ( std::string anExistingKName, std::vector<int> &instantNoTouchData);
-	
+
 	Instant * getCurrentInstant();
 
 	manualBaseModel* getOutlineByKeyName(std::string cloneName);
@@ -132,40 +163,42 @@ public:
 
 	std::vector<manualBaseModel*> ExploseEachModel( std::vector<manualBaseModel*> lstManConMod );
 
-	
+
 	void getConceptsInformation(std::vector<std::string>& conceptNameVect, std::vector<int>& conceptSizeVect);
 
 	vtkImageData* getImageAtInstant(std::vector<int> inst);
-	
+
 //------------------------------------------------------------------------------------------------------------
 // Constants
 //------------------------------------------------------------------------------------------------------------
 
 	void setCurrentFileName(std::string filenam);
 	std::string getCurrentFileName();
-private: 	
+
+	std::string parseOsirixFile(std::string filename);
+private:
 //------------------------------------------------------------------------------------------------------------
 // Attributes
 //------------------------------------------------------------------------------------------------------------
-	std::vector<vtkImageData*> vectimages;
+	std::vector<vtkImageData*>				vectimages;
+	std::vector<std::vector<double> >		vectimagesSpacing;
 
-	ImageSourceThing		* imageSource;
+	ImageSourceThing						*imageSource;
 
 	//Instant * _actualInstant;
 //Temporary attribute should be removed
-	OutlineModelManager		* modelManager;
-
-	std::string filename;
+	OutlineModelManager						*modelManager;
 
-	int inredo;
-	int inundo;
-	int _currentIndex;
-	std::string	stundoredo;
+	std::string								filename;
 
-	ContourPropagation* _contourPropagation;
+	int										inredo;
+	int										inundo;
+	int										_currentIndex;
+	std::string								stundoredo;
+	std::string								_datadir;
 
-	bool isInitContourPropagation();
+	ContourPropagation						*_contourPropagation;
 
-	OutlineModelManager* getOutlineModelManager();
+	OutlineModelManager						*getOutlineModelManager();
 };
 #endif