X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsVtkGUIEditorGraphic%2FvtkGBlackBoxView.cxx;h=5d82cbf19a48b491aae8faeab9712de99b0241e4;hb=f99b8e7dd7cede66856ede057976906de775dccc;hp=0eec429fa6f1b4438bee7883163b39c107f79d34;hpb=fea0c6ff7e209a7bb61bcc8176742e5f1a609443;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
index 0eec429..5d82cbf 100644
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
@@ -1,3 +1,28 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------  
+*/
+
 /*=========================================================================
 Program:   bbtk
 Module:    $RCSfile$
@@ -98,7 +123,7 @@ namespace bbtk
         update_X_Fin();
 		_model->getFinalPoint(xFin, yFin,zFin);
 
-		// RaC In the actual version, zInic=zFin=900
+		// RaC In the actual version, zInic=zFin=GPOSITION_Z
 
 		_pts->SetPoint(0, xInic, yInic, zInic );
 		_pts->SetPoint(1, xInic, yFin, zInic );
@@ -133,7 +158,7 @@ namespace bbtk
 		_model->getInicPoint(xInic,yInic,zInic);
 		_model->getFinalPoint(xFin, yFin,zFin);
 
-		// RaC In the actual version, zInic=zFin=900
+		// RaC In the actual version, zInic=zFin=GPOSITION_Z
 
 //EED		_pts->SetPoint(0, xInic, yInic, zInic );
 //EED		_pts->SetPoint(1, xInic, yFin, zInic );
@@ -169,7 +194,7 @@ namespace bbtk
 		_fillPolyMapper		= vtkPolyDataMapper::New();
 		_fillObjectActor	= vtkActor::New();
 
-		// RaC In the actual version, zInic=zFin=900
+		// RaC In the actual version, zInic=zFin=GPOSITION_Z
 
 		strip->InsertNextCell(5);
 		strip->InsertCellPoint(0);
@@ -193,10 +218,12 @@ namespace bbtk
 		vtkTextProperty *prop =  vtkTextProperty::New();
 		prop->BoldOn();
 		prop->SetFontFamilyToArial();
-		prop->SetFontSize(100);
+		_boxTextActor->GetTextProperty()->BoldOn();
+		prop->SetFontSize(80);
 		_boxTextActor->SetTextProperty(prop);
-		//_boxTextActor->GetTextProperty()->SetFontSize(80);
-		//_boxTextActor->GetTextProperty()->BoldOn();
+	
+	//	_boxTextActor->GetTextProperty()->SetFontSize(80);
+		
 
 		//------------
 
@@ -207,9 +234,10 @@ namespace bbtk
 
 	void vtkGBlackBoxView::addVtkActors()//virtual
 	{
+		
 		_baseView->GetRenderer()->AddActor(_borderObjectActor);
-		_baseView->GetRenderer()->AddActor(_boxTextActor);
 		vtkGObjectView::addVtkActors();
+		_baseView->GetRenderer()->AddActor(_boxTextActor);
 	}
 
 	//=========================================================================
@@ -229,7 +257,7 @@ namespace bbtk
 		temp+=":";
 		temp+=_model->getBBTKName();
 		_boxTextActor->SetInput(temp.c_str());
-		_boxTextActor->SetPosition(xInic+4,yInic-7,zInic);
+		_boxTextActor->SetPosition(xInic+4,yInic-7,zInic+1);
 		_boxTextActor->SetScale(0.05,0.05,1);
 	}