X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxVtkBaseView_SceneManager.cxx;h=589ed818c27d62172a0be7784de50ae982482e21;hb=bd4e97f732f7c8154aafbf1bf419c6115e9560c7;hp=7fe68cbaeb4aa7a5d09ea6ed6ac7937b22ca1898;hpb=6e3c929c883c405e0075fa8df10b12a935979367;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
index 7fe68cb..589ed81 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
@@ -57,6 +57,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		_creatingROI					= false;
 		_drawingSelectionROI			= false;
 
+		
 		_wxVtk_BaseView = theWxBaseViewToManage;
 		if( _wxVtk_BaseView!=NULL )
 		{
@@ -164,6 +165,12 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 			manViewerContour	= new manualViewBullEye();
 		}
 
+		if (typeContour==6)
+		{
+			manContourControl	= new manualLineControler();
+			manViewerContour	= new manualViewLine();
+		}
+
 
 //EED Borrame
 //FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+");
@@ -407,7 +414,8 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 
 		std::map<std::string, ContourWrap_ViewControl *> :: iterator iter;
 		iter = _sceneContours_ViewControl->find( theKeyName );
-		if (iter != _sceneContours_ViewControl->end()){
+		if (iter != _sceneContours_ViewControl->end())
+		{
 			ContourWrap_ViewControl * contourWRP =	 iter->second;
 			removeFromScene( contourWRP );	
 //EED Borrame
@@ -660,51 +668,67 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 	// Inherited Methods
 	//------------------------------------------------------------------------------------------------------------
 
+	bool  wxVtkBaseView_SceneManager :: isCtrlPressed()
+	{ 
+		return _ctrlKey;
+	}
+	bool  wxVtkBaseView_SceneManager :: isShiftPressed()
+	{ 
+		return _shiftKey;
+	}
+	char  wxVtkBaseView_SceneManager :: getLastKeyCode()
+	{ 
+		return _lastKeyCode;
+	}
 	bool  wxVtkBaseView_SceneManager :: OnChar()
 	{ 
 
-		bool ctrlKey = _vtkInteractorStyleBaseView->GetInteractor()->GetControlKey() == 1;
-	 	bool shiftKey = _vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey() == 1;
+		_ctrlKey = _vtkInteractorStyleBaseView->GetInteractor()->GetControlKey() == 1;
+	 	_shiftKey = _vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey() == 1;
 
 		_lastKeyCode = _vtkInteractorStyleBaseView->GetInteractor()-> GetKeyCode();
+
+		wxCommandEvent cevent( wxEVT_COMMAND_BUTTON_CLICKED );
+		_eventHandler->ProcessEvent( cevent );
 		
-		
-		if( _eventHandler!=NULL )
+				
+		/*if( _eventHandler!=NULL )
 		{
-			const char * toolCommand = NULL;
+			char * toolCommand = NULL;
 
 			if ( _lastKeyCode == 3 && ctrlKey ) //'C' || 'c' 
 			{
-				toolCommand = &(wxContour_ActionCommandsID::COPY_TOOL);
+				toolCommand = &(COPY_TOOL);
 			}
 			else if(  _lastKeyCode == 22 && ctrlKey ) //'V' || 'v' 
 			{
-				toolCommand = &(wxContour_ActionCommandsID::PASTE_TOOL);
+				toolCommand = &(PASTE_TOOL);
 			}
 			else if(  _lastKeyCode == 8 || (_lastKeyCode==127) ) // Delete 
 			{
-				toolCommand = &(wxContour_ActionCommandsID::DELETE_KEY);
+				toolCommand = &(DELETE_KEY);
 			}
 			else if(  _lastKeyCode == 14 && ctrlKey ) //'N' || 'n' 
 			{
-				toolCommand = &(wxContour_ActionCommandsID::CREATE_CONTOUR_KEY);
+				toolCommand = &(CREATE_CONTOUR_KEY);
 			}
 			else if(  _lastKeyCode == 15 && ctrlKey ) //'O' || 'o' 
 			{
-				toolCommand = &(wxContour_ActionCommandsID::OPEN_TOOL);
+				toolCommand = &(OPEN_TOOL);
 			}
 			else if(  _lastKeyCode == 19 && ctrlKey ) //'S' || 's' 
 			{
-				toolCommand = &(wxContour_ActionCommandsID::SAVE_KEY);
+				toolCommand = &(SAVE_KEY);
 			}
 
 			if ( toolCommand!=NULL )
 			{
+				currentkey = toolCommand;
 				wxCommandEvent cevent( wxEVT_COMMAND_BUTTON_CLICKED );
 				cevent.SetClientData( (void *) toolCommand);
 				_eventHandler->ProcessEvent( cevent );
 			}				
-		}
+		}*/
 		
 	
 	//	long int endtime = clock();		
@@ -821,7 +845,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 						_lastInteractionName	= iter->first;
 
 						viewer->UpdateColorActor();
-						control->SetPosibleToMove( true );						
+						control->SetPosibleToMove( true );
 						// viewer->AddCompleteContourActor();
 					}
 					iter++;