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

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

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
index e509662f64fdbdf9b64fcf135671889eeecc9ad7..fbdd9524ce5652cd95c5635b7da3a7598cb3dc4e 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
@@ -51,39 +51,11 @@ namespace bbtk
        }
 
        //=========================================================================
-       void vtkGBlackBoxView::update(int command)
+       void vtkGBlackBoxView::update(int idObservable,int command)
        {
-               _objectActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
-
-               if(_model->getState()==NOTHING_HAPPENS)
-               {
-                       _objectActor->GetProperty()->SetLineWidth(1);
-                       _objectActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
-                       //_nameActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
-                       _typeActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
-               }
-               else if(_model->getState()==HIGHLIGHTED)
-               {
-                       _objectActor->GetProperty()->SetLineWidth(2);
-                       _objectActor->GetProperty()->SetColor(BOXCONTOUR_HIGHLIGHTED_R,BOXCONTOUR_HIGHLIGHTED_G,BOXCONTOUR_HIGHLIGHTED_B);
-                       //_nameActor->GetProperty()->SetColor(BOXCONTOUR_HIGHLIGHTED_R,BOXCONTOUR_HIGHLIGHTED_G,BOXCONTOUR_HIGHLIGHTED_B);
-                       _typeActor->GetProperty()->SetColor(BOXCONTOUR_HIGHLIGHTED_R,BOXCONTOUR_HIGHLIGHTED_G,BOXCONTOUR_HIGHLIGHTED_B);
-               }
-               else if(_model->getState()==DRAG)
-               {
-                       _objectActor->GetProperty()->SetLineWidth(1.2);
-                       _objectActor->GetProperty()->SetColor(BOXCONTOUR_DRAG_R,BOXCONTOUR_DRAG_G,BOXCONTOUR_DRAG_B);
-                       //_nameActor->GetProperty()->SetColor(BOXCONTOUR_DRAG_R,BOXCONTOUR_DRAG_G,BOXCONTOUR_DRAG_B);
-                       _typeActor->GetProperty()->SetColor(BOXCONTOUR_DRAG_R,BOXCONTOUR_DRAG_G,BOXCONTOUR_DRAG_B);
-               }
-               else if(_model->getState()==SELECTED)
-               {
-                       _objectActor->GetProperty()->SetLineWidth(2);
-                       _objectActor->GetProperty()->SetColor(BOXCONTOUR_SELECTED_R,BOXCONTOUR_SELECTED_G,BOXCONTOUR_SELECTED_B);
-                       //_nameActor->GetProperty()->SetColor(BOXCONTOUR_SELECTED_R,BOXCONTOUR_SELECTED_G,BOXCONTOUR_SELECTED_B);
-                       _typeActor->GetProperty()->SetColor(BOXCONTOUR_SELECTED_R,BOXCONTOUR_SELECTED_G,BOXCONTOUR_SELECTED_B);
-               }
 
+               updateColors();
+               
                double xInic, yInic,zInic,xFin, yFin,zFin;
                _model->getInicPoint(xInic,yInic,zInic);
                _model->getFinalPoint(xFin, yFin,zFin);
@@ -100,9 +72,7 @@ namespace bbtk
                updatePositionTextActors(xInic, yInic,zInic);
 
                //-----------
-
-               _baseView->RefreshView();
-               _baseView->Refresh();
+               setRefreshWaiting();
        }
 
        //=========================================================================
@@ -147,53 +117,30 @@ namespace bbtk
 
                //------------
 
-               /*
-               _vectorNameText = vtkVectorText::New();
+               _nameActor = vtkTextActor3D::New();
                std::string temp = _model->getBBTKName();
-               _vectorNameText->SetText(temp.c_str());
-
-               vtkPolyDataMapper* txtMapper = vtkPolyDataMapper::New();
-               txtMapper->SetInputConnection( _vectorNameText->GetOutputPort());
-               _nameActor = vtkActor::New();
-               _nameActor->SetMapper(txtMapper);
-               */
-
-               _vectorNameText = vtkTextActor3D::New();
-               std::string temp = _model->getBBTKName();
-               _vectorNameText->SetInput( temp.c_str()  );
-
+               _nameActor->GetTextProperty()->SetFontSize(80);
+               _nameActor->GetTextProperty()->BoldOn();
+               _nameActor->SetInput(temp.c_str());
 
                //------------
 
-               _vectorTypeText = vtkVectorText::New();
+               _typeActor = vtkTextActor3D::New();
                temp = _model->getBBTKType();
-               _vectorTypeText->SetText(temp.c_str());
-
-               vtkPolyDataMapper* txtMapper = vtkPolyDataMapper::New();
-               txtMapper->SetInputConnection( _vectorTypeText->GetOutputPort());
-               _typeActor = vtkActor::New();
-               _typeActor->SetMapper(txtMapper);
+               _typeActor->GetTextProperty()->SetFontSize(80);
+               _typeActor->GetTextProperty()->BoldOn();
+               _typeActor->SetInput(temp.c_str());
 
                //------------
 
                updatePositionTextActors( xInic,  yInic,  zInic);
-
-               //_nameActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
-               _vectorNameText->GetTextProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
-               _vectorNameText->GetTextProperty()->SetFontSize(75);//SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
-               _vectorNameText->GetTextProperty()->BoldOn();
-               _vectorNameText->SetScale(0.05,0.05,1);
-               _typeActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
-
        }
 
        //=========================================================================
 
        void vtkGBlackBoxView::addVtkActors()//virtual
        {
-               //_baseView->GetRenderer()->AddActor(_nameActor);
-
-               _baseView->GetRenderer()->AddActor(_vectorNameText);
+               _baseView->GetRenderer()->AddActor(_nameActor);
 
                _baseView->GetRenderer()->AddActor(_typeActor);
 
@@ -204,12 +151,49 @@ namespace bbtk
 
        void vtkGBlackBoxView::updatePositionTextActors(double xInic, double yInic, double zInic)
        {
-               //_nameActor->SetPosition(xInic+4,yInic-5,zInic);
-               //_nameActor->SetScale(2,2,1);
-               _vectorNameText->SetPosition(xInic+4,yInic-5,zInic);
+               _nameActor->SetPosition(xInic+4,yInic-5,zInic);
+               _nameActor->SetScale(0.04,0.04,1);
                                        
                _typeActor->SetPosition(xInic+4,yInic-10,zInic);
-               _typeActor->SetScale(2,2,1);
+               _typeActor->SetScale(0.04,0.04,1);
+       }
+
+       //=========================================================================
+
+       void vtkGBlackBoxView::updateColors()
+       {
+               _objectActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
+               _nameActor->GetTextProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
+               _typeActor->GetTextProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
+
+               if(_state==NOTHING_HAPPENS)
+               {
+                       _objectActor->GetProperty()->SetLineWidth(1);
+                       _objectActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
+                       _nameActor->GetTextProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
+                       _typeActor->GetTextProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
+               }
+               else if(_state==HIGHLIGHTED)
+               {
+                       _objectActor->GetProperty()->SetLineWidth(2);
+                       _objectActor->GetProperty()->SetColor(BOXCONTOUR_HIGHLIGHTED_R,BOXCONTOUR_HIGHLIGHTED_G,BOXCONTOUR_HIGHLIGHTED_B);
+                       _nameActor->GetTextProperty()->SetColor(BOXCONTOUR_HIGHLIGHTED_R,BOXCONTOUR_HIGHLIGHTED_G,BOXCONTOUR_HIGHLIGHTED_B);
+                       _typeActor->GetTextProperty()->SetColor(BOXCONTOUR_HIGHLIGHTED_R,BOXCONTOUR_HIGHLIGHTED_G,BOXCONTOUR_HIGHLIGHTED_B);
+               }
+               else if(_state==DRAG)
+               {
+                       _objectActor->GetProperty()->SetLineWidth(1.2);
+                       _objectActor->GetProperty()->SetColor(BOXCONTOUR_DRAG_R,BOXCONTOUR_DRAG_G,BOXCONTOUR_DRAG_B);
+                       _nameActor->GetTextProperty()->SetColor(BOXCONTOUR_DRAG_R,BOXCONTOUR_DRAG_G,BOXCONTOUR_DRAG_B);
+                       _typeActor->GetTextProperty()->SetColor(BOXCONTOUR_DRAG_R,BOXCONTOUR_DRAG_G,BOXCONTOUR_DRAG_B);
+               }
+               else if(_state==SELECTED)
+               {
+                       _objectActor->GetProperty()->SetLineWidth(2);
+                       _objectActor->GetProperty()->SetColor(BOXCONTOUR_SELECTED_R,BOXCONTOUR_SELECTED_G,BOXCONTOUR_SELECTED_B);
+                       _nameActor->GetTextProperty()->SetColor(BOXCONTOUR_SELECTED_R,BOXCONTOUR_SELECTED_G,BOXCONTOUR_SELECTED_B);
+                       _typeActor->GetTextProperty()->SetColor(BOXCONTOUR_SELECTED_R,BOXCONTOUR_SELECTED_G,BOXCONTOUR_SELECTED_B);
+               }
        }
 
        //=========================================================================