X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Fkernel_ManagerContour_NDimensions%2FKernelManagerContour.h;h=cb3eed540fc3657e7e1099d064044f1256ad55d4;hb=fb42dbcd2fdf92b96397f90ac6b2794026c6d5cc;hp=023846c7164fbce76065d74f40b6253f6e440976;hpb=e12b7f2166c9aeae510907210c450d7044a6a352;p=creaContours.git

diff --git a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h
index 023846c..cb3eed5 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>
 
@@ -49,23 +52,23 @@ public:
 	*/
 	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(manualContourModel * manModelContour,std::vector<int> instantVector);
+	std::string createOutline(manualBaseModel * manModelContour,std::vector<int> instantVector);
 	/////////////////////////////////
 
 	std::string intToString(int num);
 
 	std::vector<std::string> GetLstNameThingsStatic();
 
-	void SaveThingName(FILE* pFile, std::string name );
+	void SaveThingName(FILE* pFile, FILE *pFileData, std::string name );
 
 	std::vector<std::string> GetLstNameThings();
 
@@ -86,10 +89,10 @@ public:
 	void setInstant(Instant* theInstant);
 	void setInstant(std::vector<int> vectInstant);
 	std::string createCopyContourOf ( std::string anExistingKName, std::vector<int> &instantNoTouchData);
-	
+
 	Instant * getCurrentInstant();
 
-	manualContourModel* getOutlineByKeyName(std::string cloneName);
+	manualBaseModel* getOutlineByKeyName(std::string cloneName);
 
 	bool onRedo(std::string& filename);
 
@@ -107,9 +110,22 @@ public:
 
 	void getMaxMinZ(double *minZ,double *maxZ);
 
-	manualContourModel* GetPoints(int z,int type, std::vector<double>* vecCtrlPointX,std::vector<double>* vecCtrlPointY,std::vector<double>* vecCtrlPointZ, std::string& theName,int typeofcontour, std::vector<int> tempVector);
-
-	manualContourModel* factoryManualContourModel(int typeContour);
+	manualBaseModel* GetPoints(int z,int type, std::vector<double>* vecCtrlPointX,std::vector<double>* vecCtrlPointY,std::vector<double>* vecCtrlPointZ, std::string& theName,int typeofcontour, std::vector<int> tempVector);
+
+	//
+	// Method which creates the model associated with the type in parameter. The possible contour types are:
+	// 0-spline
+	// 1-spline
+	// 2-rectangle
+	// 3-circle
+	// 4-BullEye
+	// 5-BullEyeSector
+	// 6-Line
+	// 7-Points
+	// NOTE: The view and the controler are created in the wxVtkBaseView_SceneManager class, configureViewControlTo method
+	// @param typeContour - int
+	// @return manualBaseModel - Model created based on the type
+	manualBaseModel* factoryManualContourModel(int typeContour);
 
 	void CalculeSplinePropagation();
 
@@ -117,42 +133,44 @@ public:
 
 	std::vector<ContourThing**> getOutlinesAtInstant(Instant* instant );
 
-	std::vector<manualContourModel*> ExploseEachModel( std::vector<manualContourModel*> lstManConMod );
+	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