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
Merge branch 'V8_2_BR' into pre/V8_2_BR
[modules/smesh.git]
/
src
/
OBJECT
/
SMESH_DeviceActor.h
diff --git
a/src/OBJECT/SMESH_DeviceActor.h
b/src/OBJECT/SMESH_DeviceActor.h
index a7c4dcb4898b0765f876cfdbbc7e7acd46c65fcf..1b8ceb48ebe216b8bca4876a5c0628dd8e6fae6c 100644
(file)
--- a/
src/OBJECT/SMESH_DeviceActor.h
+++ b/
src/OBJECT/SMESH_DeviceActor.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
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
@@
-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,7
+75,7
@@
class SMESHOBJECT_EXPORT SMESH_DeviceActor: public vtkLODActor{
virtual vtkCell* GetElemCell(int theObjID);
virtual void SetTransform(VTKViewer_Transform* theTransform);
virtual vtkCell* GetElemCell(int theObjID);
virtual void SetTransform(VTKViewer_Transform* theTransform);
- virtual
unsigned long int
GetMTime();
+ virtual
vtkMTimeType
GetMTime();
virtual void SetFacesOriented(bool theIsFacesOriented);
virtual bool GetFacesOriented() { return myIsFacesOriented; }
virtual void SetFacesOriented(bool theIsFacesOriented);
virtual bool GetFacesOriented() { return myIsFacesOriented; }
@@
-148,11
+148,13
@@
class SMESHOBJECT_EXPORT SMESH_DeviceActor: public vtkLODActor{
void SetMarkerEnabled( bool );
void SetBallEnabled( bool );
void SetMarkerEnabled( bool );
void SetBallEnabled( bool );
+ void SetBallScale( double );
void SetMarkerStd( VTK::MarkerType, VTK::MarkerScale );
void SetMarkerTexture( int, VTK::MarkerTexture );
VTK::MarkerType GetMarkerType();
VTK::MarkerScale GetMarkerScale();
int GetMarkerTexture();
void SetMarkerStd( VTK::MarkerType, VTK::MarkerScale );
void SetMarkerTexture( int, VTK::MarkerTexture );
VTK::MarkerType GetMarkerType();
VTK::MarkerScale GetMarkerScale();
int GetMarkerTexture();
+ double GetBallScale();
protected:
void Init(TVisualObjPtr theVisualObj, vtkImplicitBoolean* theImplicitBoolean);
protected:
void Init(TVisualObjPtr theVisualObj, vtkImplicitBoolean* theImplicitBoolean);