X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsVtkGUIEditorGraphic%2FvtkGBlackBoxView.cxx;h=36800fbc11e7d5f6af3d2a72f54ae434efebae1c;hb=d209561c0b0ab22fd5b060dc0529c9a316b504d9;hp=c5effa8ab9a3b4dbbf094f664622440b7205f7be;hpb=511369e67cf26244fc8768a727a03f42ff42865f;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
index c5effa8..36800fb 100644
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
@@ -85,7 +85,9 @@ namespace bbtk
 
 		double xFin1,xFin2,xFin3;
 		// position referens from box name
-		xFin1 = xInic+(bounds[1]-bounds[0])/2 + 20;
+//EED 2020-01-15
+//        xFin1 = xInic+(bounds[1]-bounds[0])/2 + 20;
+		xFin1 = xInic+(bounds[1]-bounds[0])/10 + 20;
         xFin2=xFin1;
         xFin3=xFin1;
         // position referens from input ports
@@ -183,7 +185,16 @@ namespace bbtk
 		strip->InsertCellPoint(3);
 		pdFill->SetPoints( _pts );
 		pdFill->SetStrips( strip );
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		_fillPolyMapper->SetInput(pdFill);
+#else
+		_fillPolyMapper->SetInputData(pdFill);
+#endif
+
+
 		_fillObjectActor->SetMapper(_fillPolyMapper);
 		_fillPolyMapper->Modified();
 		///************************* FILL *************************
@@ -196,17 +207,17 @@ namespace bbtk
 
 		//------------
 
+//        _boxTextActor            = vtkTextActor::New();  // for actor 2D
 		_boxTextActor			= vtkTextActor3D::New();
 		vtkTextProperty *prop 	=  vtkTextProperty::New();
 		prop->BoldOn();
 		prop->SetFontFamilyToArial();
-		_boxTextActor->GetTextProperty()->BoldOn();
-		prop->SetFontSize(80);
+        prop->ShadowOff();
+//EED 2020-01-15
+//		prop->SetFontSize(80);
+//        prop->SetFontSize(15);
+        prop->SetFontSize(40);
 		_boxTextActor->SetTextProperty(prop);
-	
-	//	_boxTextActor->GetTextProperty()->SetFontSize(80);
-		
-
 		//------------
 
 		updatePositionTextActor( xInic,  yInic,  zInic);
@@ -240,7 +251,10 @@ namespace bbtk
 		temp+=":";
 		temp+=_model->getBBTKName();
 		_boxTextActor->SetInput(temp.c_str());
-		_boxTextActor->SetPosition(xInic+4,yInic-7,zInic+1);
+//        _boxTextActor->SetPosition(xInic+4,yInic-7);  // for actor 2D
+//EED 2020-01-15
+//		_boxTextActor->SetPosition(xInic+4,yInic-7,zInic+1);
+        _boxTextActor->SetPosition(xInic+1.1,yInic-BOX_HEIGHT,zInic+1);
 		_boxTextActor->SetScale(0.05,0.05,1);
 	}