From b8620b846024b5921625d9ed99ad54d83e20d124 Mon Sep 17 00:00:00 2001 From: apo Date: Mon, 23 Jun 2008 08:49:16 +0000 Subject: [PATCH] Fix for Bug VISU200819953 - Error message is shown after selection of Cut Planes presentation for Slider functionality --- src/VISUGUI/VisuGUI_Sweep.cxx | 6 ++---- src/VISUGUI/VisuGUI_Sweep.h | 10 +++++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/VISUGUI/VisuGUI_Sweep.cxx b/src/VISUGUI/VisuGUI_Sweep.cxx index 1f457d7c..addd3889 100644 --- a/src/VISUGUI/VisuGUI_Sweep.cxx +++ b/src/VISUGUI/VisuGUI_Sweep.cxx @@ -68,8 +68,6 @@ VisuGUI_Sweep::VisuGUI_Sweep( VisuGUI* theModule, : QWidget( theParent ) , myModule( theModule ) , myViewWindow( NULL ) - , myScalarMap( NULL ) - , myActor( NULL ) { setWindowTitle( tr("TITLE") ); setObjectName( tr("TITLE") ); @@ -461,13 +459,13 @@ void VisuGUI_Sweep::onPlay( bool on ) { SUIT_ResourceMgr* aResourceMgr = VISU::GetResourceMgr(); if ( on ) { - myPlayButton->setIcon( myPlayPixmap ); + myPlayButton->setIcon( myPausePixmap ); myTimer->start( int( myStepDelay->value() * 1000 ) ); myPlayButton->setChecked( true ); } else { myTimer->stop(); myPlayButton->setChecked( false ); - myPlayButton->setIcon( myPausePixmap ); + myPlayButton->setIcon( myPlayPixmap ); } } diff --git a/src/VISUGUI/VisuGUI_Sweep.h b/src/VISUGUI/VisuGUI_Sweep.h index 169e9c8b..8062d269 100644 --- a/src/VISUGUI/VisuGUI_Sweep.h +++ b/src/VISUGUI/VisuGUI_Sweep.h @@ -28,6 +28,10 @@ #ifndef VisuGUI_Sweep_HeaderFile #define VisuGUI_Sweep_HeaderFile +#include "SALOME_GenericObjPointer.hh" + +#include + #include #include @@ -123,10 +127,10 @@ private: QAction* myToggleViewAction; VisuGUI* myModule; + SVTK_ViewWindow* myViewWindow; - VISU_Actor* myActor; - VISU::ScalarMap_i* myScalarMap; - SVTK_ViewWindow* myViewWindow; + vtkSmartPointer< VISU_Actor > myActor; + SALOME::GenericObjPtr< VISU::ScalarMap_i > myScalarMap; }; -- 2.39.2