X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsVtkGUIEditorGraphic%2FvtkGPortView.cxx;h=321a858241e81bd2cc8c05822bf6802661c6b083;hb=5cf9c7b92a97ee411e6a441beca8a06d2bffc8b3;hp=97a89586b32ac5bbb75ecd7bba22a2c1ec7cff9e;hpb=062ee1e352a911991a120c5bf95ba836a6b0871b;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx
index 97a8958..321a858 100644
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx
@@ -68,9 +68,9 @@ namespace bbtk
 		_pts->SetPoint(1, mid, yFin, zInic );
 		_pts->SetPoint(2, xFin, yInic, zFin );
 
-		_borderObjectActor->Modified();
 		_fillPolyMapper->Modified();
 		
+		//-----------
 		setRefreshWaiting();
 	}
 
@@ -79,11 +79,6 @@ namespace bbtk
 	void vtkGPortView::createVtkObjects() //virtual
 	{
 		_pts = vtkPoints::New();	
-		vtkCellArray *lines = vtkCellArray::New();
-		vtkPolyData *_pd = vtkPolyData::New();
-		_borderPolyMapper=vtkPolyDataMapper::New();
-		_borderObjectActor=vtkActor::New();
-		
 		_pts->SetNumberOfPoints(3);
 
 		double xInic, yInic,zInic,xFin, yFin,zFin;
@@ -97,22 +92,8 @@ namespace bbtk
 
 		_pts->SetPoint(0, xInic, yInic, zInic );
 		_pts->SetPoint(1, mid, yFin, zInic );
-		_pts->SetPoint(2, xFin, yInic, zFin );
-				
-		lines->InsertNextCell(4);
-		lines->InsertCellPoint(0);
-		lines->InsertCellPoint(1);
-		lines->InsertCellPoint(2);
-		lines->InsertCellPoint(0);
+		_pts->SetPoint(2, xFin, yInic, zFin );				
 			
-		_pd->SetPoints( _pts );
-		_pd->SetLines( lines );
-
-		_borderPolyMapper->SetInput(_pd);
-		_borderObjectActor->SetMapper(_borderPolyMapper);
-		_borderPolyMapper->Modified();
-
-		
 		///************************* FILL *************************
 
 		vtkCellArray *strip = vtkCellArray::New();
@@ -145,25 +126,26 @@ namespace bbtk
 
 	void vtkGPortView::updateColors()
 	{
-		_borderObjectActor->GetProperty()->SetColor(BOXBORDER_NH_R,BOXBORDER_NH_G,BOXBORDER_NH_B);
-		_fillObjectActor->GetProperty()->SetColor(0.6,0.6,0.6);
+		_fillObjectActor->GetProperty()->SetColor(0.5,0.45,0.45);
 
 		if(_state==HIGHLIGHTED)
 		{
-			_borderObjectActor->GetProperty()->SetColor(0.35,0.15,0.1);
 			_fillObjectActor->GetProperty()->SetColor(0.8,0.8,0.8);
 		}
 		else
 		{
 			GPortModel* portm = (GPortModel*)_model;
-			_borderObjectActor->GetProperty()->SetColor(0.15,0.15,0.15);
 			if(portm->isConnected())
 			{
-				_fillObjectActor->GetProperty()->SetColor(0.2,0.2,0.2);
+				_fillObjectActor->GetProperty()->SetColor(0.15,0.15,0.15);
+			}
+			else if(portm->isValueSet())
+			{
+				_fillObjectActor->GetProperty()->SetColor(0.55,0.25,0.25);
 			}
-			else
+			else 
 			{
-				_fillObjectActor->GetProperty()->SetColor(0.6,0.6,0.6);
+				_fillObjectActor->GetProperty()->SetColor(0.5,0.45,0.45);
 			}
 		}
 	}