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

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx
index 0359978..97a8958 100644
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx
@@ -62,10 +62,14 @@ namespace bbtk
 
 		// RaC In the actual version, zInic=zFin=900
 
+		double mid = (xInic+xFin)/2;
+
 		_pts->SetPoint(0, xInic, yInic, zInic );
-		_pts->SetPoint(1, xInic, yFin, zInic );
-		_pts->SetPoint(2, xFin, yFin, zFin );
-		_pts->SetPoint(3, xFin, yInic, zFin );
+		_pts->SetPoint(1, mid, yFin, zInic );
+		_pts->SetPoint(2, xFin, yInic, zFin );
+
+		_borderObjectActor->Modified();
+		_fillPolyMapper->Modified();
 		
 		setRefreshWaiting();
 	}
@@ -77,10 +81,10 @@ namespace bbtk
 		_pts = vtkPoints::New();	
 		vtkCellArray *lines = vtkCellArray::New();
 		vtkPolyData *_pd = vtkPolyData::New();
-		vtkPolyDataMapper* _bboxMapper=vtkPolyDataMapper::New();
-		_objectActor=vtkActor::New();
+		_borderPolyMapper=vtkPolyDataMapper::New();
+		_borderObjectActor=vtkActor::New();
 		
-		_pts->SetNumberOfPoints(4);
+		_pts->SetNumberOfPoints(3);
 
 		double xInic, yInic,zInic,xFin, yFin,zFin;
 
@@ -88,23 +92,49 @@ namespace bbtk
 		_model->getFinalPoint(xFin, yFin,zFin);
 
 		// RaC In the actual version, zInic=zFin=900
+
+		double mid = (xInic+xFin)/2;
+
 		_pts->SetPoint(0, xInic, yInic, zInic );
-		_pts->SetPoint(1, xInic, yFin, zInic );
-		_pts->SetPoint(2, xFin, yFin, zFin );
-		_pts->SetPoint(3, xFin, yInic, zFin );
+		_pts->SetPoint(1, mid, yFin, zInic );
+		_pts->SetPoint(2, xFin, yInic, zFin );
 				
-		lines->InsertNextCell(5);
+		lines->InsertNextCell(4);
 		lines->InsertCellPoint(0);
 		lines->InsertCellPoint(1);
 		lines->InsertCellPoint(2);
-		lines->InsertCellPoint(3);
 		lines->InsertCellPoint(0);
 			
 		_pd->SetPoints( _pts );
 		_pd->SetLines( lines );
 
-		_bboxMapper->SetInput(_pd);
-		_objectActor->SetMapper(_bboxMapper);
+		_borderPolyMapper->SetInput(_pd);
+		_borderObjectActor->SetMapper(_borderPolyMapper);
+		_borderPolyMapper->Modified();
+
+		
+		///************************* FILL *************************
+
+		vtkCellArray *strip = vtkCellArray::New();
+		vtkPolyData *pdFill = vtkPolyData::New();
+		_fillPolyMapper=vtkPolyDataMapper::New();
+		_fillObjectActor=vtkActor::New();
+
+		// RaC In the actual version, zInic=zFin=900
+
+		strip->InsertNextCell(3);
+		strip->InsertCellPoint(0);
+		strip->InsertCellPoint(1);
+		strip->InsertCellPoint(2);
+			
+		pdFill->SetPoints( _pts );
+		pdFill->SetStrips( strip );
+
+		_fillPolyMapper->SetInput(pdFill);
+		_fillObjectActor->SetMapper(_fillPolyMapper);
+		_fillPolyMapper->Modified();
+
+		///************************* FILL *************************
 
 		updateColors();
 
@@ -115,15 +145,26 @@ namespace bbtk
 
 	void vtkGPortView::updateColors()
 	{
-		_objectActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
+		_borderObjectActor->GetProperty()->SetColor(BOXBORDER_NH_R,BOXBORDER_NH_G,BOXBORDER_NH_B);
+		_fillObjectActor->GetProperty()->SetColor(0.6,0.6,0.6);
 
 		if(_state==HIGHLIGHTED)
 		{
-			_objectActor->GetProperty()->SetColor(0.8,0.2,0.5);
+			_borderObjectActor->GetProperty()->SetColor(0.35,0.15,0.1);
+			_fillObjectActor->GetProperty()->SetColor(0.8,0.8,0.8);
 		}
 		else
 		{
-			_objectActor->GetProperty()->SetColor(0.3,0.2,0.2);
+			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);
+			}
+			else
+			{
+				_fillObjectActor->GetProperty()->SetColor(0.6,0.6,0.6);
+			}
 		}
 	}