X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsVtkGUIEditorGraphic%2FGConnectorController.cxx;h=8a97cb419196e1f3997fbdaa40a01d32624381c9;hb=14342b19da6542ac157c5e7881a8294b209d1a32;hp=30468e790f1772abddcc34c8b95e33cf04b5e560;hpb=638f2cd85948ec10d3b30e1f68805ee0153c8813;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GConnectorController.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GConnectorController.cxx
index 30468e7..8a97cb4 100644
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GConnectorController.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GConnectorController.cxx
@@ -1,4 +1,29 @@
-/*=========================================================================                                                                               
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------  
+*/
+
+/*=========================================================================
 Program:   bbtk
 Module:    $RCSfile$
 Language:  C++
@@ -11,31 +36,34 @@ Version:   $Revision$
 * Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
 * Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
 *
-*  This software is governed by the CeCILL-B license under French law and 
-*  abiding by the rules of distribution of free software. You can  use, 
-*  modify and/ or redistribute the software under the terms of the CeCILL-B 
-*  license as circulated by CEA, CNRS and INRIA at the following URL 
-*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+*  This software is governed by the CeCILL-B license under French law and
+*  abiding by the rules of distribution of free software. You can  use,
+*  modify and/ or redistribute the software under the terms of the CeCILL-B
+*  license as circulated by CEA, CNRS and INRIA at the following URL
+*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
 *  or in the file LICENSE.txt.
 *
 *  As a counterpart to the access to the source code and  rights to copy,
 *  modify and redistribute granted by the license, users are provided only
 *  with a limited warranty  and the software's author,  the holder of the
 *  economic rights,  and the successive licensors  have only  limited
-*  liability. 
+*  liability.
 *
 *  The fact that you are presently reading this means that you have had
 *  knowledge of the CeCILL-B license and that you accept its terms.
-* ------------------------------------------------------------------------ */                                                                         
+* ------------------------------------------------------------------------ */
 
 /**
-*  \file 
-*  \brief Class bbtk::GConnectorController 
+*  \file
+*  \brief Class bbtk::GConnectorController
 */
 
 
 #include "GConnectorController.h"
 
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
 namespace bbtk
 {
 
@@ -56,6 +84,11 @@ namespace bbtk
 
 	bool GConnectorController::OnMouseMove()
 	{
+
+		if (_view->getState() ==SELECTED)
+		{
+			_controller->GetManualViewBaseContour()->SetSelected(true);
+		}
 		
 		if ( _vtkInteractorStyleBaseView!=NULL)
 		{
@@ -64,27 +97,27 @@ namespace bbtk
 			_wxVTKiren= _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
 			_wxVTKiren->GetEventPosition( X , Y );
 
-			if ( (_vtkInteractorStyleBaseView->GetInteractor()->GetControlKey()==0) &&(_vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey()==0) ) 
+			if ( (_vtkInteractorStyleBaseView->GetInteractor()->GetControlKey()==0) &&(_vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey()==0) )
 			{
 				_controller->MouseMove(X,Y);
 			}
-			
+
 		}
 		return true;
 	}
 
 	//=========================================================================
-	
+
 	bool GConnectorController::OnLeftButtonDown()
 	{
-		
+
 		if ( _vtkInteractorStyleBaseView!=NULL )
 		{
 			int X,Y;
 			wxVTKRenderWindowInteractor *wxVTKiren;
 			wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
 			wxVTKiren->GetEventPosition(X,Y);
-			
+
 			_controller->SetKeyBoardMoving( false );
 			_controller->MouseClickLeft(X,Y);
 
@@ -104,14 +137,19 @@ namespace bbtk
 			wxVTKiren->GetEventPosition(X, Y);
 
 			_controller->MouseReleaseLeft(X,Y);
-			
+			if(_controller->GetManualViewBaseContour()->GetSelected()==true)
+			{
+				_view->setState(SELECTED);
+				_model->notifyObservers(getId(),ADD_TO_SELECTED);
+			}
+
 		}
 		return true;
 
 	}
-	
+
 	//=========================================================================
-	
+
 	bool GConnectorController::OnLeftDClick()
 	{
 
@@ -127,9 +165,9 @@ namespace bbtk
 		}
 		return true;
 	}
-	
+
 	//=========================================================================
-	
+
 	bool GConnectorController::OnRightButtonDown()
 	{
 		if( _vtkInteractorStyleBaseView!= NULL )
@@ -138,13 +176,13 @@ namespace bbtk
 			wxVTKRenderWindowInteractor *wxVTKiren;
 			wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
 			wxVTKiren->GetEventPosition(X, Y);
-			
+
 			_controller->MouseClickRight(X,Y);
-					
+
 		}
 		return true;
 	}
-		
+
 	//=========================================================================
 
 	bool GConnectorController::OnRightButtonUp()
@@ -158,7 +196,7 @@ namespace bbtk
 	{
 		if ( _vtkInteractorStyleBaseView!=NULL )
 		{
-			int X,Y,Z=900;
+			int X, Y, Z=GPOSITION_Z;
 			wxVTKRenderWindowInteractor *wxVTKiren;
 			wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
 			wxVTKiren->GetEventPosition(X, Y);
@@ -180,7 +218,7 @@ namespace bbtk
 	}
 
 	//=========================================================================
-	
+
 	void GConnectorController::setManualContourController(manualConnectorContourController* controller)
 	{
 		_controller = controller;
@@ -188,18 +226,25 @@ namespace bbtk
 	}
 
 	//=========================================================================
-	
+
 	void GConnectorController::removeFromScene()
 	{
 		GConnectorModel *conMod = (GConnectorModel*)_model;
 		conMod->disconnectConnection();
 
-		_controller->SetEditable(true);
+		_controller->SetEditable(false);
 		_controller->DeleteContour();
 	}
 
 	//=========================================================================
 
+	void GConnectorController::endContourCreation()
+	{
+		_controller->endContourCreation();
+	}
+
+	//=========================================================================
+
 }  // EO namespace bbtk
 
 // EOF