Merge remote-tracking branch 'origin/changeWx28to30' into vtk7itk4wx3

[bbtkGEditor.git] / lib / EditorGraphicBBS / bbsWxGUIEditorGraphic / wxVtkSceneManager.cxx

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
index 3832cf231ac44fa8328af02830be11bafc8bb440..da3ade5f481a8fdeb5ef20030b390c7f6619f007 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
@@ -138,7 +138,7 @@ void wxVtkSceneManager::configureBaseView()
        _baseView->SetInteractorStyleBaseView(interactorstylebaseview);
 
        // Important to activate the 2D interaction system
-       wxVTKRenderWindowInteractor *iren =     _baseView->GetWxVTKRenderWindowInteractor();
+       crea::wxVTKRenderWindowInteractor *iren =       _baseView->GetWxVTKRenderWindowInteractor();
        interactorstylebaseview->SetInteractor(iren);
        iren->SetInteractorStyle(interactorstylebaseview);
        interactorstylebaseview->SetwxVtkBaseView(_baseView);
@@ -824,7 +824,7 @@ bool wxVtkSceneManager::OnMouseMove()
        int X, Y;
        bool okStatusMessage    = false;
        bool okPortMessage      = false;
-       wxVTKRenderWindowInteractor *wxVTKiren;
+       crea::wxVTKRenderWindowInteractor *wxVTKiren;
        wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
        wxVTKiren->GetEventPosition(X, Y);
 
@@ -1063,7 +1063,7 @@ bool wxVtkSceneManager::OnMiddleButtonUp() {
 GObjectController *wxVtkSceneManager::GetGBlackBoxControlerPointedByMouse() {
        GObjectController *result = NULL;
        int X, Y;
-       wxVTKRenderWindowInteractor *wxVTKiren;
+       crea::wxVTKRenderWindowInteractor *wxVTKiren;
        wxVTKiren
                        = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
        wxVTKiren->GetEventPosition(X, Y);
@@ -1101,47 +1101,6 @@ bool wxVtkSceneManager::OnLeftDClick() {
                UnSelectBlackBoxes();
                _parent->editBlackBox((GBlackBoxModel*) cont->getModel());
        }
-
-       /*EED Borrame
-
-        int X,Y;
-        wxVTKRenderWindowInteractor *wxVTKiren;
-        wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
-        wxVTKiren->GetEventPosition(X,Y);
-
-        std::map<int, GObjectController*>::iterator it;
-
-        bool clickOnObject = false;
-
-        for(it = _controllers.begin(); it != _controllers.end() && clickOnObject==false; ++it)
-        {
-        GObjectController *cont = it->second;
-        int type = cont->getGObjectType();
-
-        if(cont->getView()->isPointInside(X,Y))
-        {
-        if(type==GBLACKBOX)
-        {
-        for (int i=0; i< (int)_selectedObjects.size(); i++)
-        {
-        int id = _selectedObjects[i];
-        GObjectController* control = _controllers[id];
-        control->getView()->setState(NOTHING_HAPPENS);
-        }
-        _selectedObjects.clear();
-
-        GBlackBoxModel *bbmodel = (GBlackBoxModel*)cont->getModel();
-        _parent->editBlackBox(bbmodel);
-        }
-        clickOnObject = true;
-        }
-        }
-
-        if(clickOnObject==false)
-        {
-        //_parent->editDiagramParameters(this);
-        }
-        */
        return true;
 }