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
Fix regression of SALOME_TESTS/Grids/smesh/3D_mesh_Extrusion_01/B2
[modules/smesh.git]
/
src
/
OBJECT
/
SMESH_CellLabelActor.h
diff --git
a/src/OBJECT/SMESH_CellLabelActor.h
b/src/OBJECT/SMESH_CellLabelActor.h
index 988a0dcaf8cb2994ee4544a4e227d3aa6719f9dd..a1d4c82b45ad45081b7a75e41b1a737d901e12d0 100644
(file)
--- a/
src/OBJECT/SMESH_CellLabelActor.h
+++ b/
src/OBJECT/SMESH_CellLabelActor.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-27,12
+27,14
@@
#define SMESH_CELL_LABEL_ACTOR_H
#include "SMESH_DeviceActor.h"
#define SMESH_CELL_LABEL_ACTOR_H
#include "SMESH_DeviceActor.h"
+#include "SMESH_ActorUtils.h"
class vtkSelectVisiblePoints;
class vtkLabeledDataMapper;
class vtkActor2D;
class vtkMaskPoints;
class vtkUnstructuredGrid;
class vtkSelectVisiblePoints;
class vtkLabeledDataMapper;
class vtkActor2D;
class vtkMaskPoints;
class vtkUnstructuredGrid;
+class vtkTextProperty;
class VTKViewer_CellCenters;
class VTKViewer_CellCenters;
@@
-42,9
+44,9
@@
public:
static SMESH_CellLabelActor* New();
static void ProcessEvents(vtkObject* theObject,
static SMESH_CellLabelActor* New();
static void ProcessEvents(vtkObject* theObject,
- unsigned long theEvent,
- void* theClientData,
- void* theCallData);
+
unsigned long theEvent,
+
void* theClientData,
+
void* theCallData);
vtkTypeMacro(SMESH_CellLabelActor, SMESH_DeviceActor);
vtkTypeMacro(SMESH_CellLabelActor, SMESH_DeviceActor);
@@
-57,6
+59,10
@@
public:
virtual void AddToRender(vtkRenderer* theRenderer);
virtual void RemoveFromRender(vtkRenderer* theRenderer);
virtual void AddToRender(vtkRenderer* theRenderer);
virtual void RemoveFromRender(vtkRenderer* theRenderer);
+
+ virtual void SetFontProperties( SMESH::LabelFont family, int size,
+ bool bold, bool italic, bool shadow,
+ double r, double g, double b );
void UpdateLabels();
void UpdateLabels();
@@
-72,6
+78,7
@@
protected:
vtkLabeledDataMapper* myClsLabeledDataMapper;
vtkSelectVisiblePoints* myClsSelectVisiblePoints;
SMESH_DeviceActor* myBaseActor; //Pointer to the base actor
vtkLabeledDataMapper* myClsLabeledDataMapper;
vtkSelectVisiblePoints* myClsSelectVisiblePoints;
SMESH_DeviceActor* myBaseActor; //Pointer to the base actor
+ vtkTextProperty* myClsTextProp;
protected:
// Not implemented.
protected:
// Not implemented.