From 5b9b2e13891836ec50b96fc57b56506a6b1087e7 Mon Sep 17 00:00:00 2001 From: ouv Date: Wed, 28 Sep 2005 14:23:52 +0000 Subject: [PATCH] ImageData added to VISU_OutsideCursorSettings --- src/OBJECT/VISU_GaussPtsAct.cxx | 8 ++++---- src/OBJECT/VISU_GaussPtsAct.h | 24 +++++++++++++----------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/OBJECT/VISU_GaussPtsAct.cxx b/src/OBJECT/VISU_GaussPtsAct.cxx index c986c59f..cca667be 100644 --- 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 9898a1ca..7839f05c 100644 --- 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]; }; //---------------------------------------------------------------------------- -- 2.39.2