Feature #1347

[bbtkGEditor.git] / lib / EditorGraphicBBS / bbsVtkGUIEditorGraphic / GObjectController.cxx

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GObjectController.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GObjectController.cxx
index 7926e68ca20b4050a064ddd4c2cc3a5c3c02616e..745cbf22c8e3d2e05879d085b2fd3416db7bcc09 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GObjectController.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GObjectController.cxx
@@ -1,4 +1,4 @@
-/*=========================================================================                                                                               
+/*=========================================================================
 Program:   bbtk
 Module:    $RCSfile$
 Language:  C++
@@ -11,31 +11,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::GObjectController 
+*  \file
+*  \brief Class bbtk::GObjectController
 */
 
 
 #include "GObjectController.h"
 
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
 namespace bbtk
 {
 
@@ -43,11 +46,11 @@ namespace bbtk
        //=========================================================================
        GObjectController::GObjectController()
        {
-               
+
        }
 
        //=========================================================================
-       
+
        GObjectController::~GObjectController()
        {
        }
@@ -69,14 +72,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 +88,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 +127,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 +147,7 @@ namespace bbtk
        }
 
        //=========================================================================
-       
+
        GObjectModel* GObjectController::getModel()
        {
                return _model;
@@ -156,14 +164,14 @@ namespace bbtk
 
        int GObjectController::getId()
        {
-               return _id;
+               return _model->getObjectId();
        }
 
        //=========================================================================
-       
+
        void GObjectController::setId(int id)
        {
-               _id = id;
+               _model->setObjectId(id);
        }
 
        //=========================================================================
@@ -175,6 +183,13 @@ namespace bbtk
 
        //=========================================================================
 
+       void GObjectController::removeFromScene()
+       {
+               _view->removeFromScene();
+       }
+
+       //=========================================================================
+
 }  // EO namespace bbtk
 
 // EOF