The actual version updates the status bar with the highlighted object ... Also it...

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

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
index 6457cf456125ce7a115b02415858e39d4a68aaa7..70aed5fc40e4c8e92e34bf7e119f97a59d1d0fd1 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
@@ -67,13 +67,8 @@ namespace bbtk
                _pts->SetPoint(3, xFin, yInic, zFin );
 
 
-               _ptsFill->SetPoint(0, xInic, yInic, zInic-0.01 );
-               _ptsFill->SetPoint(1, xInic, yFin, zInic-0.01 );
-               _ptsFill->SetPoint(2, xFin, yFin, zFin-0.01 );
-               _ptsFill->SetPoint(3, xFin, yInic, zFin-0.01 );
-
-
-               bboxMapperFill->Modified();
+               _borderPolyMapper->Modified();
+               _fillPolyMapper->Modified();
                //-----------
 
                updatePositionTextActors(xInic, yInic,zInic);
@@ -91,8 +86,8 @@ namespace bbtk
                _pts = vtkPoints::New();        
                vtkCellArray *lines = vtkCellArray::New();
                vtkPolyData *_pd = vtkPolyData::New();
-               vtkPolyDataMapper* _bboxMapper=vtkPolyDataMapper::New();
-               _objectBorderActor=vtkActor::New();
+               _borderPolyMapper=vtkPolyDataMapper::New();
+               _borderObjectActor=vtkActor::New();
                                
                _pts->SetNumberOfPoints(4);
 
@@ -117,29 +112,20 @@ namespace bbtk
                _pd->SetPoints( _pts );
                _pd->SetLines( lines );
 
-               _bboxMapper->SetInput(_pd);
-               _objectBorderActor->SetMapper(_bboxMapper);
-
-               _objectBorderActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
+               _borderPolyMapper->SetInput(_pd);
+               _borderObjectActor->SetMapper(_borderPolyMapper);
+               _borderPolyMapper->Modified();
 
                
                ///************************* FILL *************************
 
-               _ptsFill = vtkPoints::New();
                vtkCellArray *strip = vtkCellArray::New();
                vtkPolyData *pdFill = vtkPolyData::New();
-               bboxMapperFill=vtkPolyDataMapper::New();
-               _fillBorderActor=vtkActor::New();
-
-               _ptsFill->SetNumberOfPoints(4);
+               _fillPolyMapper=vtkPolyDataMapper::New();
+               _fillObjectActor=vtkActor::New();
 
                // RaC In the actual version, zInic=zFin=900
 
-               _ptsFill->SetPoint(0, xInic, yInic, zInic-0.01 );
-               _ptsFill->SetPoint(1, xInic, yFin, zInic-0.01 );
-               _ptsFill->SetPoint(2, xFin, yFin, zFin-0.01 );
-               _ptsFill->SetPoint(3, xFin, yInic, zFin-0.01 );
-
                strip->InsertNextCell(5);
                strip->InsertCellPoint(0);
                strip->InsertCellPoint(1);
@@ -147,13 +133,12 @@ namespace bbtk
                strip->InsertCellPoint(0);
                strip->InsertCellPoint(3);
                        
-               pdFill->SetPoints( _ptsFill );
+               pdFill->SetPoints( _pts );
                pdFill->SetStrips( strip );
 
-               bboxMapperFill->SetInput(pdFill);
-               _fillBorderActor->SetMapper(bboxMapperFill);
-               bboxMapperFill->Modified();
-               
+               _fillPolyMapper->SetInput(pdFill);
+               _fillObjectActor->SetMapper(_fillPolyMapper);
+               _fillPolyMapper->Modified();
 
                ///************************* FILL *************************
 
@@ -183,9 +168,7 @@ namespace bbtk
        void vtkGBlackBoxView::addVtkActors()//virtual
        {
                _baseView->GetRenderer()->AddActor(_nameActor);
-
                _baseView->GetRenderer()->AddActor(_typeActor);
-
                vtkGObjectView::addVtkActors();
        }
 
@@ -204,42 +187,40 @@ namespace bbtk
 
        void vtkGBlackBoxView::updateColors()
        {
-               _objectBorderActor->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);
-               _fillBorderActor->GetProperty()->SetColor(0.2,0.8,0.2);
+               _fillObjectActor->GetProperty()->SetAmbient(0.6);
 
                if(_state==NOTHING_HAPPENS)
                {
-                       _objectBorderActor->GetProperty()->SetLineWidth(1);
-                       _objectBorderActor->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);
-                       _fillBorderActor->GetProperty()->SetColor(0.2,0.8,0.2);
+                       _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);
+                       
                }
                else if(_state==HIGHLIGHTED)
                {
-                       _objectBorderActor->GetProperty()->SetLineWidth(2);
-                       _objectBorderActor->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);
-                       _fillBorderActor->GetProperty()->SetColor(BOXCONTOUR_HIGHLIGHTED_R+.1,BOXCONTOUR_HIGHLIGHTED_G+.1,BOXCONTOUR_HIGHLIGHTED_B+.1);
+                       _borderObjectActor->GetProperty()->SetLineWidth(2);
+                       _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);
                }
                else if(_state==DRAG)
                {
-                       _objectBorderActor->GetProperty()->SetLineWidth(1.2);
-                       _objectBorderActor->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);
-                       _fillBorderActor->GetProperty()->SetColor(BOXCONTOUR_DRAG_R,BOXCONTOUR_DRAG_G,BOXCONTOUR_DRAG_B);
+                       _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);
                }
                else if(_state==SELECTED)
                {
-                       _objectBorderActor->GetProperty()->SetLineWidth(2);
-                       _objectBorderActor->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);
-                       _fillBorderActor->GetProperty()->SetColor(BOXCONTOUR_SELECTED_R,BOXCONTOUR_SELECTED_G,BOXCONTOUR_SELECTED_B);
+                       _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);
                }
        }