From f853163cc543caee35c97454c476617479aff0d6 Mon Sep 17 00:00:00 2001 From: apo Date: Wed, 5 Oct 2005 14:29:34 +0000 Subject: [PATCH] To separate GaussPoints Actor and Setting interafaces --- src/OBJECT/Makefile.in | 1 + src/OBJECT/VISU_GaussPtsAct.cxx | 1 + src/OBJECT/VISU_GaussPtsAct.h | 96 +---------------- src/OBJECT/VISU_GaussPtsSettings.h | 130 ++++++++++++++++++++++++ src/VVTK/VVTK_PickingDlg.cxx | 1 + src/VVTK/VVTK_SegmentationCursorDlg.cxx | 1 + 6 files changed, 137 insertions(+), 93 deletions(-) create mode 100644 src/OBJECT/VISU_GaussPtsSettings.h diff --git a/src/OBJECT/Makefile.in b/src/OBJECT/Makefile.in index 3e35e780..710dd7db 100644 --- a/src/OBJECT/Makefile.in +++ b/src/OBJECT/Makefile.in @@ -34,6 +34,7 @@ VPATH=.:@srcdir@:@top_srcdir@/idl EXPORT_HEADERS = \ VISU_ActorFactory.h \ + VISU_GaussPtsSettings.h \ VISU_GaussPtsActorFactory.h \ VISU_Actor.h \ VISU_MeshAct.h \ diff --git a/src/OBJECT/VISU_GaussPtsAct.cxx b/src/OBJECT/VISU_GaussPtsAct.cxx index 2abca41b..8f4d9134 100644 --- a/src/OBJECT/VISU_GaussPtsAct.cxx +++ b/src/OBJECT/VISU_GaussPtsAct.cxx @@ -28,6 +28,7 @@ #include "VISU_GaussPtsAct.h" #include "VISU_GaussPointsPL.hxx" +#include "VISU_GaussPtsSettings.h" #include "VISU_GaussPtsDeviceActor.h" #include "VISU_ImplicitFunctionWidget.h" #include "VISU_OpenGLPointSpriteMapper.hxx" diff --git a/src/OBJECT/VISU_GaussPtsAct.h b/src/OBJECT/VISU_GaussPtsAct.h index 3e6c6aac..ff0e7bff 100644 --- a/src/OBJECT/VISU_GaussPtsAct.h +++ b/src/OBJECT/VISU_GaussPtsAct.h @@ -57,100 +57,10 @@ class vtkDataSetMapper; class vtkInteractorObserver; class vtkCallbackCommand; -class VISU_ScalarBarCtrl; - - -//============================================================================ -namespace VISU -{ - const vtkIdType UpdateOutsideSettingsEvent = vtkCommand::UserEvent + 100; - const vtkIdType UpdatePickingSettingsEvent = vtkCommand::UserEvent + 101; -} - -class VTKOCC_EXPORT VISU_OutsideCursorSettings : public vtkObject -{ - public: - vtkTypeMacro( VISU_OutsideCursorSettings, vtkObject ); - - VISU_OutsideCursorSettings(); - virtual ~VISU_OutsideCursorSettings(); - - static - VISU_OutsideCursorSettings* - New(); - - vtkSetMacro( Initial, bool ); - vtkGetMacro( Initial, bool ); - - vtkSetMacro( Clamp, float ); - vtkGetMacro( Clamp, float ); - - vtkSetMacro( Texture, vtkImageData* ); - vtkGetMacro( Texture, vtkImageData* ); - - vtkSetMacro( AlphaThreshold, float ); - vtkGetMacro( AlphaThreshold, float ); - - vtkSetMacro( Size, float ); - vtkGetMacro( Size, float ); - - vtkSetVector3Macro( Color, float ); - vtkGetVector3Macro( Color, float ); - -private: - bool Initial; - - float Clamp; - vtkImageData* Texture; - float AlphaThreshold; - float Size; - float Color[3]; -}; - -//============================================================================ -class VISU_PickingSettings : public vtkObject -{ - public: - enum { BelowPoint = 0, TopLeftCorner }; - - public: - vtkTypeMacro( VISU_PickingSettings, vtkObject ); - - VISU_PickingSettings(); - virtual ~VISU_PickingSettings(); - - static - VISU_PickingSettings* - New(); - - vtkSetMacro( Initial, bool ); - vtkGetMacro( Initial, bool ); - - vtkSetMacro( PyramidHeight, float ); - vtkGetMacro( PyramidHeight, float ); - - vtkSetMacro( InfoWindowTransparency, float ); - vtkGetMacro( InfoWindowTransparency, float ); - - vtkSetMacro( InfoWindowPosition, int ); - vtkGetMacro( InfoWindowPosition, int ); - - vtkSetMacro( ZoomFactor, float ); - vtkGetMacro( ZoomFactor, float ); - - vtkSetMacro( StepNumber, int ); - vtkGetMacro( StepNumber, int ); - -private: - bool Initial; - - float PyramidHeight; - float InfoWindowTransparency; - int InfoWindowPosition; - float ZoomFactor; - int StepNumber; -}; +class VISU_ScalarBarCtrl; +class VISU_PickingSettings; +class VISU_OutsideCursorSettings; //============================================================================ diff --git a/src/OBJECT/VISU_GaussPtsSettings.h b/src/OBJECT/VISU_GaussPtsSettings.h new file mode 100644 index 00000000..ebe66525 --- /dev/null +++ b/src/OBJECT/VISU_GaussPtsSettings.h @@ -0,0 +1,130 @@ +// VISU OBJECT : interactive object for VISU entities implementation +// +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// 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. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// +// +// +// File : +// Author : +// Module : VISU +// $Header$ + +#ifndef VISU_GaussPtsSettings_HeaderFile +#define VISU_GaussPtsSettings_HeaderFile + +#include + +class vtkImageData; + + +//============================================================================ +namespace VISU +{ + const vtkIdType UpdateOutsideSettingsEvent = vtkCommand::UserEvent + 100; + const vtkIdType UpdatePickingSettingsEvent = vtkCommand::UserEvent + 200; +} + +class VTKOCC_EXPORT VISU_OutsideCursorSettings : public vtkObject +{ + public: + vtkTypeMacro( VISU_OutsideCursorSettings, vtkObject ); + + VISU_OutsideCursorSettings(); + virtual ~VISU_OutsideCursorSettings(); + + static + VISU_OutsideCursorSettings* + New(); + + vtkSetMacro( Initial, bool ); + vtkGetMacro( Initial, bool ); + + vtkSetMacro( Clamp, float ); + vtkGetMacro( Clamp, float ); + + vtkSetMacro( Texture, vtkImageData* ); + vtkGetMacro( Texture, vtkImageData* ); + + vtkSetMacro( AlphaThreshold, float ); + vtkGetMacro( AlphaThreshold, float ); + + vtkSetMacro( Size, float ); + vtkGetMacro( Size, float ); + + vtkSetVector3Macro( Color, float ); + vtkGetVector3Macro( Color, float ); + +private: + bool Initial; + + float Clamp; + vtkImageData* Texture; + float AlphaThreshold; + float Size; + float Color[3]; +}; + + +//============================================================================ +class VISU_PickingSettings : public vtkObject +{ + public: + enum { BelowPoint = 0, TopLeftCorner }; + + public: + vtkTypeMacro( VISU_PickingSettings, vtkObject ); + + VISU_PickingSettings(); + virtual ~VISU_PickingSettings(); + + static + VISU_PickingSettings* + New(); + + vtkSetMacro( Initial, bool ); + vtkGetMacro( Initial, bool ); + + vtkSetMacro( PyramidHeight, float ); + vtkGetMacro( PyramidHeight, float ); + + vtkSetMacro( InfoWindowTransparency, float ); + vtkGetMacro( InfoWindowTransparency, float ); + + vtkSetMacro( InfoWindowPosition, int ); + vtkGetMacro( InfoWindowPosition, int ); + + vtkSetMacro( ZoomFactor, float ); + vtkGetMacro( ZoomFactor, float ); + + vtkSetMacro( StepNumber, int ); + vtkGetMacro( StepNumber, int ); + +private: + bool Initial; + + float PyramidHeight; + float InfoWindowTransparency; + int InfoWindowPosition; + float ZoomFactor; + int StepNumber; +}; + + +#endif diff --git a/src/VVTK/VVTK_PickingDlg.cxx b/src/VVTK/VVTK_PickingDlg.cxx index 7d8c977a..11bddded 100644 --- a/src/VVTK/VVTK_PickingDlg.cxx +++ b/src/VVTK/VVTK_PickingDlg.cxx @@ -11,6 +11,7 @@ #include "VVTK_PickingDlg.h" #include "VISU_GaussPtsAct.h" +#include "VISU_GaussPtsSettings.h" #include "SUIT_ResourceMgr.h" #include "SUIT_Session.h" diff --git a/src/VVTK/VVTK_SegmentationCursorDlg.cxx b/src/VVTK/VVTK_SegmentationCursorDlg.cxx index 4873da7d..dd7fe982 100644 --- a/src/VVTK/VVTK_SegmentationCursorDlg.cxx +++ b/src/VVTK/VVTK_SegmentationCursorDlg.cxx @@ -11,6 +11,7 @@ #include "VVTK_SegmentationCursorDlg.h" #include "VISU_GaussPtsAct.h" +#include "VISU_GaussPtsSettings.h" #include "VISU_ImplicitFunctionWidget.h" #include "VISU_GaussPointsPL.hxx" -- 2.39.2