X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSVTK%2FSVTK_DeviceActor.h;h=95c13743f0472200d1e077059616564b5e34b4de;hb=refs%2Fheads%2Fngr%2Fpython3_dev_pv5.4;hp=12d10220fcda2fbc2cec31959e1384e59d479948;hpb=e07448c48ea5b2127e34fc7b8c3427d01c7ce17b;p=modules%2Fgui.git

diff --git a/src/SVTK/SVTK_DeviceActor.h b/src/SVTK/SVTK_DeviceActor.h
index 12d10220f..95c13743f 100644
--- a/src/SVTK/SVTK_DeviceActor.h
+++ b/src/SVTK/SVTK_DeviceActor.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -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
-// 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
@@ -47,6 +47,7 @@ class vtkShrinkFilter;
 class vtkFeatureEdges;
 class VTKViewer_DataSetMapper;
 class vtkPassThroughFilter;
+class vtkAlgorithmOutput;
 
 #ifdef WIN32
 #pragma warning ( disable:4251 )
@@ -79,7 +80,12 @@ class SVTK_EXPORT SVTK_DeviceActor: public vtkLODActor
   //! Allows to set initial #vtkDataSet
   virtual
   void
-  SetInput(vtkDataSet* theDataSet); 
+  SetInputData(vtkDataSet* theDataSet); 
+
+  //! Allows to set initial #vtkAlgorithmOutput
+  virtual
+  void
+  SetInputConnection(vtkAlgorithmOutput* theAlgorithmOutput); 
 
   /** @name For selection mapping purpose */
   //@{
@@ -88,7 +94,7 @@ class SVTK_EXPORT SVTK_DeviceActor: public vtkLODActor
   GetNodeObjId(int theVtkID);
 
   virtual
-  vtkFloatingPointType* 
+  double* 
   GetNodeCoord(int theObjID);
 
   virtual
@@ -106,17 +112,17 @@ class SVTK_EXPORT SVTK_DeviceActor: public vtkLODActor
   //@}
 
   virtual 
-  unsigned long int 
+  vtkMTimeType
   GetMTime();
 
   /** @name For shrink mamnagement purpose */
   //@{
-  vtkFloatingPointType
+  double
   GetShrinkFactor();
 
   virtual 
   void  
-  SetShrinkFactor(vtkFloatingPointType value);
+  SetShrinkFactor(double value);
 
   virtual
   void
@@ -156,12 +162,12 @@ class SVTK_EXPORT SVTK_DeviceActor: public vtkLODActor
   SetFeatureEdgesEnabled(bool theIsFeatureEdgesEnabled);
 
   virtual
-  vtkFloatingPointType
+  double
   GetFeatureEdgesAngle();
 
   virtual
   void
-  SetFeatureEdgesAngle(vtkFloatingPointType theAngle); 
+  SetFeatureEdgesAngle(double theAngle); 
 
   virtual
   void
@@ -194,11 +200,11 @@ class SVTK_EXPORT SVTK_DeviceActor: public vtkLODActor
   GetRepresentation();
 
   virtual
-  vtkFloatingPointType
+  double
   GetDefaultPointSize();
 
   virtual
-  vtkFloatingPointType
+  double
   GetDefaultLineWidth();
 
   bool
@@ -208,10 +214,17 @@ class SVTK_EXPORT SVTK_DeviceActor: public vtkLODActor
   SetShaded(bool theShaded);
   //@}
 
+  /** @name For ball marker management purpose */
+  void 
+  SetBallEnabled( bool );
+
   /** @name For marker management purpose */
   void
   SetMarkerEnabled( bool );
 
+  void
+  SetBallScale( double );
+
   void
   SetMarkerStd( VTK::MarkerType, VTK::MarkerScale );
 
@@ -239,8 +252,8 @@ class SVTK_EXPORT SVTK_DeviceActor: public vtkLODActor
   virtual void SetQuadraticArcMode(bool theFlag);
   virtual bool GetQuadraticArcMode();
 
-  virtual void SetQuadraticArcAngle(vtkFloatingPointType theMaxAngle);
-  virtual vtkFloatingPointType GetQuadraticArcAngle();
+  virtual void SetQuadraticArcAngle(double theMaxAngle);
+  virtual double GetQuadraticArcAngle();
 
   virtual
   void
@@ -249,6 +262,10 @@ class SVTK_EXPORT SVTK_DeviceActor: public vtkLODActor
   virtual
   bool 
   IsCoincident3DAllowed() const;
+  
+  void
+  SetResolveCoincidentTopology(bool theIsResolve);
+    
 
 
  protected:
@@ -274,13 +291,13 @@ class SVTK_EXPORT SVTK_DeviceActor: public vtkLODActor
   bool myIsFeatureEdgesEnabled;
 
   bool myIsResolveCoincidentTopology;
-  vtkFloatingPointType myPolygonOffsetFactor;
-  vtkFloatingPointType myPolygonOffsetUnits;
+  double myPolygonOffsetFactor;
+  double myPolygonOffsetUnits;
 
-  void SetPolygonOffsetParameters(vtkFloatingPointType factor, 
-                                  vtkFloatingPointType units);
-  void GetPolygonOffsetParameters(vtkFloatingPointType& factor, 
-                                  vtkFloatingPointType& units);
+  void SetPolygonOffsetParameters(double factor, 
+                                  double units);
+  void GetPolygonOffsetParameters(double& factor, 
+                                  double& units);
 
   SVTK_DeviceActor();
   ~SVTK_DeviceActor();