X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Fkernel_ManagerContour_NDimensions%2FKernelManagerContour.h;h=4df96d10df98a00503d1933a129488dd74c063ca;hb=498505024562b776b91e25ca30f6e9c6bbd1f963;hp=39871491779663f9ce6c51e772e3a1f8e6b522b5;hpb=a654abbc209ed3104e98553cb381ef1c2845937a;p=creaContours.git

diff --git a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h
index 3987149..4df96d1 100644
--- a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h
+++ b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h
@@ -12,9 +12,18 @@
 //#include "ContourThing.h"
 #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>
 
 class KernelManagerContour{
@@ -32,7 +41,7 @@ public:
 	**	If images are available before the construction of the kernelManager this method should be used
 	**	it sets the vector images and initializes the environment
 	**/
-	KernelManagerContour(std::vector<vtkImageData*> images);
+	KernelManagerContour(std::vector<vtkImageData*> images,std::string datadir,std::string tmpdir);
 	~KernelManagerContour();
 
 	std::vector<vtkImageData*> getVectImages();
@@ -45,21 +54,21 @@ public:
 
 	
 
-	void initializeEnvironment();
+	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();
 
@@ -83,7 +92,7 @@ public:
 	
 	Instant * getCurrentInstant();
 
-	manualContourModel* getOutlineByKeyName(std::string cloneName);
+	manualBaseModel* getOutlineByKeyName(std::string cloneName);
 
 	bool onRedo(std::string& filename);
 
@@ -101,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();
 
@@ -111,7 +133,7 @@ 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);
@@ -124,6 +146,8 @@ public:
 
 	void setCurrentFileName(std::string filenam);
 	std::string getCurrentFileName();
+
+	std::string parseOsirixFile(std::string filename);
 private: 	
 //------------------------------------------------------------------------------------------------------------
 // Attributes
@@ -142,6 +166,7 @@ private:
 	int inundo;
 	int _currentIndex;
 	std::string	stundoredo;
+	std::string _datadir;
 
 	ContourPropagation* _contourPropagation;