X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsVtkGUIEditorGraphic%2FGBlackBoxController.cxx;fp=lib%2FEditorGraphicBBS%2FbbsVtkGUIEditorGraphic%2FGBlackBoxController.cxx;h=095e70479ed8ac43cb225c5650093b2c2dba8e6d;hb=f08102d8cf97a93b5fbff395a9fd667eaa26b269;hp=e593fc27c6fc1ae8bdcb976ce219540604bf474c;hpb=4d9b612ea3b0eacb2cbc47d9b57affc96ddfa8c3;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx
index e593fc2..095e704 100644
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx
@@ -86,7 +86,7 @@ namespace bbtk
 		if ( _vtkInteractorStyleBaseView!=NULL)
 		{
 			int X,Y;
-			wxVTKRenderWindowInteractor *_wxVTKiren;
+			crea::wxVTKRenderWindowInteractor *_wxVTKiren;
 			_wxVTKiren= _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
 			_wxVTKiren->GetEventPosition( X , Y );
 
@@ -132,7 +132,7 @@ namespace bbtk
         bool ok=true;
 		
 		int X,Y;
-		wxVTKRenderWindowInteractor *_wxVTKiren;
+		crea::wxVTKRenderWindowInteractor *_wxVTKiren;
 		_wxVTKiren= _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
 		_wxVTKiren->GetEventPosition( X , Y );
 		
@@ -172,68 +172,36 @@ namespace bbtk
 	}
 
 	//=========================================================================
-
 	bool GBlackBoxController::OnLeftButtonUp()
 	{
         _isLeftClickDown    = false;
 		int state           = _view->getState();
-
-		//Evaluate new state
-
-//EED Borrame
-//		int X,Y;
-//		wxVTKRenderWindowInteractor *wxVTKiren;
-//		wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
-//		wxVTKiren->GetEventPosition(X,Y);
-//		if(_isLeftClickDown)
-//		{
-//			_isLeftClickDown=false;
-//			if(_view->isPointInside(X,Y))
-//			{
-				// It is supposed that I'm always inside even if the box is in drag
-//				_view->setState(SELECTED);
-//				_model->notifyObservers(getId());
-//			}
-//		}
-
-
-
-		int shiftkey            = _vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey();
-		int ctrlkey             = _vtkInteractorStyleBaseView->GetInteractor()->GetControlKey();
+		int shiftkey        = _vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey();
+		int ctrlkey         = _vtkInteractorStyleBaseView->GetInteractor()->GetControlKey();
 		ctrlkey = ctrlkey + shiftkey;
-		
-		
 //EED 12/07/2012		
 //		if ( (state==SELECTED) && (ctrlkey==0) && (_objHasBeenMoved==false))
 //		{
 //			_view->setState(NOTHING_HAPPENS);
 //			_model->notifyObservers(getId(),REMOVE_FROM_SELECTED);
 //		}
-
-
-
 		return true;
-
 	}
 
 	//=========================================================================
-
 	bool GBlackBoxController::OnRightButtonUp()
 	{
 		return true;
 	}
 
 	//=========================================================================
-
 	bool GBlackBoxController::OnMiddleButtonDown()
 	{
 		int X,Y;
-		wxVTKRenderWindowInteractor *wxVTKiren;
+		crea::wxVTKRenderWindowInteractor *wxVTKiren;
 		wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
 		wxVTKiren->GetEventPosition(X,Y);
-
 //		int state  = _view->getState();
-
 		//Evaluate new state
 		if(_view->isPointInside(X,Y))
 		{
@@ -242,14 +210,11 @@ namespace bbtk
 			if(bbmodel->isExecutable())
 			{
 				bbmodel->setExecutable(false);
-			}
-			else
-			{
+			} else {
 				bbmodel->setExecutable(true);
 			}
 			bbmodel->notifyObservers(getId());
 		}
-
 		return true;
 	}