X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FEditorGraphicBBS%2FbbsVtkGUIEditorGraphic%2FvtkGBlackBoxView.cxx;h=4dbbbedae0756badc45b963c919ec550c757dc85;hb=547ca8b4d40e607106fe9baae8a6679925d7dd42;hp=5c36d4b2ab66fc3462b71f45ade703a68d4c11e2;hpb=0b3b25440d23eabf549ebdfa0a4a39ea91ea2f23;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
index 5c36d4b..4dbbbed 100644
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
@@ -51,62 +51,65 @@ namespace bbtk
 	}
 
 	//=========================================================================
-	void vtkGBlackBoxView::update(int command)
+	void vtkGBlackBoxView::update(int idController,int command)
 	{
-		if(_model->getState()==NOTHING_HAPPENS)
-		{
-			_objectActor->GetProperty()->SetLineWidth(1);
-			_objectActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
-		}
-		else if(_model->getState()==HIGHLIGHTED)
-		{
-			_objectActor->GetProperty()->SetLineWidth(2);
-			_objectActor->GetProperty()->SetColor(BOXCONTOUR_HIGHLIGHTED_R,BOXCONTOUR_HIGHLIGHTED_G,BOXCONTOUR_HIGHLIGHTED_B);
-		}
-		else if(_model->getState()==DRAG)
-		{
-			_objectActor->GetProperty()->SetLineWidth(1.2);
-			_objectActor->GetProperty()->SetColor(BOXCONTOUR_DRAG_R,BOXCONTOUR_DRAG_G,BOXCONTOUR_DRAG_B);
-		}
-		else if(_model->getState()==SELECTED)
-		{
-			_objectActor->GetProperty()->SetLineWidth(2);
-			_objectActor->GetProperty()->SetColor(BOXCONTOUR_SELECTED_R,BOXCONTOUR_SELECTED_G,BOXCONTOUR_SELECTED_B);
-		}
-
+		updateColors();
+		
 		double xInic, yInic,zInic,xFin, yFin,zFin;
 		_model->getInicPoint(xInic,yInic,zInic);
 		_model->getFinalPoint(xFin, yFin,zFin);
 
-		_pts->SetPoint(0, xInic, yInic, 0 );
-		_pts->SetPoint(1, xInic, yFin, 0 );
-		_pts->SetPoint(2, xFin, yFin, 0 );
-		_pts->SetPoint(3, xFin, yInic, 0 );
+		// RaC In the actual version, zInic=zFin=900
+
+		_pts->SetPoint(0, xInic, yInic, zInic );
+		_pts->SetPoint(1, xInic, yFin, zInic );
+		_pts->SetPoint(2, xFin, yFin, zFin );
+		_pts->SetPoint(3, xFin, yInic, zFin );
+
+		updatePorts();
 
-		_baseView->GetRenWin()->Render();
+		_borderPolyMapper->Modified();
+		_fillPolyMapper->Modified();
+		//-----------
+
+		updatePositionTextActor(xInic, yInic,zInic);
+
+		//-----------
+		setRefreshWaiting();
 	}
 
 	//=========================================================================
 
 	void vtkGBlackBoxView::createVtkObjects() //virtual
 	{
-		_pts = vtkPoints::New();	
+
+		//------------
+		_pts				= vtkPoints::New();	
 		vtkCellArray *lines = vtkCellArray::New();
-		vtkPolyData *_pd = vtkPolyData::New();
-		vtkPolyDataMapper* _bboxMapper=vtkPolyDataMapper::New();
-		_objectActor=vtkActor::New();
-		
+		vtkPolyData *_pd	= vtkPolyData::New();
+		_borderPolyMapper	= vtkPolyDataMapper::New();
+		_borderObjectActor	= vtkActor::New();
+				
 		_pts->SetNumberOfPoints(4);
 
 		double xInic, yInic,zInic,xFin, yFin,zFin;
 		_model->getInicPoint(xInic,yInic,zInic);
 		_model->getFinalPoint(xFin, yFin,zFin);
 
-		_pts->SetPoint(0, xInic, yInic, 0 );
-		_pts->SetPoint(1, xInic, yFin, 0 );
-		_pts->SetPoint(2, xFin, yFin, 0 );
-		_pts->SetPoint(3, xFin, yInic, 0 );
-				
+		// RaC In the actual version, zInic=zFin=900
+
+//EED		_pts->SetPoint(0, xInic, yInic, zInic );
+//EED		_pts->SetPoint(1, xInic, yFin, zInic );
+//EED		_pts->SetPoint(2, xFin, yFin, zFin );
+//EED		_pts->SetPoint(3, xFin, yInic, zFin );
+
+		_pts->SetPoint(0, -1000, -1000, -1000 );
+		_pts->SetPoint(1, xInic, yFin, zInic );
+		_pts->SetPoint(2, 1000, 1000, 1000 );
+		_pts->SetPoint(3, xFin, yInic, zFin );
+		
+		
+		
 		lines->InsertNextCell(5);
 		lines->InsertCellPoint(0);
 		lines->InsertCellPoint(1);
@@ -117,11 +120,120 @@ namespace bbtk
 		_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(5);
+		strip->InsertCellPoint(0);
+		strip->InsertCellPoint(1);
+		strip->InsertCellPoint(2);
+		strip->InsertCellPoint(0);
+		strip->InsertCellPoint(3);
+			
+		pdFill->SetPoints( _pts );
+		pdFill->SetStrips( strip );
+
+		_fillPolyMapper->SetInput(pdFill);
+		_fillObjectActor->SetMapper(_fillPolyMapper);
+		_fillPolyMapper->Modified();
+
+		///************************* FILL *************************
+
+		//------------
 
-		_objectActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
+		_boxTextActor		= vtkTextActor3D::New();
+		_boxTextActor->GetTextProperty()->SetFontSize(80);
+		_boxTextActor->GetTextProperty()->BoldOn();
 
+		//------------
+
+		updatePositionTextActor( xInic,  yInic,  zInic);
+	}
+
+	//=========================================================================
+
+	void vtkGBlackBoxView::addVtkActors()//virtual
+	{
+		_baseView->GetRenderer()->AddActor(_borderObjectActor);
+		_baseView->GetRenderer()->AddActor(_boxTextActor);
+		vtkGObjectView::addVtkActors();
+	}
+
+	//=========================================================================
+
+	void vtkGBlackBoxView::removeVtkActors()//virtual
+	{
+		_baseView->GetRenderer()->RemoveActor(_borderObjectActor);
+		_baseView->GetRenderer()->RemoveActor(_boxTextActor);
+		vtkGObjectView::removeVtkActors();
+	}
+
+	//=========================================================================
+
+	void vtkGBlackBoxView::updatePositionTextActor(double xInic, double yInic, double zInic)
+	{
+		std::string temp	= _model->getBBTKType();
+		temp+=":";
+		temp+=_model->getBBTKName();
+		_boxTextActor->SetInput(temp.c_str());
+		_boxTextActor->SetPosition(xInic+4,yInic-7,zInic);
+		_boxTextActor->SetScale(0.05,0.05,1);
+	}
+
+	//=========================================================================
+
+	void vtkGBlackBoxView::updateColors()
+	{
+		_fillObjectActor->GetProperty()->SetAmbient(0.6);
+
+		if(_state==NOTHING_HAPPENS)
+		{
+			_borderObjectActor->GetProperty()->SetLineWidth(1);
+			_borderObjectActor->GetProperty()->SetColor(BOXBORDER_NH_R,BOXBORDER_NH_G,BOXBORDER_NH_B);
+			_fillObjectActor->GetProperty()->SetColor(BOXFILL_NH_R,BOXFILL_NH_G,BOXFILL_NH_B);
+			_boxTextActor->GetTextProperty()->SetColor(BOXTEXT_NH_R,BOXTEXT_NH_G,BOXTEXT_NH_B);
+
+			GBlackBoxModel *bbmodel = (GBlackBoxModel*)_model;
+			if(bbmodel->isExecutable())
+			{
+				_borderObjectActor->GetProperty()->SetColor(BOXBORDER_NH_R,0.9,BOXBORDER_HIGHLIGHTED_B);
+				_fillObjectActor->GetProperty()->SetColor(BOXFILL_NH_R,0.9,BOXFILL_HIGHLIGHTED_B);
+			}
+			
+		}
+		else if(_state==HIGHLIGHTED)
+		{
+			_borderObjectActor->GetProperty()->SetLineWidth(2);
+			
+			_borderObjectActor->GetProperty()->SetColor(BOXBORDER_HIGHLIGHTED_R,BOXBORDER_HIGHLIGHTED_G,BOXBORDER_HIGHLIGHTED_B);
+			_fillObjectActor->GetProperty()->SetColor(BOXFILL_HIGHLIGHTED_R,BOXFILL_HIGHLIGHTED_G,BOXFILL_HIGHLIGHTED_B);
+			_boxTextActor->GetTextProperty()->SetColor(BOXTEXT_HIGHLIGHTED_R,BOXTEXT_HIGHLIGHTED_G,BOXTEXT_HIGHLIGHTED_B);
+		}
+		else if(_state==DRAG)
+		{
+			_borderObjectActor->GetProperty()->SetLineWidth(1.2);
+			_borderObjectActor->GetProperty()->SetColor(BOXBORDER_DRAG_R,BOXBORDER_DRAG_G,BOXBORDER_DRAG_B);
+			_fillObjectActor->GetProperty()->SetColor(BOXFILL_DRAG_R,BOXFILL_DRAG_G,BOXFILL_DRAG_B);
+			_boxTextActor->GetTextProperty()->SetColor(BOXTEXT_DRAG_R,BOXTEXT_DRAG_G,BOXTEXT_DRAG_B);
+		}
+		else if(_state==SELECTED)
+		{
+			_borderObjectActor->GetProperty()->SetLineWidth(2);
+			_borderObjectActor->GetProperty()->SetColor(BOXBORDER_SELECTED_R,BOXBORDER_SELECTED_G,BOXBORDER_SELECTED_B);
+			_fillObjectActor->GetProperty()->SetColor(BOXFILL_SELECTED_R,BOXFILL_SELECTED_G,BOXFILL_SELECTED_B);
+			_boxTextActor->GetTextProperty()->SetColor(BOXTEXT_SELECTED_R,BOXTEXT_SELECTED_G,BOXTEXT_SELECTED_B);
+		}
 	}
 
 	//=========================================================================