X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=lib%2FInterface_ManagerContour_NDimensions%2FwxVtkBaseView_SceneManager.cxx;h=128f1bca280b567bb6e3659a5756a728f0205189;hb=7d61ec98f760736e883639ad6f71b0c88e35a1a2;hp=845adcf6a6942c9ba888512cd2b7fa68e2968154;hpb=11f6d82d938648eb1b5ee5321c8a0c797b20606e;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
index 845adcf..128f1bc 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
@@ -124,7 +124,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		return _wxVtk_BaseView;
 	}
 	//------------------------------------------------------------------------------------------------------------
-	void wxVtkBaseView_SceneManager :: configureViewControlTo( std::string theKeyName, manualContourModel * manModelContour, double * spc,int typeContour)
+	void wxVtkBaseView_SceneManager :: configureViewControlTo( std::string theKeyName, manualBaseModel * manModelContour, double * spc,int typeContour)
 	{
 		//setControlActiveStateOfALL( false );
 		_creatingROI = true;
@@ -142,11 +142,11 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		manualViewBaseContour		*manViewerContour;
 
 		// Creating the view manualViewContour and the manualContourControler
+		// NOTE: The model is created in the KernelManagerContour class, factoryManualContourModel method
 		if (typeContour==1)
 		{
 			manContourControl	= new manualContourControler();
 			manViewerContour	= new manualViewContour();
-			manModelContour->SetCloseContour(false);
 		}
 
 		if (typeContour==2)
@@ -173,6 +173,20 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 			manViewerContour	= new manualViewLine();
 		}
 
+		//Points
+		if (typeContour==7)
+		{
+			manContourControl	= new manualContourControler();
+			manViewerContour	= new manualViewPoints();
+		}
+
+		//Polygon
+		if (typeContour==10)
+		{
+			manContourControl	= new manualContourControler();
+			manViewerContour	= new manualViewContour();
+		}
+
 
 
         _lastInteraction = insertWrap( theKeyName, manContourControl, manViewerContour );
@@ -329,7 +343,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 	//  Other functional methods
 	//------------------------------------------------------------------------------------------------------------
 
-	void wxVtkBaseView_SceneManager :: createCopyContourOf( std::string anExistingKName, std::string cloneName, manualContourModel * manualModel, bool append )
+	void wxVtkBaseView_SceneManager :: createCopyContourOf( std::string anExistingKName, std::string cloneName, manualBaseModel * manualModel, bool append )
 	{
 		if ( !append )
 		{
@@ -341,7 +355,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 
 		iter = _contours_ViewControl->find( anExistingKName );
 
-		manualContourModel			*cModule	= manualModel;
+		manualBaseModel			*cModule	= manualModel;
 		manualViewBaseContour		*cViewer	= iter->second->getViewer()->Clone();
 		manualContourBaseControler	*cControl	= iter->second->getControler()->Clone(  );
 
@@ -1110,7 +1124,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		if (currentSelection.size()>=1){
 			
 			manualContourBaseControler *cControler	= this->getControlerOf( currentSelection[0] );
-			manualContourModel *cModel				= cControler->GetManualContourModel();
+			manualBaseModel *cModel				= cControler->GetManualContourModel();
 			int i,size = cModel->GetNumberOfPointsSpline();
 			double x,y,z;
 			for (i=0; i<size; i++) 
@@ -1171,7 +1185,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		_widthOfContour = width;
 		manualViewBaseContour		*cViewer;
 		ContourWrap_ViewControl		*conwraviwcont;
-		std::map <std::string, ContourWrap_ViewControl *>::iterator iter;; 
+		std::map <std::string, ContourWrap_ViewControl *>::iterator iter; 
 
 		for (iter=_contours_ViewControl->begin(); iter!=_contours_ViewControl->end(); iter++ )
 		{
@@ -1198,8 +1212,8 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 
 		ContourWrap_ViewControl* ccon = getContourWrap_ViewControlOf(theKeyName);
 
-		manualViewBaseContour			* cViewer = ccon->getViewer();
-		manualContourBaseControler	* cControler = ccon->getControler();
+		manualViewBaseContour       * cViewer = ccon->getViewer();
+		manualContourBaseControler  * cControler = ccon->getControler();
 
 		removeFromScene(theKeyName);
 		removeWrap(theKeyName);
@@ -1207,4 +1221,6 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		delete cViewer;		
 		delete cControler;
 	}
-		
\ No newline at end of file
+	
+	
+