X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxVtkBaseView_SceneManager.cxx;h=70fd6293e70d0924a5d4bcadadb73116dc8b625f;hb=a1a71313f5569279919f44fcc2a5ebbbea123057;hp=aac92df99d4bdd62a7cdccd40469018230601430;hpb=507a00d9d7800568d6e8ae91905f2b07cd2b30ae;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
index aac92df..70fd629 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
@@ -65,25 +65,21 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 
 	wxVtkBaseView_SceneManager :: wxVtkBaseView_SceneManager( wxVtkBaseView * theWxBaseViewToManage, wxEvtHandler * theEventHandler, double * spc )
 	{
-		
 		_lastInteraction				= NULL;
-		_lastInteractionName				= "";
+		_lastInteractionName			= "";
 		_eventHandler					= theEventHandler;
 		_leftClickCount					= 0;
 		_rigthClickCount				= 0;
-		
-		_contours_ViewControl				= new std::map< std::string, ContourWrap_ViewControl * >();
-		_sceneContours_ViewControl			= new std::map< std::string, ContourWrap_ViewControl * >();
+		_contours_ViewControl			= new std::map< std::string, ContourWrap_ViewControl * >();
+		_sceneContours_ViewControl		= new std::map< std::string, ContourWrap_ViewControl * >();
 		_workingGroup					= new std::map< std::string, ContourWrap_ViewControl * >();
-
 		_creatingMULT_ROI				= false;
-		_editingROI					= false;
-		_toIncludeAtInteractionGroup			= false;
-		_waiting					= false;
+		_editingROI						= false;
+		_toIncludeAtInteractionGroup	= false;
+		_waiting						= false;
 		_creatingROI					= false;
-		_drawingSelectionROI				= false;
-		SetWidthContour(1.0);
-		
+		_drawingSelectionROI			= false;
+		SetWidthContour(1.0);	
 		_wxVtk_BaseView = theWxBaseViewToManage;
 		if( _wxVtk_BaseView!=NULL )
 		{
@@ -93,6 +89,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		}
 		configureSelectionROI( spc );
 	}
+
 	//------------------------------------------------------------------------------------------------------------
 	wxVtkBaseView_SceneManager :: ~wxVtkBaseView_SceneManager()
 	{
@@ -102,7 +99,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		{
 			_contours_ViewControl->erase( iter );
 			i++;
-		}
+		} // for
 		_contours_ViewControl->clear();		
 		delete _contours_ViewControl;		
 		_workingGroup->clear();
@@ -126,10 +123,9 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 			wxCommandEvent cevent( theEventType );
 			cevent.SetString( wxString( text.c_str(), wxConvUTF8) );
 			_eventHandler->ProcessEvent( cevent );
-		}
+		} // if
 	}
 
-
 	//------------------------------------------------------------------------------------------------------------
 	//  Attributes getters and setters
 	//------------------------------------------------------------------------------------------------------------
@@ -137,6 +133,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 	{
 		_eventHandler = theEventHandler;
 	}
+
 	//------------------------------------------------------------------------------------------------------------
 	void wxVtkBaseView_SceneManager :: setWxVtkViewBase( wxVtkBaseView * theBaseView )
 	{
@@ -148,8 +145,9 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 	{
 		return _wxVtk_BaseView;
 	}
+
 	//------------------------------------------------------------------------------------------------------------
-	void wxVtkBaseView_SceneManager :: configureViewControlTo( std::string theKeyName, manualBaseModel * manModelContour, double * spc,int typeContour)
+	void wxVtkBaseView_SceneManager::configureViewControlTo( std::string theKeyName, manualBaseModel * manModelContour, double * spc,int typeContour)
 	{
 		//setControlActiveStateOfALL( false );
 		_creatingROI = true;
@@ -161,11 +159,8 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 			_lastInteraction->getControler()->SetActive( false );
 			this->_vtkInteractorStyleBaseView->SetRefresh_waiting();
 		}
-
-
 		manualContourBaseControler *manContourControl;
 		manualViewBaseContour		*manViewerContour;
-
 		// Creating the view manualViewContour and the manualContourControler
 		// NOTE: The model is created in the KernelManagerContour class, factoryManualContourModel method
 		if (typeContour==1)
@@ -273,11 +268,12 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		_contours_ViewControl->insert(std::pair <std::string, ContourWrap_ViewControl *> ( theKeyName, newContourWrap ));
 		return newContourWrap;
 	} 
+
 	//------------------------------------------------------------------------------------------------------------
 	void wxVtkBaseView_SceneManager :: desconfigureViewControlOf( std::string theKeyName )
-	{
-		
+	{		
 	}
+
 	//------------------------------------------------------------------------------------------------------------
 	void wxVtkBaseView_SceneManager :: removeWrap( std::string theKeyName )
 	{
@@ -290,6 +286,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		this->_vtkInteractorStyleBaseView->SetRefresh_waiting();
 		this->_vtkInteractorStyleBaseView->EvaluateToRefresh();
 	} 
+
 	//------------------------------------------------------------------------------------------------------------
 	ContourWrap_ViewControl * wxVtkBaseView_SceneManager :: getContourWrap_ViewControlOf ( std::string theName )
 	{
@@ -298,6 +295,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		return iter->second;
 		//return iter->first;
 	}
+
 	//------------------------------------------------------------------------------------------------------------
 	ContourWrap_ViewControl * wxVtkBaseView_SceneManager :: getContourWrap_ViewControlOf ( std::string theName, std::map<std::string, ContourWrap_ViewControl *> * theMap )
 	{
@@ -305,46 +303,55 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		iter = theMap->find( theName );
 		return iter->second;
 	}
+
 	//------------------------------------------------------------------------------------------------------------
 	manualContourBaseControler * wxVtkBaseView_SceneManager :: getControlerOf( std::string theName )
 	{
 		return getContourWrap_ViewControlOf ( theName )->getControler();
 	}
+
 	//------------------------------------------------------------------------------------------------------------
 	manualViewBaseContour * wxVtkBaseView_SceneManager :: getViewerOf( std::string theName )
 	{
 		return getContourWrap_ViewControlOf ( theName )->getViewer();
 	}
+
 	//------------------------------------------------------------------------------------------------------------
 	void wxVtkBaseView_SceneManager :: set_creatingMULT_ROI( bool condition )
 	{
 		_creatingMULT_ROI = condition;
 	}
+
 	//------------------------------------------------------------------------------------------------------------
 	void wxVtkBaseView_SceneManager :: set_editingROI( bool condition )
 	{
 		_editingROI = condition;
 	}
+
 	//------------------------------------------------------------------------------------------------------------
 	void wxVtkBaseView_SceneManager :: set_toIncludeAtInteractionGroup( bool condition )
 	{
 		_toIncludeAtInteractionGroup = condition;
 	}
+
 	//------------------------------------------------------------------------------------------------------------
 	void wxVtkBaseView_SceneManager :: set_waiting( bool condition )
 	{
 		_waiting = condition;
 	}
+
 	//------------------------------------------------------------------------------------------------------------
 	bool wxVtkBaseView_SceneManager :: get_creatingMULT_ROI(  )
 	{
 		return _creatingMULT_ROI;
 	}
+
 	//------------------------------------------------------------------------------------------------------------
 	bool wxVtkBaseView_SceneManager :: get_editingROI(  )
 	{
 		return _editingROI;
 	}
+
 	//------------------------------------------------------------------------------------------------------------
 	bool wxVtkBaseView_SceneManager :: get_toIncludeAtInteractionGroup(  )
 	{
@@ -461,7 +468,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 	}
 
 	//------------------------------------------------------------------------------------------------------------
-	void wxVtkBaseView_SceneManager :: removeSceneContours( )
+	void wxVtkBaseView_SceneManager::removeSceneContours()
 	{
 		std::map <std::string, ContourWrap_ViewControl *>::iterator iter = _sceneContours_ViewControl->begin(); 
 		int size = _sceneContours_ViewControl->size();
@@ -471,8 +478,6 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 			iter++;
 		}
 		_sceneContours_ViewControl->clear();
-
-
 		//Removing the selection rectangle to avoid showing when it's innecesary
 		_controlerSelectionROI->SetActive( false );		
 		_viewerSelectionROI->RemoveCompleteContourActor();	
@@ -751,7 +756,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 
 		bool condition = true;  
 		int X,Y;
-		wxVTKRenderWindowInteractor *_wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor();
+		crea::wxVTKRenderWindowInteractor *_wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor();
 		_wxVTKiren->GetEventPosition( X , Y );
 
 		bool ctrlKey = _vtkInteractorStyleBaseView->GetInteractor()->GetControlKey() == 1;
@@ -809,9 +814,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 					size = selectionSize;
 					iter = _workingGroup->begin();
 				}
-			}			
-			else
-			{
+			} else {
 				
 				_toIncludeAtInteractionGroup = false;
 			}
@@ -1120,7 +1123,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		double sg = (double)(start) / CLOCKS_PER_SEC;
 #endif
 		int tmpPx,tmpPy;
-		wxVTKRenderWindowInteractor *wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor();
+		crea::wxVTKRenderWindowInteractor *wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor();
 		wxVTKiren->GetEventPosition( tmpPx , tmpPy );
 		fprintf(ff,"::%s (x,y) = (%i, %i) t(sg): %f\n  \n",method.c_str(), tmpPx, tmpPy, sg);
 		fclose(ff);