This commit was manufactured by cvs2svn to create tag 'CREATOOLS_2-0-3'.

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

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
index a4f6965e6cb9485084bac36b4361c6fb548767a7..4dbbbedae0756badc45b963c919ec550c757dc85 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
@@ -66,12 +66,13 @@ namespace bbtk
                _pts->SetPoint(2, xFin, yFin, zFin );
                _pts->SetPoint(3, xFin, yInic, zFin );
 
+               updatePorts();
 
                _borderPolyMapper->Modified();
                _fillPolyMapper->Modified();
                //-----------
 
-               updatePositionTextActors(xInic, yInic,zInic);
+               updatePositionTextActor(xInic, yInic,zInic);
 
                //-----------
                setRefreshWaiting();
@@ -83,11 +84,11 @@ namespace bbtk
        {
 
                //------------
-               _pts = vtkPoints::New();        
+               _pts                            = vtkPoints::New();     
                vtkCellArray *lines = vtkCellArray::New();
-               vtkPolyData *_pd = vtkPolyData::New();
-               _borderPolyMapper=vtkPolyDataMapper::New();
-               _borderObjectActor=vtkActor::New();
+               vtkPolyData *_pd        = vtkPolyData::New();
+               _borderPolyMapper       = vtkPolyDataMapper::New();
+               _borderObjectActor      = vtkActor::New();
                                
                _pts->SetNumberOfPoints(4);
 
@@ -97,11 +98,18 @@ namespace bbtk
 
                // RaC In the actual version, zInic=zFin=900
 
-               _pts->SetPoint(0, xInic, yInic, zInic );
+//EED          _pts->SetPoint(0, xInic, yInic, zInic );
+//EED          _pts->SetPoint(1, xInic, yFin, zInic );
+//EED          _pts->SetPoint(2, xFin, yFin, zFin );
+//EED          _pts->SetPoint(3, xFin, yInic, zFin );
+
+               _pts->SetPoint(0, -1000, -1000, -1000 );
                _pts->SetPoint(1, xInic, yFin, zInic );
-               _pts->SetPoint(2, xFin, yFin, zFin );
+               _pts->SetPoint(2, 1000, 1000, 1000 );
                _pts->SetPoint(3, xFin, yInic, zFin );
-                               
+               
+               
+               
                lines->InsertNextCell(5);
                lines->InsertCellPoint(0);
                lines->InsertCellPoint(1);
@@ -121,8 +129,8 @@ namespace bbtk
 
                vtkCellArray *strip = vtkCellArray::New();
                vtkPolyData *pdFill = vtkPolyData::New();
-               _fillPolyMapper=vtkPolyDataMapper::New();
-               _fillObjectActor=vtkActor::New();
+               _fillPolyMapper         = vtkPolyDataMapper::New();
+               _fillObjectActor        = vtkActor::New();
 
                // RaC In the actual version, zInic=zFin=900
 
@@ -144,31 +152,21 @@ namespace bbtk
 
                //------------
 
-               _nameActor = vtkTextActor3D::New();
-               std::string temp = _model->getBBTKName();
-               _nameActor->GetTextProperty()->SetFontSize(80);
-               _nameActor->GetTextProperty()->BoldOn();
-               _nameActor->SetInput(temp.c_str());
+               _boxTextActor           = vtkTextActor3D::New();
+               _boxTextActor->GetTextProperty()->SetFontSize(80);
+               _boxTextActor->GetTextProperty()->BoldOn();
 
                //------------
 
-               _typeActor = vtkTextActor3D::New();
-               temp = _model->getBBTKType();
-               _typeActor->GetTextProperty()->SetFontSize(80);
-               _typeActor->GetTextProperty()->BoldOn();
-               _typeActor->SetInput(temp.c_str());
-
-               //------------
-
-               updatePositionTextActors( xInic,  yInic,  zInic);
+               updatePositionTextActor( xInic,  yInic,  zInic);
        }
 
        //=========================================================================
 
        void vtkGBlackBoxView::addVtkActors()//virtual
        {
-               _baseView->GetRenderer()->AddActor(_nameActor);
-               _baseView->GetRenderer()->AddActor(_typeActor);
+               _baseView->GetRenderer()->AddActor(_borderObjectActor);
+               _baseView->GetRenderer()->AddActor(_boxTextActor);
                vtkGObjectView::addVtkActors();
        }
 
@@ -176,20 +174,21 @@ namespace bbtk
 
        void vtkGBlackBoxView::removeVtkActors()//virtual
        {
-               _baseView->GetRenderer()->RemoveActor(_nameActor);
-               _baseView->GetRenderer()->RemoveActor(_typeActor);
+               _baseView->GetRenderer()->RemoveActor(_borderObjectActor);
+               _baseView->GetRenderer()->RemoveActor(_boxTextActor);
                vtkGObjectView::removeVtkActors();
        }
 
        //=========================================================================
 
-       void vtkGBlackBoxView::updatePositionTextActors(double xInic, double yInic, double zInic)
+       void vtkGBlackBoxView::updatePositionTextActor(double xInic, double yInic, double zInic)
        {
-               _nameActor->SetPosition(xInic+4,yInic-5,zInic);
-               _nameActor->SetScale(0.04,0.04,1);
-                                       
-               _typeActor->SetPosition(xInic+4,yInic-10,zInic);
-               _typeActor->SetScale(0.04,0.04,1);
+               std::string temp        = _model->getBBTKType();
+               temp+=":";
+               temp+=_model->getBBTKName();
+               _boxTextActor->SetInput(temp.c_str());
+               _boxTextActor->SetPosition(xInic+4,yInic-7,zInic);
+               _boxTextActor->SetScale(0.05,0.05,1);
        }
 
        //=========================================================================
@@ -203,8 +202,7 @@ namespace bbtk
                        _borderObjectActor->GetProperty()->SetLineWidth(1);
                        _borderObjectActor->GetProperty()->SetColor(BOXBORDER_NH_R,BOXBORDER_NH_G,BOXBORDER_NH_B);
                        _fillObjectActor->GetProperty()->SetColor(BOXFILL_NH_R,BOXFILL_NH_G,BOXFILL_NH_B);
-                       _nameActor->GetTextProperty()->SetColor(BOXTEXT_NH_R,BOXTEXT_NH_G,BOXTEXT_NH_B);
-                       _typeActor->GetTextProperty()->SetColor(BOXTEXT_NH_R,BOXTEXT_NH_G,BOXTEXT_NH_B);
+                       _boxTextActor->GetTextProperty()->SetColor(BOXTEXT_NH_R,BOXTEXT_NH_G,BOXTEXT_NH_B);
 
                        GBlackBoxModel *bbmodel = (GBlackBoxModel*)_model;
                        if(bbmodel->isExecutable())
@@ -220,29 +218,27 @@ namespace bbtk
                        
                        _borderObjectActor->GetProperty()->SetColor(BOXBORDER_HIGHLIGHTED_R,BOXBORDER_HIGHLIGHTED_G,BOXBORDER_HIGHLIGHTED_B);
                        _fillObjectActor->GetProperty()->SetColor(BOXFILL_HIGHLIGHTED_R,BOXFILL_HIGHLIGHTED_G,BOXFILL_HIGHLIGHTED_B);
-                       _nameActor->GetTextProperty()->SetColor(BOXTEXT_HIGHLIGHTED_R,BOXTEXT_HIGHLIGHTED_G,BOXTEXT_HIGHLIGHTED_B);
-                       _typeActor->GetTextProperty()->SetColor(BOXTEXT_HIGHLIGHTED_R,BOXTEXT_HIGHLIGHTED_G,BOXTEXT_HIGHLIGHTED_B);
+                       _boxTextActor->GetTextProperty()->SetColor(BOXTEXT_HIGHLIGHTED_R,BOXTEXT_HIGHLIGHTED_G,BOXTEXT_HIGHLIGHTED_B);
                }
                else if(_state==DRAG)
                {
                        _borderObjectActor->GetProperty()->SetLineWidth(1.2);
                        _borderObjectActor->GetProperty()->SetColor(BOXBORDER_DRAG_R,BOXBORDER_DRAG_G,BOXBORDER_DRAG_B);
                        _fillObjectActor->GetProperty()->SetColor(BOXFILL_DRAG_R,BOXFILL_DRAG_G,BOXFILL_DRAG_B);
-                       _nameActor->GetTextProperty()->SetColor(BOXTEXT_DRAG_R,BOXTEXT_DRAG_G,BOXTEXT_DRAG_B);
-                       _typeActor->GetTextProperty()->SetColor(BOXTEXT_DRAG_R,BOXTEXT_DRAG_G,BOXTEXT_DRAG_B);
+                       _boxTextActor->GetTextProperty()->SetColor(BOXTEXT_DRAG_R,BOXTEXT_DRAG_G,BOXTEXT_DRAG_B);
                }
                else if(_state==SELECTED)
                {
                        _borderObjectActor->GetProperty()->SetLineWidth(2);
                        _borderObjectActor->GetProperty()->SetColor(BOXBORDER_SELECTED_R,BOXBORDER_SELECTED_G,BOXBORDER_SELECTED_B);
                        _fillObjectActor->GetProperty()->SetColor(BOXFILL_SELECTED_R,BOXFILL_SELECTED_G,BOXFILL_SELECTED_B);
-                       _nameActor->GetTextProperty()->SetColor(BOXTEXT_SELECTED_R,BOXTEXT_SELECTED_G,BOXTEXT_SELECTED_B);
-                       _typeActor->GetTextProperty()->SetColor(BOXTEXT_SELECTED_R,BOXTEXT_SELECTED_G,BOXTEXT_SELECTED_B);
+                       _boxTextActor->GetTextProperty()->SetColor(BOXTEXT_SELECTED_R,BOXTEXT_SELECTED_G,BOXTEXT_SELECTED_B);
                }
        }
 
        //=========================================================================
 
+
 }  // EO namespace bbtk
 
 // EOF