Now the contour is created from the center of the initial port

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

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
index 64d1ceca7a1b29a3b7a89ba4279694afcc68396a..65dbf1ae932fa757d2678ad53e9aee7f8dc524a4 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
@@ -51,53 +51,28 @@ namespace bbtk
        }
 
        //=========================================================================
-       void vtkGBlackBoxView::update(int command)
+       void vtkGBlackBoxView::update(int idController,int command)
        {
-               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);
 
-               _pts->SetPoint(0, xInic, yInic, 0 );
-               _pts->SetPoint(1, xInic, yFin, 0 );
-               _pts->SetPoint(2, xFin, yFin, 0 );
-               _pts->SetPoint(3, xFin, yInic, 0 );
+               // RaC In the actual version, zInic=zFin=900
+
+               _pts->SetPoint(0, xInic, yInic, zInic );
+               _pts->SetPoint(1, xInic, yFin, zInic );
+               _pts->SetPoint(2, xFin, yFin, zFin );
+               _pts->SetPoint(3, xFin, yInic, zFin );
 
                //-----------
 
                updatePositionTextActors(xInic, yInic,zInic);
 
                //-----------
-
-               _baseView->GetRenWin()->Render();
+               setRefreshWaiting();
        }
 
        //=========================================================================
@@ -118,10 +93,12 @@ namespace bbtk
                _model->getInicPoint(xInic,yInic,zInic);
                _model->getFinalPoint(xFin, yFin,zFin);
 
-               _pts->SetPoint(0, xInic, yInic, 0 );
-               _pts->SetPoint(1, xInic, yFin, 0 );
-               _pts->SetPoint(2, xFin, yFin, 0 );
-               _pts->SetPoint(3, xFin, yInic, 0 );
+               // RaC In the actual version, zInic=zFin=900
+
+               _pts->SetPoint(0, xInic, yInic, zInic );
+               _pts->SetPoint(1, xInic, yFin, zInic );
+               _pts->SetPoint(2, xFin, yFin, zFin );
+               _pts->SetPoint(3, xFin, yInic, zFin );
                                
                lines->InsertNextCell(5);
                lines->InsertCellPoint(0);
@@ -140,32 +117,23 @@ 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);
+               _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());
-
-               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);
-               _typeActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
-
        }
 
        //=========================================================================
@@ -173,6 +141,7 @@ namespace bbtk
        void vtkGBlackBoxView::addVtkActors()//virtual
        {
                _baseView->GetRenderer()->AddActor(_nameActor);
+
                _baseView->GetRenderer()->AddActor(_typeActor);
 
                vtkGObjectView::addVtkActors();
@@ -182,13 +151,52 @@ namespace bbtk
 
        void vtkGBlackBoxView::updatePositionTextActors(double xInic, double yInic, double zInic)
        {
-               _nameActor->SetPosition(xInic+0.04,yInic-0.05,zInic);
-               _nameActor->SetScale(0.03,0.02,1);
+               _nameActor->SetPosition(xInic+4,yInic-5,zInic);
+               _nameActor->SetScale(0.04,0.04,1);
                                        
-               _typeActor->SetPosition(xInic+0.04,yInic-0.1,zInic);
-               _typeActor->SetScale(0.03,0.02,1);
+               _typeActor->SetPosition(xInic+4,yInic-10,zInic);
+               _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);
+               }
+       }
+
+       //=========================================================================
 
 }  // EO namespace bbtk