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

diff --git a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx
index 9d3f861..236e4a5 100644
--- a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx
+++ b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx
@@ -130,7 +130,7 @@ OutlineModelManager* KernelManagerContour::getOutlineModelManager(){
 	return modelManager;
 }
 
-std::string KernelManagerContour::createOutline(manualContourModel * manModelContour,std::vector<int> instantVector){
+std::string KernelManagerContour::createOutline(manualBaseModel * manModelContour,std::vector<int> instantVector){
 	return modelManager->createOutline( manModelContour, instantVector );
 }
 
@@ -153,8 +153,8 @@ std::vector<std::string> KernelManagerContour::GetLstNameThingsStatic(){
 	return modelManager->GetLstNameThingsStatic();
 }
 
-void KernelManagerContour::SaveThingName(FILE* pFile, std::string name ){
-	modelManager->SaveThingName(pFile, name);
+void KernelManagerContour::SaveThingName(FILE* pFile, FILE *pFileData, std::string name ){
+	modelManager->SaveThingName(pFile, pFileData, name);
 }
 std::vector<std::string> KernelManagerContour::GetLstNameThings(){
 	return modelManager->GetLstNameThings();
@@ -168,7 +168,7 @@ bool KernelManagerContour::IsPartOfStaticList(std::string theKeyName){
 }
 
 void KernelManagerContour::deleteCModel(std::string theKeyName){
-	manualContourModel* cModel		= modelManager->getOutlineByKeyName(theKeyName)->getModel();
+	manualBaseModel* cModel		= modelManager->getOutlineByKeyName(theKeyName)->getModel();
 	modelManager->removeOutline( theKeyName );
 
 	delete cModel;
@@ -207,7 +207,7 @@ std::string KernelManagerContour::createCopyContourOf ( std::string anExistingKN
 {
 	return modelManager->createCopyContourOf(anExistingKName, instantNoTouchData);
 }
-manualContourModel* KernelManagerContour::getOutlineByKeyName(std::string cloneName){
+manualBaseModel* KernelManagerContour::getOutlineByKeyName(std::string cloneName){
 	return modelManager->getOutlineByKeyName (cloneName )->getModel();
 }
 
@@ -314,11 +314,11 @@ void KernelManagerContour::CalculeSplinePropagation(){
 	_contourPropagation->CalculeSplinePropagation();
 }
 
-manualContourModel* KernelManagerContour::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){
+manualBaseModel* KernelManagerContour::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){
     
 	
 	bool addedModel = false;
-	manualContourModel* manModelContour=NULL;
+	manualBaseModel* manModelContour=NULL;
 
 	if (_contourPropagation->ifSliceKeyContourExist(z)==false){
 
@@ -358,9 +358,12 @@ manualContourModel* KernelManagerContour::GetPoints(int z,int type, std::vector<
 	return manModelContour;
 }
 
-manualContourModel * KernelManagerContour::factoryManualContourModel(int typeContour)
+manualBaseModel * KernelManagerContour::factoryManualContourModel(int typeContour)
 {	
-	manualContourModel *manModelContour=NULL;
+	manualBaseModel *manModelContour=NULL;
+
+	// Creating the model
+	// NOTE: The view and the controler are created in the wxVtkBaseView_SceneManager class, configureViewControlTo method
 
 	// spline
 	if (typeContour==0)
@@ -391,6 +394,12 @@ manualContourModel * KernelManagerContour::factoryManualContourModel(int typeCon
 	{
 		manModelContour = new manualContourModelLine();
 	}
+	
+	// points
+	if (typeContour==7)
+	{
+		manModelContour = new manualBaseModel();
+	}
 
 	return manModelContour;
 }
@@ -410,9 +419,9 @@ std::vector<ContourThing**> KernelManagerContour::getOutlinesAtInstant(Instant*
 	return modelManager->getOutlinesAtInstant(instant);
 }
 
-std::vector<manualContourModel*> KernelManagerContour::ExploseEachModel( std::vector<manualContourModel*> lstManConMod ){
-	std::vector<manualContourModel*> lstTmp;
-	std::vector<manualContourModel*> lstResult;
+std::vector<manualBaseModel*> KernelManagerContour::ExploseEachModel( std::vector<manualBaseModel*> lstManConMod ){
+	std::vector<manualBaseModel*> lstTmp;
+	std::vector<manualBaseModel*> lstResult;
 	int j,jSize;
 	int i,iSize=lstManConMod.size();
 	for (i=0;i<iSize;i++)