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

diff --git a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h
index 023846c..d89f6c4 100644
--- a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h
+++ b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h
@@ -58,14 +58,14 @@ public:
 	**	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();
 
@@ -89,7 +89,7 @@ public:
 	
 	Instant * getCurrentInstant();
 
-	manualContourModel* getOutlineByKeyName(std::string cloneName);
+	manualBaseModel* getOutlineByKeyName(std::string cloneName);
 
 	bool onRedo(std::string& filename);
 
@@ -107,9 +107,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,7 +130,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);