X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsVtkGUIEditorGraphic%2FGObjectController.cxx;h=43f57c75ea11d870fe8944a63e31c7e7ca9aeb29;hb=f6286f6851a4c0757cbacbee679d31bcc5a933bd;hp=7926e68ca20b4050a064ddd4c2cc3a5c3c02616e;hpb=3babfd57a9b4b3cffba34415e928239592e7d4a1;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GObjectController.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GObjectController.cxx
index 7926e68..43f57c7 100644
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GObjectController.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GObjectController.cxx
@@ -1,4 +1,4 @@
-/*=========================================================================                                                                               
+/*=========================================================================
 Program:   bbtk
 Module:    $RCSfile$
 Language:  C++
@@ -11,26 +11,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::GObjectController 
+*  \file
+*  \brief Class bbtk::GObjectController
 */
 
 
@@ -43,11 +43,11 @@ namespace bbtk
 	//=========================================================================
 	GObjectController::GObjectController()
 	{
-		
+
 	}
 
 	//=========================================================================
-	
+
 	GObjectController::~GObjectController()
 	{
 	}
@@ -69,14 +69,14 @@ namespace bbtk
 		_wxVTKiren= _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
 		_wxVTKiren->GetEventPosition( X , Y );
 		int state  = _view->getState();
-		
+
 		//Evaluate new state
 		if( state == NOTHING_HAPPENS)
 		{
 			if(_view->isPointInside(X,Y))
 			{
-				_view->setState(HIGHLIGHTED);	
-			}			
+				_view->setState(HIGHLIGHTED);
+			}
 		}
 		if( state==HIGHLIGHTED)
 		{
@@ -85,39 +85,37 @@ namespace bbtk
 				_view->setState(NOTHING_HAPPENS);
 			}
 		}
-		
-		_model->notifyObservers(_id);
-			
+
+		_model->notifyObservers(getId());
+
 
 		return true;
 	}
 
 	//=========================================================================
-	
+
 	bool GObjectController::OnLeftButtonDown()//virtual
 	{
 		int state  = _view->getState();
-			
+
 		//Evaluate new state
 		if(state == HIGHLIGHTED)
 		{
 			_isLeftClickDown=true;
 			_view->setState(SELECTED);
-			//_model->notifyObservers(_id,
 		}
 		return true;
 	}
 
 	//=========================================================================
-	
+
 	bool GObjectController::OnLeftButtonUp()//virtual
 	{
-
 		return true;
 	}
 
 	//=========================================================================
-	
+
 	bool GObjectController::OnLeftDClick()//virtual
 	{
 
@@ -126,9 +124,16 @@ namespace bbtk
 
 	//=========================================================================
 
+	bool GObjectController::OnMiddleButtonDown()//virtual
+	{
+		return true;
+	}
+
+	//=========================================================================
+
 	void GObjectController::moveObject(int X,int Y)
 	{
-		_view->moveObject(X,Y);	
+		_view->moveObject(X,Y);
 	}
 
 	//=========================================================================
@@ -139,7 +144,7 @@ namespace bbtk
 	}
 
 	//=========================================================================
-	
+
 	GObjectModel* GObjectController::getModel()
 	{
 		return _model;
@@ -156,14 +161,14 @@ namespace bbtk
 
 	int GObjectController::getId()
 	{
-		return _id;
+		return _model->getObjectId();
 	}
 
 	//=========================================================================
-	
+
 	void GObjectController::setId(int id)
 	{
-		_id = id;
+		_model->setObjectId(id);
 	}
 
 	//=========================================================================
@@ -175,6 +180,13 @@ namespace bbtk
 
 	//=========================================================================
 
+	void GObjectController::removeFromScene()
+	{
+		_view->removeFromScene();
+	}
+
+	//=========================================================================
+
 }  // EO namespace bbtk
 
 // EOF