Salome HOME
projects
/
modules
/
visu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Join modifications from branch OCC_debug_for_3_2_0b1
[modules/visu.git]
/
src
/
VISU_I
/
VISU_Prs3d_i.hh
diff --git
a/src/VISU_I/VISU_Prs3d_i.hh
b/src/VISU_I/VISU_Prs3d_i.hh
index efdd55565bbb61f4428683202ad045c6bb29e1cc..0a151cb9239f63373427c3b071a3247e4228dc2b 100644
(file)
--- a/
src/VISU_I/VISU_Prs3d_i.hh
+++ b/
src/VISU_I/VISU_Prs3d_i.hh
@@
-35,7
+35,8
@@
#include "SALOME_GenericObj_i.hh"
#include "SALOME_InteractiveObject.hxx"
#include "SALOME_GenericObj_i.hh"
#include "SALOME_InteractiveObject.hxx"
-#include <boost/signals/signal0.hpp>
+#include "VTKViewer.h"
+
#include <vtkSmartPointer.h>
class VISU_PipeLine;
#include <vtkSmartPointer.h>
class VISU_PipeLine;
@@
-185,25
+186,31
@@
namespace VISU
GetClippingPlane(vtkIdType theID) const;
void
GetClippingPlane(vtkIdType theID) const;
void
- SetPlaneParam(float theDir[3], float theDist, vtkPlane* thePlane);
+ SetPlaneParam(vtkFloatingPointType theDir[3],
+ vtkFloatingPointType theDist,
+ vtkPlane* thePlane);
//----------------------------------------------------------------------------
void
//----------------------------------------------------------------------------
void
- GetBounds(
float
aBounds[6]);
+ GetBounds(
vtkFloatingPointType
aBounds[6]);
void
void
- SetOffset(const
f
loat* theOffsets);
+ SetOffset(const
CORBA::F
loat* theOffsets);
virtual
void
virtual
void
- SetOffset(float theDx, float theDy, float theDz);
+ SetOffset(CORBA::Float theDx,
+ CORBA::Float theDy,
+ CORBA::Float theDz);
void
void
- GetOffset(
f
loat* theOffsets);
+ GetOffset(
CORBA::F
loat* theOffsets);
virtual
void
virtual
void
- GetOffset(float& theDx, float& theDy, float& theDz);
+ GetOffset(CORBA::Float& theDx,
+ CORBA::Float& theDy,
+ CORBA::Float& theDz);
//----------------------------------------------------------------------------
protected:
//----------------------------------------------------------------------------
protected:
@@
-221,7
+228,7
@@
namespace VISU
CheckDataSet();
bool myAddToStudy;
CheckDataSet();
bool myAddToStudy;
-
f
loat myOffset[3];
+
CORBA::F
loat myOffset[3];
Result_i *myResult;
VISU_PipeLine *myPipeLine;
SALOMEDS::SObject_var mySObject;
Result_i *myResult;
VISU_PipeLine *myPipeLine;
SALOMEDS::SObject_var mySObject;