Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.salome-platform.org/modules/hydro
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_VTKPrsDisplayer.h
diff --git
a/src/HYDROGUI/HYDROGUI_VTKPrsDisplayer.h
b/src/HYDROGUI/HYDROGUI_VTKPrsDisplayer.h
index 7a47a6f8402f51b288d6fe8357d4ae43352a33f1..54ea195202c364380d0dfcb9c2babf0175147845 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_VTKPrsDisplayer.h
+++ b/
src/HYDROGUI/HYDROGUI_VTKPrsDisplayer.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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
@@
-75,9
+75,14
@@
public:
* \brief Delete scalar bar for the given viewer id.
* \param theViewerId viewer identifier
*/
* \brief Delete scalar bar for the given viewer id.
* \param theViewerId viewer identifier
*/
- void
DeleteScalarBar( const int theViewerId
);
+ void
EraseScalarBar( const int theViewerId, const bool theIsDelete = false
);
protected:
protected:
+
+ virtual void DisplayAll( const int theViewerId,
+ const bool theIsForced,
+ const bool theDoFitAll );
+
/**
* \brief Erase all viewer objects.
* \param theViewerId viewer identifier
/**
* \brief Erase all viewer objects.
* \param theViewerId viewer identifier
@@
-126,8
+131,9
@@
private:
HYDROGUI_VTKPrsDriver* getDriver( const int theViewId, const Handle(HYDROData_Entity)& theObj );
HYDROGUI_VTKPrsDriver* myDriver;
HYDROGUI_VTKPrsDriver* getDriver( const int theViewId, const Handle(HYDROData_Entity)& theObj );
HYDROGUI_VTKPrsDriver* myDriver;
+ HYDROGUI_VTKPrsDriver* myShapeDriver;
- QMap<int, vtkSmartPointer<vtkScalarBarActor>> myScalarBars; //!< Colors legend presentations
+ QMap<int, vtkSmartPointer<vtkScalarBarActor>
> myScalarBars; //!< Colors legend presentations
};
#endif
};
#endif