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
Regression: mesh objects are not deleted => memory leaks
[modules/smesh.git]
/
src
/
OBJECT
/
SMESH_ScalarBarActor.h
diff --git
a/src/OBJECT/SMESH_ScalarBarActor.h
b/src/OBJECT/SMESH_ScalarBarActor.h
index 6bcd2fb5a1097d1c8b7215d05b674c23a0e63e01..c5e721b2374fe5cb47bc942fcb2a44eae628f2a0 100644
(file)
--- a/
src/OBJECT/SMESH_ScalarBarActor.h
+++ b/
src/OBJECT/SMESH_ScalarBarActor.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
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
@@
-122,7
+122,7
@@
class SMESHOBJECT_EXPORT SMESH_ScalarBarActor: public vtkActor2D {
// Set/Get the maximum number of scalar bar segments to show. This may
// differ from the number of colors in the lookup table, in which case
// the colors are samples from the lookup table.
// Set/Get the maximum number of scalar bar segments to show. This may
// differ from the number of colors in the lookup table, in which case
// the colors are samples from the lookup table.
- vtkSetClampMacro(MaximumNumberOfColors, int, 2, VTK_
LARGE_INTEGER
);
+ vtkSetClampMacro(MaximumNumberOfColors, int, 2, VTK_
INT_MAX
);
vtkGetMacro(MaximumNumberOfColors, int);
// Description:
vtkGetMacro(MaximumNumberOfColors, int);
// Description:
@@
-174,7
+174,7
@@
class SMESHOBJECT_EXPORT SMESH_ScalarBarActor: public vtkActor2D {
virtual int GetDistributionVisibility();
// Description:
// Set distribution
virtual int GetDistributionVisibility();
// Description:
// Set distribution
- virtual void SetDistribution(
std::vector<int>
theNbValues);
+ virtual void SetDistribution(
const std::vector<int>&
theNbValues);
// Description:
// Set distribution coloring type (SMESH_MONOCOLOR_TYPE or SMESH_MULTICOLOR_TYPE)
// Description:
// Set distribution coloring type (SMESH_MONOCOLOR_TYPE or SMESH_MULTICOLOR_TYPE)
@@
-192,7
+192,13
@@
class SMESHOBJECT_EXPORT SMESH_ScalarBarActor: public vtkActor2D {
// Get Distribution Color
void GetDistributionColor (double rgb[3]);
// Get Distribution Color
void GetDistributionColor (double rgb[3]);
+ // Description:
+ // Set visibility status of scalar map
+ void SetTitleOnlyVisibility( bool );
+ // Description:
+ // Get visibility status of scalar map
+ bool GetTitleOnlyVisibility();
protected:
SMESH_ScalarBarActor();
protected:
SMESH_ScalarBarActor();
@@
-237,6
+243,7
@@
class SMESHOBJECT_EXPORT SMESH_ScalarBarActor: public vtkActor2D {
vtkPolyDataMapper2D* myDistributionMapper; //Distribution mapper
std::vector<int> myNbValues; //Nb values for the range
int myDistributionColoringType; //Distribution color type (monocolor or multicolor)
vtkPolyDataMapper2D* myDistributionMapper; //Distribution mapper
std::vector<int> myNbValues; //Nb values for the range
int myDistributionColoringType; //Distribution color type (monocolor or multicolor)
+ bool myTitleOnlyVisibility; //Show scalar map or not
private:
SMESH_ScalarBarActor(const SMESH_ScalarBarActor&); // Not implemented.
private:
SMESH_ScalarBarActor(const SMESH_ScalarBarActor&); // Not implemented.