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

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
index 5c36d4b..0d56863 100644
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
@@ -51,61 +51,60 @@ 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 );
+
+
+		_ptsFill->SetPoint(0, xInic, yInic, zInic-0.01 );
+		_ptsFill->SetPoint(1, xInic, yFin, zInic-0.01 );
+		_ptsFill->SetPoint(2, xFin, yFin, zFin-0.01 );
+		_ptsFill->SetPoint(3, xFin, yInic, zFin-0.01 );
+
+
+		//-----------
 
-		_baseView->GetRenWin()->Render();
+		updatePositionTextActors(xInic, yInic,zInic);
+
+		//-----------
+		setRefreshWaiting();
 	}
 
 	//=========================================================================
 
 	void vtkGBlackBoxView::createVtkObjects() //virtual
 	{
+
+		//------------
 		_pts = vtkPoints::New();	
 		vtkCellArray *lines = vtkCellArray::New();
 		vtkPolyData *_pd = vtkPolyData::New();
 		vtkPolyDataMapper* _bboxMapper=vtkPolyDataMapper::New();
-		_objectActor=vtkActor::New();
-		
+		_objectBorderActor=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
+
+		_pts->SetPoint(0, xInic, yInic, zInic );
+		_pts->SetPoint(1, xInic, yFin, zInic );
+		_pts->SetPoint(2, xFin, yFin, zFin );
+		_pts->SetPoint(3, xFin, yInic, zFin );
 				
 		lines->InsertNextCell(5);
 		lines->InsertCellPoint(0);
@@ -118,14 +117,127 @@ namespace bbtk
 		_pd->SetLines( lines );
 
 		_bboxMapper->SetInput(_pd);
-		_objectActor->SetMapper(_bboxMapper);
+		_objectBorderActor->SetMapper(_bboxMapper);
+
+		_objectBorderActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
+
+		
+		///************************* FILL *************************
+
+		_ptsFill = vtkPoints::New();
+		vtkCellArray *strip = vtkCellArray::New();
+		vtkPolyData *pdFill = vtkPolyData::New();
+		vtkPolyDataMapper* bboxMapperFill=vtkPolyDataMapper::New();
+		_fillBorderActor=vtkActor::New();
+
+		_ptsFill->SetNumberOfPoints(4);
+
+		// RaC In the actual version, zInic=zFin=900
+
+		_ptsFill->SetPoint(0, xInic, yInic, zInic-0.01 );
+		_ptsFill->SetPoint(1, xInic, yFin, zInic-0.01 );
+		_ptsFill->SetPoint(2, xFin, yFin, zFin-0.01 );
+		_ptsFill->SetPoint(3, xFin, yInic, zFin-0.01 );
+
+		strip->InsertNextCell(5);
+		strip->InsertCellPoint(0);
+		strip->InsertCellPoint(1);
+		strip->InsertCellPoint(2);
+		strip->InsertCellPoint(0);
+		strip->InsertCellPoint(3);
+			
+		pdFill->SetPoints( _pts );
+		pdFill->SetStrips( strip );
+
+		bboxMapperFill->SetInput(pdFill);
+		_fillBorderActor->SetMapper(bboxMapperFill);
+		_fillBorderActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
 
-		_objectActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
+		///************************* FILL *************************
 
+		//------------
+
+		_nameActor = vtkTextActor3D::New();
+		std::string temp = _model->getBBTKName();
+		_nameActor->GetTextProperty()->SetFontSize(80);
+		_nameActor->GetTextProperty()->BoldOn();
+		_nameActor->SetInput(temp.c_str());
+
+		//------------
+
+		_typeActor = vtkTextActor3D::New();
+		temp = _model->getBBTKType();
+		_typeActor->GetTextProperty()->SetFontSize(80);
+		_typeActor->GetTextProperty()->BoldOn();
+		_typeActor->SetInput(temp.c_str());
+
+		//------------
+
+		updatePositionTextActors( xInic,  yInic,  zInic);
+	}
+
+	//=========================================================================
+
+	void vtkGBlackBoxView::addVtkActors()//virtual
+	{
+		_baseView->GetRenderer()->AddActor(_nameActor);
+
+		_baseView->GetRenderer()->AddActor(_typeActor);
+
+		vtkGObjectView::addVtkActors();
+	}
+
+	//=========================================================================
+
+	void vtkGBlackBoxView::updatePositionTextActors(double xInic, double yInic, double zInic)
+	{
+		_nameActor->SetPosition(xInic+4,yInic-5,zInic);
+		_nameActor->SetScale(0.04,0.04,1);
+					
+		_typeActor->SetPosition(xInic+4,yInic-10,zInic);
+		_typeActor->SetScale(0.04,0.04,1);
 	}
 
 	//=========================================================================
 
+	void vtkGBlackBoxView::updateColors()
+	{
+		_objectBorderActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
+		_nameActor->GetTextProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
+		_typeActor->GetTextProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
+		_fillBorderActor->GetProperty()->SetColor(1,.5,.3);
+
+		if(_state==NOTHING_HAPPENS)
+		{
+			_objectBorderActor->GetProperty()->SetLineWidth(1);
+			_objectBorderActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
+			_nameActor->GetTextProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
+			_typeActor->GetTextProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B);
+		}
+		else if(_state==HIGHLIGHTED)
+		{
+			_objectBorderActor->GetProperty()->SetLineWidth(2);
+			_objectBorderActor->GetProperty()->SetColor(BOXCONTOUR_HIGHLIGHTED_R,BOXCONTOUR_HIGHLIGHTED_G,BOXCONTOUR_HIGHLIGHTED_B);
+			_nameActor->GetTextProperty()->SetColor(BOXCONTOUR_HIGHLIGHTED_R,BOXCONTOUR_HIGHLIGHTED_G,BOXCONTOUR_HIGHLIGHTED_B);
+			_typeActor->GetTextProperty()->SetColor(BOXCONTOUR_HIGHLIGHTED_R,BOXCONTOUR_HIGHLIGHTED_G,BOXCONTOUR_HIGHLIGHTED_B);
+		}
+		else if(_state==DRAG)
+		{
+			_objectBorderActor->GetProperty()->SetLineWidth(1.2);
+			_objectBorderActor->GetProperty()->SetColor(BOXCONTOUR_DRAG_R,BOXCONTOUR_DRAG_G,BOXCONTOUR_DRAG_B);
+			_nameActor->GetTextProperty()->SetColor(BOXCONTOUR_DRAG_R,BOXCONTOUR_DRAG_G,BOXCONTOUR_DRAG_B);
+			_typeActor->GetTextProperty()->SetColor(BOXCONTOUR_DRAG_R,BOXCONTOUR_DRAG_G,BOXCONTOUR_DRAG_B);
+		}
+		else if(_state==SELECTED)
+		{
+			_objectBorderActor->GetProperty()->SetLineWidth(2);
+			_objectBorderActor->GetProperty()->SetColor(BOXCONTOUR_SELECTED_R,BOXCONTOUR_SELECTED_G,BOXCONTOUR_SELECTED_B);
+			_nameActor->GetTextProperty()->SetColor(BOXCONTOUR_SELECTED_R,BOXCONTOUR_SELECTED_G,BOXCONTOUR_SELECTED_B);
+			_typeActor->GetTextProperty()->SetColor(BOXCONTOUR_SELECTED_R,BOXCONTOUR_SELECTED_G,BOXCONTOUR_SELECTED_B);
+		}
+	}
+
+	//=========================================================================
 
 }  // EO namespace bbtk