Organizing code, the state now is in the view and the general render was simplified...

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

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx
index cf4037ed249cf742a07c863e7117953f1cb5d9ae..952e9a908592691254924a9227969f3e096eca3e 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx
@@ -62,7 +62,7 @@ namespace bbtk
                        _wxVTKiren= _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
                        _wxVTKiren->GetEventPosition( X , Y );
 
-                       int state  = _model->getState();
+                       int state  = _view->getState();
                        
                        //Evaluate new state
                        if(!_model->hasChanged() && state == DRAG)
@@ -75,7 +75,7 @@ namespace bbtk
                        {
                                if(_view->isPointInside(X,Y))
                                {
-                                       _model->setState(HIGHLIGHTED);
+                                       _view->setState(HIGHLIGHTED);
                                        _model->setChanged();                           
                                }                       
                        }
@@ -83,12 +83,13 @@ namespace bbtk
                        {
                                if(!_view->isPointInside(X,Y))
                                {
-                                       _model->setState(NOTHING_HAPPENS);
+                                       _view->setState(NOTHING_HAPPENS);
                                        _model->setChanged();
                                }
                        }
                        
-                       _model->notifyObservers();
+                       _model->notifyObservers(_id);
+                       
                }
                return true;
        }
@@ -105,13 +106,13 @@ namespace bbtk
                        wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
                        wxVTKiren->GetEventPosition(X,Y);
 
-                       int state  = _model->getState();
+                       int state  = _view->getState();
                        
                        //Evaluate new state
                        if(!_model->hasChanged() && state==HIGHLIGHTED)
                        {
                                _view->isStartDragging(true);
-                               _model->setState(DRAG);
+                               _view->setState(DRAG);
                                _model->setChanged();
                        }
 
@@ -120,12 +121,12 @@ namespace bbtk
                                if(_view->isPointInside(X,Y))
                                {
                                        _view->isStartDragging(true);
-                                       _model->setState(DRAG);
+                                       _view->setState(DRAG);
                                        _model->setChanged();
                                }       
                        }
                        
-                       _model->notifyObservers();
+                       _model->notifyObservers(_id);
                }
                return true;
        }
@@ -141,22 +142,22 @@ namespace bbtk
                        wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
                        wxVTKiren->GetEventPosition(X,Y);
 
-                       int state  = _model->getState();
+                       int state  = _view->getState();
                        
                        //Evaluate new state
                        if(!_model->hasChanged() && state==CLICKED)
                        {
-                               _model->setState(SELECTED);
+                               _view->setState(SELECTED);
                                _model->setChanged();
                        }
 
                        if( !_model->hasChanged() && state == DRAG)
                        {
-                               _model->setState(SELECTED);
+                               _view->setState(SELECTED);
                                _model->setChanged();
                        }
 
-                       _model->notifyObservers();
+                       _model->notifyObservers(_id);
 
                }
                return true;
@@ -173,7 +174,7 @@ namespace bbtk
                        wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
                        wxVTKiren->GetEventPosition(X,Y);
 
-                       _model->notifyObservers();
+                       _model->notifyObservers(_id);
                }
                return true;
        }
@@ -189,19 +190,19 @@ namespace bbtk
                        wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
                        wxVTKiren->GetEventPosition(X, Y);
                        
-                       int state  = _model->getState();
+                       int state  = _view->getState();
                        
                        //Evaluate new state
                        if( !_model->hasChanged() && state == SELECTED)
                        {
-                               _model->setState(NOTHING_HAPPENS);
+                               _view->setState(NOTHING_HAPPENS);
                                _model->setChanged();                   
                        }
 
-                       _model->notifyObservers();
+                       _model->notifyObservers(_id);
                }
                return true;
-}
+       }
 
        //=========================================================================