X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsVtkGUIEditorGraphic%2FvtkGPortView.cxx;h=40e9478051cc50b9554afee148347d130c6375fb;hb=f6286f6851a4c0757cbacbee679d31bcc5a933bd;hp=6633e1fe3bcff3c876dd21532838958ca049de83;hpb=be7230c59a3a7d7aa5bfee591b35d31e5e7a93b3;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx
index 6633e1f..40e9478 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;
@@ -95,23 +90,14 @@ namespace bbtk
 
 		double mid = (xInic+xFin)/2;
 
-		_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);
-			
-		_pd->SetPoints( _pts );
-		_pd->SetLines( lines );
-
-		_borderPolyMapper->SetInput(_pd);
-		_borderObjectActor->SetMapper(_borderPolyMapper);
-		_borderPolyMapper->Modified();
+//EED		_pts->SetPoint(0, xInic, yInic, zInic );
+//EED		_pts->SetPoint(1, mid, yFin, zInic );
+//EED		_pts->SetPoint(2, xFin, yInic, zFin );				
 
+		_pts->SetPoint(0, -1000, -1000, -1000 );
+		_pts->SetPoint(1, mid, yFin, zInic );
+		_pts->SetPoint(2, 1000, 1000, 1000 );				
+		
 		
 		///************************* FILL *************************
 
@@ -145,29 +131,22 @@ 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.45,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
-		{
+			_fillObjectActor->GetProperty()->SetColor( 0 , 0 , 1 );
+		} 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.5,0.2,0.2);
-			}
-			else 
-			{
-				_fillObjectActor->GetProperty()->SetColor(0.6,0.6,0.6);
+				_fillObjectActor->GetProperty()->SetColor(0.55,0.25,0.25);
+			} else {
+				_fillObjectActor->GetProperty()->SetColor(0.45,0.45,0.45);
 			}
 		}
 	}