From: vsr Date: Thu, 19 Nov 2009 07:58:03 +0000 (+0000) Subject: Integrate patch from G.David (for VTK > 5.2) X-Git-Tag: V5_1_3~6 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4624268e4a6bc31ad7918a2d84750eab3a29614a;p=modules%2Fsmesh.git Integrate patch from G.David (for VTK > 5.2) --- diff --git a/src/OBJECT/SMESH_Actor.cxx b/src/OBJECT/SMESH_Actor.cxx index 7805e50bb..7a37d6541 100644 --- a/src/OBJECT/SMESH_Actor.cxx +++ b/src/OBJECT/SMESH_Actor.cxx @@ -72,6 +72,11 @@ #include #include +#include +#if !defined(VTK_XVERSION) +#define VTK_XVERSION (VTK_MAJOR_VERSION<<16)+(VTK_MINOR_VERSION<<8)+(VTK_BUILD_VERSION) +#endif + #include "utilities.h" #ifdef _DEBUG_ @@ -399,7 +404,11 @@ SMESH_ActorDef::SMESH_ActorDef() myPtsLabeledDataMapper = vtkLabeledDataMapper::New(); myPtsLabeledDataMapper->SetInput(myPtsSelectVisiblePoints->GetOutput()); - myPtsLabeledDataMapper->SetLabelFormat("%u"); +#if (VTK_XVERSION >= 0x050200) + myPtsLabeledDataMapper->SetLabelFormat("%d"); +#else + myPtsLabeledDataMapper->SetLabelFormat("%g"); +#endif myPtsLabeledDataMapper->SetLabelModeToLabelScalars(); vtkTextProperty* aPtsTextProp = vtkTextProperty::New(); @@ -440,7 +449,11 @@ SMESH_ActorDef::SMESH_ActorDef() myClsLabeledDataMapper = vtkLabeledDataMapper::New(); myClsLabeledDataMapper->SetInput(myClsSelectVisiblePoints->GetOutput()); - myClsLabeledDataMapper->SetLabelFormat("%u"); +#if (VTK_XVERSION >= 0x050200) + myClsLabeledDataMapper->SetLabelFormat("%d"); +#else + myClsLabeledDataMapper->SetLabelFormat("%g"); +#endif myClsLabeledDataMapper->SetLabelModeToLabelScalars(); vtkTextProperty* aClsTextProp = vtkTextProperty::New();