ImageData added to VISU_OutsideCursorSettings

diff --git a/src/OBJECT/VISU_GaussPtsAct.cxx b/src/OBJECT/VISU_GaussPtsAct.cxx
index c986c59f26ba7388c572471672efa47663298296..cca667be53cd5d79abd4ab6fdb4919efd1126430 100644 (file)
--- a/src/OBJECT/VISU_GaussPtsAct.cxx
+++ b/src/OBJECT/VISU_GaussPtsAct.cxx
@@ -86,14 +86,14 @@ vtkStandardNewMacro( VISU_OutsideCursorSettings );
 //----------------------------------------------------------------
 VISU_OutsideCursorSettings::VISU_OutsideCursorSettings()
 {
-  this->MainTexture = NULL;
-  this->AlphaTexture = NULL;
+  this->Initial = true;
+
+  this->Texture = NULL;
 }
 
 VISU_OutsideCursorSettings::~VISU_OutsideCursorSettings()
 {
-  this->SetMainTexture( NULL );
-  this->SetAlphaTexture( NULL );
+  this->SetTexture( NULL );
 }
 
 //============================================================================

diff --git a/src/OBJECT/VISU_GaussPtsAct.h b/src/OBJECT/VISU_GaussPtsAct.h
index 9898a1ca4c8eda36684c6ad45690d4e0eedeaa3c..7839f05c1f974256d0bc74da65901e4baa2e5914 100644 (file)
--- a/src/OBJECT/VISU_GaussPtsAct.h
+++ b/src/OBJECT/VISU_GaussPtsAct.h
@@ -44,6 +44,7 @@ class vtkTextActor;
 class vtkSphereSource;
 class vtkPolyDataMapper;
 class vtkActor;
+class vtkImageData;
 class vtkInteractorStyle;
 
 class VISU_GaussPtsDeviceActor;
@@ -68,14 +69,14 @@ class VTKOCC_EXPORT VISU_OutsideCursorSettings : public vtkObject
   VISU_OutsideCursorSettings*
   New();
 
+  vtkSetMacro( Initial, bool );
+  vtkGetMacro( Initial, bool );
+
   vtkSetMacro( Clamp, float );
   vtkGetMacro( Clamp, float );
 
-  vtkSetStringMacro( MainTexture );
-  vtkGetStringMacro( MainTexture );
-
-  vtkSetStringMacro( AlphaTexture );
-  vtkGetStringMacro( AlphaTexture );
+  vtkSetMacro( Texture, vtkImageData* );
+  vtkGetMacro( Texture, vtkImageData* );
 
   vtkSetMacro( AlphaThreshold, float );
   vtkGetMacro( AlphaThreshold, float );
@@ -87,12 +88,13 @@ class VTKOCC_EXPORT VISU_OutsideCursorSettings : public vtkObject
   vtkGetVector3Macro( Color, float );
 
 private:
-  float       Clamp;
-  char*       MainTexture;
-  char*       AlphaTexture;
-  float       AlphaThreshold;
-  float       Size;
-  float       Color[3];
+  bool                Initial;
+
+  float               Clamp;
+  vtkImageData*       Texture;
+  float               AlphaThreshold;
+  float               Size;
+  float               Color[3];
 };
 
 //----------------------------------------------------------------------------