X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsVtkGUIEditorGraphic%2FvtkGPortView.cxx;h=cd2332fb16a170b9ad4c62a376631b516e75d772;hb=f08102d8cf97a93b5fbff395a9fd667eaa26b269;hp=b0ef338bd65eda4de2ab9c4294462e530adc1cc0;hpb=8e6a8a638f2b03db8e34234b6e02d71cda913f9d;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx
index b0ef338..cd2332f 100644
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx
@@ -115,17 +115,18 @@ namespace bbtk {
         _pts = vtkPoints::New( ) ;
         _pts->SetNumberOfPoints( 3 ) ;
 
-        _pts->SetPoint( 0 , -1000 , -1000 , -1000 ) ;
-        _pts->SetPoint( 1 , mid , yFin , zInic ) ;
-        _pts->SetPoint( 2 , 1000 , 1000 , 1000 ) ;
+//EED 2017-03-02
+//        _pts->SetPoint( 0 , -1000 , -1000 , -1000 ) ;
+//        _pts->SetPoint( 1 , mid , yFin , zInic ) ;
+//        _pts->SetPoint( 2 , 1000 , 1000 , 1000 ) ;
 
 
         ///************************* FILL *************************
 
-        vtkCellArray *strip = vtkCellArray::New( ) ;
-        vtkPolyData *pdFill = vtkPolyData::New( ) ;
-        _fillPolyMapper = vtkPolyDataMapper::New( ) ;
-        _fillObjectActor = vtkActor::New( ) ;
+        vtkCellArray 	*strip 		= vtkCellArray::New( ) ;
+        vtkPolyData 	*pdFill 	= vtkPolyData::New( ) ;
+        		_fillPolyMapper 	= vtkPolyDataMapper::New( ) ;
+        		_fillObjectActor 	= vtkActor::New( ) ;
 
         // RaC In the actual version, zInic=zFin=GPOSITION_Z
 
@@ -150,29 +151,37 @@ namespace bbtk {
 
     //=========================================================================
 
-    void vtkGPortView::updateColors( ) {
-        _fillObjectActor->GetProperty( )->SetColor( 0.45 , 0.45 , 0.45 ) ;
+    void vtkGPortView::updateColors( ) 
+	{
+//EED2017-04-08
+		float rgb[3];
+		getColors(rgb);
+        _fillObjectActor->GetProperty( )->SetColor( rgb[0] , rgb[1] , rgb[2] ) ;
+    }
+
+    //=========================================================================
+//EED2017-04-08
+	void vtkGPortView::getColors(float* rgb)
+	{
+		rgb[0]=0.45; rgb[1]=0.45; rgb[2]=0.45;
 
         if ( _state == POSSIBLE_CONNECTION ) {
-            _fillObjectActor->GetProperty( )->SetColor( 1 , 1 , 0 ) ;
+			rgb[0]=1; rgb[1]=1; rgb[2]=0;
         } else if ( _state == SELECTED_POSSIBLE_CONNECTION ) {
-            _fillObjectActor->GetProperty( )->SetColor( 0 , 1 , 0 ) ;
+			rgb[0]=0; rgb[1]=1; rgb[2]=0;
         } else if ( _state == HIGHLIGHTED ) {
-            _fillObjectActor->GetProperty( )->SetColor( 0 , 0 , 1 ) ;
+			rgb[0]=0; rgb[1]=0; rgb[2]=1;
         } else {
             GPortModel* portm = ( GPortModel* ) _model ;
             if ( portm->isConnected( ) ) {
-                _fillObjectActor->GetProperty( )->SetColor( 0.15 , 0.15 , 0.15 ) ;
+				rgb[0]=0.15; rgb[1]=0.15; rgb[2]=0.15;
             } else if ( portm->isValueSet( ) ) {
-                _fillObjectActor->GetProperty( )->SetColor( 0.55 , 0.25 , 0.25 ) ;
+				rgb[0]=0.55; rgb[1]=0.25; rgb[2]=0.25;
             } else {
-                _fillObjectActor->GetProperty( )->SetColor( 0.45 , 0.45 , 0.45 ) ;
-            }
-        }
-    }
-
-    //=========================================================================
-
+				rgb[0]=0.45; rgb[1]=0.45; rgb[2]=0.45;
+            } // if portm
+        } // if  _state
+	}
 
 } // EO namespace bbtk