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
Second integration of PV3D viewer:
[modules/gui.git]
/
src
/
SVTK
/
SVTK_AreaPicker.cxx
diff --git
a/src/SVTK/SVTK_AreaPicker.cxx
b/src/SVTK/SVTK_AreaPicker.cxx
index 863568928943ec20d9ba162e76fadd4e1cf0cf81..8e06058400f9724599456ff1b35ba32924480c19 100644
(file)
--- a/
src/SVTK/SVTK_AreaPicker.cxx
+++ b/
src/SVTK/SVTK_AreaPicker.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
14 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 CEA, EDF
, 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
@@
-87,6
+87,7
@@
namespace
}
//----------------------------------------------------------------------------
}
//----------------------------------------------------------------------------
+ /* Unused
void CalculatePickPosition( vtkRenderer *theRenderer, double theSelectionX,
double theSelectionY, double theSelectionZ, double thePickPosition[3] )
{
void CalculatePickPosition( vtkRenderer *theRenderer, double theSelectionX,
double theSelectionY, double theSelectionZ, double thePickPosition[3] )
{
@@
-101,10
+102,10
@@
namespace
}
}
}
}
}
}
+ */
}
vtkStandardNewMacro( SVTK_AreaPicker )
}
vtkStandardNewMacro( SVTK_AreaPicker )
-;
SVTK_AreaPicker::SVTK_AreaPicker()
{
SVTK_AreaPicker::SVTK_AreaPicker()
{
@@
-264,7
+265,7
@@
void SVTK_AreaPicker::SelectVisiblePoints( QVector< QPoint >& thePoints,
double aDX[3];
theRenderer->GetDisplayPoint( aDX );
double aDX[3];
theRenderer->GetDisplayPoint( aDX );
- bool isInSelection;
+ bool isInSelection
= false
;
if ( theMode == RectangleMode ) isInSelection = aDX[0] >= mySelection[0]
&& aDX[0] <= mySelection[2] && aDX[1] >= mySelection[1]
&& aDX[1] <= mySelection[3];
if ( theMode == RectangleMode ) isInSelection = aDX[0] >= mySelection[0]
&& aDX[0] <= mySelection[2] && aDX[1] >= mySelection[1]
&& aDX[1] <= mySelection[3];
@@
-372,7
+373,7
@@
void SVTK_AreaPicker::SelectVisibleCells( QVector< QPoint >& thePoints,
double aDX[3];
theRenderer->GetDisplayPoint( aDX );
double aDX[3];
theRenderer->GetDisplayPoint( aDX );
- bool isInSelection;
+ bool isInSelection
= false
;
if ( theMode == RectangleMode ) isInSelection = aDX[0] >= mySelection[0]
&& aDX[0] <= mySelection[2] && aDX[1] >= mySelection[1]
&& aDX[1] <= mySelection[3];
if ( theMode == RectangleMode ) isInSelection = aDX[0] >= mySelection[0]
&& aDX[0] <= mySelection[2] && aDX[1] >= mySelection[1]
&& aDX[1] <= mySelection[3];