Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
#24666 [CEA][Windows] BLSURPLUGIN compilation issue
[modules/smesh.git]
/
src
/
OBJECT
/
SMESH_NodeLabelActor.cxx
diff --git
a/src/OBJECT/SMESH_NodeLabelActor.cxx
b/src/OBJECT/SMESH_NodeLabelActor.cxx
index ef1ee520fde243e4d3da3e2e8575293272dd76c1..4ac4c90f20faabb31a0df0dd2216adf4653b4274 100644
(file)
--- a/
src/OBJECT/SMESH_NodeLabelActor.cxx
+++ b/
src/OBJECT/SMESH_NodeLabelActor.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
0
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-202
1
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-39,7
+39,7
@@
#include <vtkRenderer.h>
#include <vtkUnstructuredGrid.h>
#include <vtkRenderer.h>
#include <vtkUnstructuredGrid.h>
-vtkStandardNewMacro(SMESH_NodeLabelActor)
;
+vtkStandardNewMacro(SMESH_NodeLabelActor)
/*!
Constructor.
/*!
Constructor.
@@
-61,7
+61,7
@@
SMESH_NodeLabelActor::SMESH_NodeLabelActor()
myPtsLabeledDataMapper = vtkLabeledDataMapper::New();
myPtsLabeledDataMapper->SetInputConnection(myPtsSelectVisiblePoints->GetOutputPort());
myPtsLabeledDataMapper = vtkLabeledDataMapper::New();
myPtsLabeledDataMapper->SetInputConnection(myPtsSelectVisiblePoints->GetOutputPort());
- myPtsLabeledDataMapper->SetLabelFormat("%d");
+
//
myPtsLabeledDataMapper->SetLabelFormat("%d");
myPtsLabeledDataMapper->SetLabelModeToLabelScalars();
myPtsTextProp = vtkTextProperty::New();
myPtsLabeledDataMapper->SetLabelModeToLabelScalars();
myPtsTextProp = vtkTextProperty::New();
@@
-145,18
+145,18
@@
void SMESH_NodeLabelActor::SetPointsLabeled(bool theIsPointsLabeled)
{
myPointsNumDataSet->ShallowCopy(aGrid);
vtkUnstructuredGrid *aDataSet = myPointsNumDataSet;
{
myPointsNumDataSet->ShallowCopy(aGrid);
vtkUnstructuredGrid *aDataSet = myPointsNumDataSet;
-
-
int
aNbElem = aDataSet->GetNumberOfPoints();
-
- vtkI
ntArray *anArray = vtkInt
Array::New();
+
+
vtkIdType
aNbElem = aDataSet->GetNumberOfPoints();
+
+ vtkI
dTypeArray *anArray = vtkIdType
Array::New();
anArray->SetNumberOfValues( aNbElem );
anArray->SetNumberOfValues( aNbElem );
-
+
for ( vtkIdType anId = 0; anId < aNbElem; anId++ )
{
for ( vtkIdType anId = 0; anId < aNbElem; anId++ )
{
-
int
aSMDSId = myVisualObj->GetNodeObjId( anId );
+
vtkIdType
aSMDSId = myVisualObj->GetNodeObjId( anId );
anArray->SetValue( anId, aSMDSId );
}
anArray->SetValue( anId, aSMDSId );
}
-
+
aDataSet->GetPointData()->SetScalars( anArray );
myPtsMaskPoints->SetInputData( aDataSet );
myPointLabels->SetVisibility( GetVisibility() );
aDataSet->GetPointData()->SetScalars( anArray );
myPtsMaskPoints->SetInputData( aDataSet );
myPointLabels->SetVisibility( GetVisibility() );
@@
-195,7
+195,7
@@
void SMESH_NodeLabelActor::UpdateLabels()
void SMESH_NodeLabelActor::ProcessEvents(vtkObject* vtkNotUsed(theObject),
void SMESH_NodeLabelActor::ProcessEvents(vtkObject* vtkNotUsed(theObject),
- unsigned long
theEvent
,
+ unsigned long
/*theEvent*/
,
void* theClientData,
void* vtkNotUsed(theCallData))
{
void* theClientData,
void* vtkNotUsed(theCallData))
{