X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsVtkGUIEditorGraphic%2FGPortController.cxx;h=7b470173f7ea95c068e95bbeda58987a9291772d;hb=511369e67cf26244fc8768a727a03f42ff42865f;hp=b2f863be11d9c522f89e343c1e2a4b70b3e138f4;hpb=878ac6ad472bc459f4e364c16890e5026c401944;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GPortController.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GPortController.cxx
index b2f863b..7b47017 100644
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GPortController.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GPortController.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,26 +36,26 @@ 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::GPortController 
+*  \file
+*  \brief Class bbtk::GPortController
 */
 
 
@@ -43,7 +68,7 @@ namespace bbtk
 	//=========================================================================
 	GPortController::GPortController()
 	{
-		
+		_isLeftClickDown=false;
 	}
 
 	//=========================================================================
@@ -54,67 +79,50 @@ namespace bbtk
 
 	bool GPortController::OnLeftButtonDown()
 	{
-		
-		if ( _vtkInteractorStyleBaseView!=NULL )
-		{
-			int X,Y;
-			wxVTKRenderWindowInteractor *wxVTKiren;
-			wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
-			wxVTKiren->GetEventPosition(X,Y);
-
-			int state  = _view->getState();
-			
-			int portType = ((GPortModel*)_model)->getPortType();
 
-			//Evaluate new state
-			if(!_model->hasChanged() && state==HIGHLIGHTED && portType==GOUTPUTPORT )
-			{
-				_view->setState(CREATING_CONTOUR);
-				_model->setChanged();
-			}
-
-			_model->notifyObservers(_id);
+		int state  = _view->getState();
 
+		//Evaluate new state
+		if(state == HIGHLIGHTED)
+		{
+			_isLeftClickDown=true;
 		}
 		return true;
 	}
 	//=========================================================================
 	bool GPortController::OnLeftButtonUp()
 	{
-		if ( _vtkInteractorStyleBaseView!=NULL )
+		int state  = _view->getState();
+		if(_isLeftClickDown)
 		{
-			int X,Y;
-			wxVTKRenderWindowInteractor *wxVTKiren;
-			wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
-			wxVTKiren->GetEventPosition(X,Y);
-
-			int state  = _view->getState();
-			
-			//Evaluate new state
-			if(!_model->hasChanged() && state==CREATING_CONTOUR)
+			if(state==HIGHLIGHTED)
 			{
-				if(_view->isPointInside(X,Y))
+				int portType = ((GPortModel*)_model)->getPortType();
+
+				//Evaluate new state
+				if(portType==GOUTPUTPORT)
 				{
-					_view->setState(CREATING_CONTOUR);
-					_model->setChanged();
-					_model->notifyObservers(_id,INIT_CREATION_CONTOUR);
+					_model->notifyObservers(getId(),INIT_CREATION_CONTOUR);
 				}
-				else
+				else if (portType==GINPUTPORT)
 				{
-					_view->setState(NOTHING_HAPPENS);
-					_model->setChanged();
-					_model->notifyObservers(_id);
+					_model->notifyObservers(getId(),FIN_CREATION_CONTOUR);
 				}
 			}
-
-			
-
+			else
+			{
+				_view->setState(NOTHING_HAPPENS);
+			}
+			_isLeftClickDown=false;
 		}
+
 		return true;
 	}
 
 	//=========================================================================
 
+
+
 }  // EO namespace bbtk
 
 // EOF