X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Fkernel_ManagerContour_NDimensions%2FKernelManagerContour.h;h=28238838b422f2537525e48e242f57763d20710c;hb=4fdb591d3acc9947caa5e26e17ea14e8d78cf061;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..2823883 100644
--- a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h
+++ b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h
@@ -13,13 +13,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 +47,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 +92,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 +138,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