X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxVtkBaseView_SceneManager.cxx;h=845adcf6a6942c9ba888512cd2b7fa68e2968154;hb=11f6d82d938648eb1b5ee5321c8a0c797b20606e;hp=9e6a6056428936b7b26421363897f3c4cb87f712;hpb=5c51e157c5f506ceac760bdc90f4b73943395539;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
index 9e6a605..845adcf 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
@@ -146,6 +146,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		{
 			manContourControl	= new manualContourControler();
 			manViewerContour	= new manualViewContour();
+			manModelContour->SetCloseContour(false);
 		}
 
 		if (typeContour==2)
@@ -173,12 +174,6 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		}
 
 
-//EED Borrame
-//FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+");
-//fprintf(ff,"EED wxVtkBaseView_SceneManager :: configureViewControlTo \n" );
-//fprintf(ff,"    %s %p \n",theKeyName.c_str() , manContourControl );
-//fclose(ff);
-
 
         _lastInteraction = insertWrap( theKeyName, manContourControl, manViewerContour );
 		_lastInteractionName = theKeyName;
@@ -186,7 +181,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		//Configuring the relations between the contour members representation			
 		manViewerContour->SetModel( manModelContour );
 		manViewerContour->SetWxVtkBaseView( _wxVtk_BaseView );
-		manViewerContour->SetRange( 2 );
+		manViewerContour->SetRange( 0.5 );
 		manViewerContour->SetZ( 1000 );
 
 		manViewerContour->SetSpacing(spc);
@@ -343,17 +338,6 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		}
         std::map <std::string, ContourWrap_ViewControl *>::iterator iter; 
 
-//EED Borrame
-// FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+");
-// fprintf(ff,"EED wxVtkBaseView_SceneManager::createCopyContourOf() \n" );
-//	int ii,size = _contours_ViewControl->size();
-//	iter = _contours_ViewControl->begin();
-//    for (ii=0;ii<size;ii++)
-//	{
-//		fprintf(ff,"   %d  %s\n ", ii ,iter->first.c_str() );
-//		iter++;
-//	}
-//fclose(ff);
 
 		iter = _contours_ViewControl->find( anExistingKName );
 
@@ -387,11 +371,6 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 			_lastInteractionName = "";
 		}
 
-//EED Borrame
-//FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+");
-//fprintf(ff,"EED wxVtkBaseView_SceneManager :: removeFromScene \n" );
-//fprintf(ff,"    %p \n", contourWRP->getControler() );
-//fclose(ff);
 
 		((vtkInteractorStyleBaseView*)_wxVtk_BaseView->GetInteractorStyleBaseView())->RemoveInteractorStyleMaracas( contourWRP->getControler() );
 
@@ -419,15 +398,8 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		{
 			ContourWrap_ViewControl * contourWRP =	 iter->second;
 			removeFromScene( contourWRP );	
-//EED Borrame
-//FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+");
-//fprintf(ff,"EED wxVtkBaseView_SceneManager :: removeFromScene Bbbbb \n" );
-//fprintf(ff,"    %d \n", _sceneContours_ViewControl->size() );
 			_sceneContours_ViewControl->erase(iter);
-		}
-//EED Borrame
-//fprintf(ff,"    %d \n", _sceneContours_ViewControl->size() );
-//fclose(ff);
+		}	
 	}
 
 
@@ -448,10 +420,6 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 	//------------------------------------------------------------------------------------------------------------
 	void wxVtkBaseView_SceneManager :: removeSceneContours( )
 	{
-//EED Borrame
-//FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+");
-//fprintf(ff,"EED wxVtkBaseView_SceneManager :: removeSceneContours  \n" );
-//fprintf(ff,"    %d \n", _sceneContours_ViewControl->size() );
 		std::map <std::string, ContourWrap_ViewControl *>::iterator iter = _sceneContours_ViewControl->begin(); 
 		int size = _sceneContours_ViewControl->size();
 		for ( int i = 0; i<size; i++ )
@@ -461,9 +429,6 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		}
 		_sceneContours_ViewControl->clear();
 
-//EED Borrame
-//fprintf(ff,"    %d \n", _sceneContours_ViewControl->size() );
-//fclose(ff);
 
 		//Removing the selection rectangle to avoid showing when it's innecesary
 		_controlerSelectionROI->SetActive( false );		
@@ -740,10 +705,6 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 
 	bool  wxVtkBaseView_SceneManager :: OnMouseMove()
 	{ 
-//EED Borrame
-// FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+");
-// fprintf(ff,"EED wxVtkBaseView_SceneManager::OnMouseMove() \n" );
-// fclose(ff);
 
 		bool condition = true;  
 		int X,Y;
@@ -814,11 +775,8 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 			
 			if( ((_lastInteraction != NULL && !control->IsEditable() && !control->IsMoving() ) || _lastInteraction==NULL ))
 			{					
-//EED Borrame
-// FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+");
-// fprintf(ff,"EED wxVtkBaseView_SceneManager::OnMouseMove() 00222\n" );
-// fclose(ff);
-			 _lastInteraction=NULL;
+
+				_lastInteraction=NULL;
 				for( i =0; i<size ; i++ )
 				{
 					control = iter->second->getControler();
@@ -866,12 +824,6 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 	bool  wxVtkBaseView_SceneManager :: OnLeftButtonDown()
 	{ 
 
-		/*FILE *ff;
-		ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+");
-		long int endtime = clock();
-//		double sg = (double)(endtime-startTimeAE) / (double)CLK_TCK;
-		fprintf(ff,"wxVtkBaseView_SceneManager :: OnLeftButtonDown() tLBDown = %i \n  \n",endtime);
-		fclose(ff);*/
 
 
 //EED???		char aa = _vtkInteractorStyleBaseView->GetInteractor()->GetKeyCode();