Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to paraview 5.4
[modules/gui.git]
/
src
/
SVTK
/
SVTK_CubeAxesActor2D.cxx
diff --git
a/src/SVTK/SVTK_CubeAxesActor2D.cxx
b/src/SVTK/SVTK_CubeAxesActor2D.cxx
index 405bf9cd55289af22f45a1b5f41f153273ba79d1..8636ddb00cacc3d7c961c43b90acbb1b193da127 100644
(file)
--- a/
src/SVTK/SVTK_CubeAxesActor2D.cxx
+++ b/
src/SVTK/SVTK_CubeAxesActor2D.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
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
@@
-286,7
+286,7
@@
int SVTK_CubeAxesActor2D::RenderOpaqueGeometry(vtkViewport *viewport)
if ( this->FlyMode == VTK_FLY_CLOSEST_TRIAD )
{
// Loop over points and find the closest point to the camera
if ( this->FlyMode == VTK_FLY_CLOSEST_TRIAD )
{
// Loop over points and find the closest point to the camera
- min = VTK_
LARGE_FLOAT
;
+ min = VTK_
FLOAT_MAX
;
for (i=0; i < 8; i++)
{
if ( pts[i][2] < min )
for (i=0; i < 8; i++)
{
if ( pts[i][2] < min )
@@
-310,7
+310,7
@@
int SVTK_CubeAxesActor2D::RenderOpaqueGeometry(vtkViewport *viewport)
double e1[2], e2[2], e3[2];
// Find distance to origin
double e1[2], e2[2], e3[2];
// Find distance to origin
- d2Min = VTK_
LARGE_FLOAT
;
+ d2Min = VTK_
FLOAT_MAX
;
for (i=0; i < 8; i++)
{
d2 = pts[i][0]*pts[i][0] + pts[i][1]*pts[i][1];
for (i=0; i < 8; i++)
{
d2 = pts[i][0]*pts[i][0] + pts[i][1]*pts[i][1];
@@
-323,7
+323,7
@@
int SVTK_CubeAxesActor2D::RenderOpaqueGeometry(vtkViewport *viewport)
// find minimum slope point connected to closest point and on
// right side (in projected coordinates). This is the first edge.
// find minimum slope point connected to closest point and on
// right side (in projected coordinates). This is the first edge.
- minSlope = VTK_
LARGE_FLOAT
;
+ minSlope = VTK_
FLOAT_MAX
;
for (xIdx=0, i=0; i<3; i++)
{
num = (pts[Conn[idx][i]][1] - pts[idx][1]);
for (xIdx=0, i=0; i<3; i++)
{
num = (pts[Conn[idx][i]][1] - pts[idx][1]);