Fill color fixed

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
index 2bb584bff6d7ced8e9ec2bf65bb5342473d3c915..6457cf456125ce7a115b02415858e39d4a68aaa7 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
@@ -73,6 +73,7 @@ namespace bbtk
                _ptsFill->SetPoint(3, xFin, yInic, zFin-0.01 );
 
 
+               bboxMapperFill->Modified();
                //-----------
 
                updatePositionTextActors(xInic, yInic,zInic);
@@ -127,7 +128,7 @@ namespace bbtk
                _ptsFill = vtkPoints::New();
                vtkCellArray *strip = vtkCellArray::New();
                vtkPolyData *pdFill = vtkPolyData::New();
-               vtkPolyDataMapper* bboxMapperFill=vtkPolyDataMapper::New();
+               bboxMapperFill=vtkPolyDataMapper::New();
                _fillBorderActor=vtkActor::New();
 
                _ptsFill->SetNumberOfPoints(4);
@@ -151,7 +152,8 @@ namespace bbtk
 
                bboxMapperFill->SetInput(pdFill);
                _fillBorderActor->SetMapper(bboxMapperFill);
-               _fillBorderActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
+               bboxMapperFill->Modified();
+               
 
                ///************************* FILL *************************
 
@@ -205,7 +207,7 @@ namespace bbtk
                _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(1,.5,.3);
+               _fillBorderActor->GetProperty()->SetColor(0.2,0.8,0.2);
 
                if(_state==NOTHING_HAPPENS)
                {
@@ -213,6 +215,7 @@ namespace bbtk
                        _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);
                }
                else if(_state==HIGHLIGHTED)
                {
@@ -220,6 +223,7 @@ namespace bbtk
                        _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);
                }
                else if(_state==DRAG)
                {
@@ -227,6 +231,7 @@ namespace bbtk
                        _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);
                }
                else if(_state==SELECTED)
                {
@@ -234,6 +239,7 @@ namespace bbtk
                        _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);
                }
        }
 

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.h b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.h
index aa9ec84fb2c0a67fed6140f73039f251cb8d48be..18504607cb2325e76d57ca4a397f6a1affaa3176 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.h
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.h
@@ -86,6 +86,7 @@ namespace bbtk
                //Private Attributes
                vtkPoints *_pts;
                vtkPoints *_ptsFill;
+               vtkPolyDataMapper* bboxMapperFill;
                vtkTextActor3D* _nameActor;
                vtkTextActor3D* _typeActor;