From b07da16d019cd5e0d5c99c72c2939f8324a9eef2 Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 9 Mar 2011 09:23:05 +0000 Subject: [PATCH] Additional changes for issue 0020830: redesign methods of the SALOME View / Displayer / Presentation to handle pre-display/erase and post-display/erase operations properly. --- src/LightApp/LightApp_Displayer.cxx | 8 +- src/Prs/SALOME_Prs.cxx | 116 ++++++++++++++++++++++++ src/Prs/SALOME_Prs.h | 133 +++++++++++++++++++--------- src/SOCC/SOCC_ViewModel.cxx | 33 ------- src/SOCC/SOCC_ViewModel.h | 5 -- src/SPlot2d/SPlot2d_ViewModel.cxx | 32 ------- src/SPlot2d/SPlot2d_ViewModel.h | 5 -- src/SVTK/SVTK_ViewModel.cxx | 34 ------- src/SVTK/SVTK_ViewModel.h | 12 --- 9 files changed, 212 insertions(+), 166 deletions(-) diff --git a/src/LightApp/LightApp_Displayer.cxx b/src/LightApp/LightApp_Displayer.cxx index 35e75fcac..d88963bc9 100644 --- a/src/LightApp/LightApp_Displayer.cxx +++ b/src/LightApp/LightApp_Displayer.cxx @@ -87,9 +87,9 @@ void LightApp_Displayer::Display( const QStringList& list, const bool updateView if ( vf ) { myLastEntry = *it; - vf->BeforeDisplay( this ); + vf->BeforeDisplay( this, prs ); vf->Display( prs ); - vf->AfterDisplay( this ); + vf->AfterDisplay( this, prs ); if ( updateViewer ) vf->Repaint(); @@ -173,9 +173,9 @@ void LightApp_Displayer::Erase( const QStringList& list, const bool forced, SALOME_Prs* prs = vf->CreatePrs( (*it).toLatin1().data() ); if ( prs ) { myLastEntry = *it; - vf->BeforeErase(this); + vf->BeforeErase( this, prs ); vf->Erase( prs, forced ); - vf->AfterErase(this); + vf->AfterErase( this, prs ); if ( updateViewer ) vf->Repaint(); delete prs; // delete presentation because displayer is its owner diff --git a/src/Prs/SALOME_Prs.cxx b/src/Prs/SALOME_Prs.cxx index c0fc28e9d..72d793bea 100755 --- a/src/Prs/SALOME_Prs.cxx +++ b/src/Prs/SALOME_Prs.cxx @@ -47,6 +47,38 @@ void SALOME_OCCPrs::EraseIn( SALOME_View* v, const bool forced ) const if ( v ) v->Erase( this, forced ); } +/*! + Dispatches display operation to proper BeforeDisplay() method of SALOME_Displayer +*/ +void SALOME_OCCPrs::BeforeDisplayIn( SALOME_Displayer* d, SALOME_View* v ) const +{ + d->BeforeDisplay( v, this ); +} + +/*! + Dispatches display operation to proper AfterDisplay() method of SALOME_Displayer +*/ +void SALOME_OCCPrs::AfterDisplayIn( SALOME_Displayer* d, SALOME_View* v ) const +{ + d->AfterDisplay( v, this ); +} + +/*! + Dispatches display operation to proper BeforeErase() method of SALOME_Displayer +*/ +void SALOME_OCCPrs::BeforeEraseIn( SALOME_Displayer* d, SALOME_View* v ) const +{ + d->BeforeErase( v, this ); +} + +/*! + Dispatches display operation to proper AfterErase() method of SALOME_Displayer +*/ +void SALOME_OCCPrs::AfterEraseIn( SALOME_Displayer* d, SALOME_View* v ) const +{ + d->AfterErase( v, this ); +} + /*! Dispatches operation to proper LocalSelectionIn() method of SALOME_View */ @@ -79,6 +111,38 @@ void SALOME_VTKPrs::EraseIn( SALOME_View* v, const bool forced ) const if ( v ) v->Erase( this, forced ); } +/*! + Dispatches display operation to proper BeforeDisplay() method of SALOME_Displayer +*/ +void SALOME_VTKPrs::BeforeDisplayIn( SALOME_Displayer* d, SALOME_View* v ) const +{ + d->BeforeDisplay( v, this ); +} + +/*! + Dispatches display operation to proper AfterDisplay() method of SALOME_Displayer +*/ +void SALOME_VTKPrs::AfterDisplayIn( SALOME_Displayer* d, SALOME_View* v ) const +{ + d->AfterDisplay( v, this ); +} + +/*! + Dispatches display operation to proper BeforeErase() method of SALOME_Displayer +*/ +void SALOME_VTKPrs::BeforeEraseIn( SALOME_Displayer* d, SALOME_View* v ) const +{ + d->BeforeErase( v, this ); +} + +/*! + Dispatches display operation to proper AfterErase() method of SALOME_Displayer +*/ +void SALOME_VTKPrs::AfterEraseIn( SALOME_Displayer* d, SALOME_View* v ) const +{ + d->AfterErase( v, this ); +} + /*! Dispatches operation to proper LocalSelectionIn() method of SALOME_View */ @@ -111,6 +175,38 @@ void SALOME_Prs2d::EraseIn( SALOME_View* v, const bool forced ) const if ( v ) v->Erase( this, forced ); } +/*! + Dispatches display operation to proper BeforeDisplay() method of SALOME_Displayer +*/ +void SALOME_Prs2d::BeforeDisplayIn( SALOME_Displayer* d, SALOME_View* v ) const +{ + d->BeforeDisplay( v, this ); +} + +/*! + Dispatches display operation to proper AfterDisplay() method of SALOME_Displayer +*/ +void SALOME_Prs2d::AfterDisplayIn( SALOME_Displayer* d, SALOME_View* v ) const +{ + d->AfterDisplay( v, this ); +} + +/*! + Dispatches display operation to proper BeforeErase() method of SALOME_Displayer +*/ +void SALOME_Prs2d::BeforeEraseIn( SALOME_Displayer* d, SALOME_View* v ) const +{ + d->BeforeErase( v, this ); +} + +/*! + Dispatches display operation to proper AfterErase() method of SALOME_Displayer +*/ +void SALOME_Prs2d::AfterEraseIn( SALOME_Displayer* d, SALOME_View* v ) const +{ + d->AfterErase( v, this ); +} + /*! Dispatches operation to proper LocalSelectionIn() method of SALOME_View */ @@ -243,6 +339,26 @@ void SALOME_View::GlobalSelection( const bool ) const // Probably, selection is being activated in uncompatible viewframe." ); } +void SALOME_View::BeforeDisplay( SALOME_Displayer* d, const SALOME_Prs* p ) +{ + p->BeforeDisplayIn( d, this ); +} + +void SALOME_View::AfterDisplay( SALOME_Displayer* d, const SALOME_Prs* p ) +{ + p->AfterDisplayIn( d, this ); +} + +void SALOME_View::BeforeErase( SALOME_Displayer* d, const SALOME_Prs* p ) +{ + p->BeforeEraseIn( d, this ); +} + +void SALOME_View::AfterErase ( SALOME_Displayer* d, const SALOME_Prs* p ) +{ + p->AfterEraseIn( d, this ); +} + /*! Gives control to SALOME_Prs object, so that it could perform double dispatch */ diff --git a/src/Prs/SALOME_Prs.h b/src/Prs/SALOME_Prs.h index 4f1d2e328..e0b1e48c5 100755 --- a/src/Prs/SALOME_Prs.h +++ b/src/Prs/SALOME_Prs.h @@ -56,6 +56,18 @@ public: //! Key method for double dispatch of erase operation virtual void EraseIn( SALOME_View*, const bool = false ) const = 0; + //! Key method for double dispatch of pre-display operation + virtual void BeforeDisplayIn( SALOME_Displayer*, SALOME_View* ) const = 0; + + //! Key method for double dispatch of post-display operation + virtual void AfterDisplayIn( SALOME_Displayer*, SALOME_View* ) const = 0; + + //! Key method for double dispatch of pre-erase operation + virtual void BeforeEraseIn( SALOME_Displayer*, SALOME_View* ) const = 0; + + //! Key method for double dispatch of post-erase operation + virtual void AfterEraseIn( SALOME_Displayer*, SALOME_View* ) const = 0; + //! Key method for double dispatch of update operation virtual void Update( SALOME_Displayer* ) = 0; @@ -75,15 +87,31 @@ public: class PRS_EXPORT SALOME_OCCPrs : public SALOME_Prs { public: - //! It uses double dispatch in order to \n + //! It uses double dispatch in order to //! invoke Display() method corresponding to the actual type of presentation. virtual void DisplayIn( SALOME_View* ) const; - //! It uses double dispatch in order to \n + //! It uses double dispatch in order to //! invoke Erase() method corresponding to the actual type of presentation. virtual void EraseIn( SALOME_View*, const bool = false ) const; - //! It uses double dispatch in order to \n + //! It uses double dispatch in order to + //! invoke BeforeDisplayIn() method corresponding to the actual type of presentation. + virtual void BeforeDisplayIn( SALOME_Displayer*, SALOME_View* ) const; + + //! It uses double dispatch in order to + //! invoke AfterDisplayIn() method corresponding to the actual type of presentation. + virtual void AfterDisplayIn( SALOME_Displayer*, SALOME_View* ) const; + + //! It uses double dispatch in order to + //! invoke BeforeEraseIn() method corresponding to the actual type of presentation. + virtual void BeforeEraseIn( SALOME_Displayer*, SALOME_View* ) const; + + //! It uses double dispatch in order to + //! invoke AfterEraseIn() method corresponding to the actual type of presentation. + virtual void AfterEraseIn( SALOME_Displayer*, SALOME_View* ) const; + + //! It uses double dispatch in order to //! invoke Update() method corresponding to the actual type of presentation. virtual void Update( SALOME_Displayer* ); @@ -99,15 +127,31 @@ public: class PRS_EXPORT SALOME_VTKPrs : public SALOME_Prs { public: - //! It uses double dispatch in order to \n + //! It uses double dispatch in order to //! invoke Display() method corresponding to the actual type of presentation. virtual void DisplayIn( SALOME_View* ) const; - //! It uses double dispatch in order to \n + //! It uses double dispatch in order to //! invoke Erase() method corresponding to the actual type of presentation. virtual void EraseIn( SALOME_View*, const bool = false ) const; - //! It uses double dispatch in order to \n + //! It uses double dispatch in order to + //! invoke BeforeDisplayIn() method corresponding to the actual type of presentation. + virtual void BeforeDisplayIn( SALOME_Displayer*, SALOME_View* ) const; + + //! It uses double dispatch in order to + //! invoke AfterDisplayIn() method corresponding to the actual type of presentation. + virtual void AfterDisplayIn( SALOME_Displayer*, SALOME_View* ) const; + + //! It uses double dispatch in order to + //! invoke BeforeEraseIn() method corresponding to the actual type of presentation. + virtual void BeforeEraseIn( SALOME_Displayer*, SALOME_View* ) const; + + //! It uses double dispatch in order to + //! invoke AfterEraseIn() method corresponding to the actual type of presentation. + virtual void AfterEraseIn( SALOME_Displayer*, SALOME_View* ) const; + + //! It uses double dispatch in order to //! invoke Update() method corresponding to the actual type of presentation. virtual void Update( SALOME_Displayer* ); @@ -130,6 +174,22 @@ public: //! invoke Erase() method corresponding to the actual type of presentation. virtual void EraseIn( SALOME_View*, const bool = false ) const; + //! It uses double dispatch in order to + //! invoke BeforeDisplayIn() method corresponding to the actual type of presentation. + virtual void BeforeDisplayIn( SALOME_Displayer*, SALOME_View* ) const; + + //! It uses double dispatch in order to + //! invoke AfterDisplayIn() method corresponding to the actual type of presentation. + virtual void AfterDisplayIn( SALOME_Displayer*, SALOME_View* ) const; + + //! It uses double dispatch in order to + //! invoke BeforeEraseIn() method corresponding to the actual type of presentation. + virtual void BeforeEraseIn( SALOME_Displayer*, SALOME_View* ) const; + + //! It uses double dispatch in order to + //! invoke AfterEraseIn() method corresponding to the actual type of presentation. + virtual void AfterEraseIn( SALOME_Displayer*, SALOME_View* ) const; + //! It uses double dispatch in order to //! invoke Update() method corresponding to the actual type of presentation. virtual void Update( SALOME_Displayer* ); @@ -151,18 +211,18 @@ public: //! Destructor virtual ~SALOME_View() {} - //! This Display() method should be called to display given presentation \n - //! created anywhere by anybody. It simply passes control to SALOME_Prs object \n + //! This Display() method should be called to display given presentation + //! created anywhere by anybody. It simply passes control to SALOME_Prs object //! so that it could perform double dispatch. void Display( const SALOME_Prs* ); - //! This Erase() method should be called to erase given presentation \n - //! created anywhere by anybody. It simply passes control to SALOME_Prs object \n + //! This Erase() method should be called to erase given presentation + //! created anywhere by anybody. It simply passes control to SALOME_Prs object //! so that it could perform double dispatch. void Erase( const SALOME_Prs*, const bool = false ); - //! This LocalSelection() method should be called to activate sub-shapes selection \n - //! created anywhere by anybody. It simply passes control to SALOME_Prs object \n + //! This LocalSelection() method should be called to activate sub-shapes selection + //! created anywhere by anybody. It simply passes control to SALOME_Prs object //! so that it could perform double dispatch. void LocalSelection( const SALOME_Prs*, const int ); @@ -171,13 +231,13 @@ public: // Display() methods for ALL kinds of presentation should appear here virtual void Display( const SALOME_OCCPrs* );//!< Display SALOME_OCCPrs presentation. virtual void Display( const SALOME_VTKPrs* );//!< Display SALOME_VTKPrs presentation. - virtual void Display( const SALOME_Prs2d* );//!< Display SALOME_Prs2d presentation. + virtual void Display( const SALOME_Prs2d* );//!< Display SALOME_Prs2d presentation. // Add new Display() methods here... // Erase() methods for ALL kinds of presentation should appear here virtual void Erase( const SALOME_OCCPrs*, const bool = false );//!< Erase SALOME_OCCPrs virtual void Erase( const SALOME_VTKPrs*, const bool = false );//!< Erase SALOME_VTKPrs - virtual void Erase( const SALOME_Prs2d*, const bool = false );//!< Erase SALOME_Prs2d + virtual void Erase( const SALOME_Prs2d*, const bool = false );//!< Erase SALOME_Prs2d virtual void EraseAll( const bool = false ); // Add new Erase() methods here... @@ -193,13 +253,12 @@ public: virtual SALOME_Prs* CreatePrs( const char* /*entry*/ = 0 ) { return 0; } // Axiluary methods called before and after displaying of objects - virtual void BeforeDisplay( SALOME_Displayer* ) {} //!< Null body here - virtual void AfterDisplay ( SALOME_Displayer* ) {} //!< Null body here + virtual void BeforeDisplay( SALOME_Displayer*, const SALOME_Prs* ); + virtual void AfterDisplay ( SALOME_Displayer*, const SALOME_Prs* ); // Axiluary methods called before and after erasing of objects - virtual void BeforeErase( SALOME_Displayer* ) {} //!< Null body here - virtual void AfterErase ( SALOME_Displayer* ) {} //!< Null body here - + virtual void BeforeErase( SALOME_Displayer*, const SALOME_Prs* ); + virtual void AfterErase ( SALOME_Displayer*, const SALOME_Prs* ); // New methods (asv) //! \retval Return false. @@ -208,14 +267,6 @@ public: virtual void GetVisible( SALOME_ListIO& theList ) {} }; -/*! - \class SALOME_Displayer - These classes are used to specify type of view VTK, OCC or Plot2d -*/ -class PRS_EXPORT SALOME_OCCViewType {}; -class PRS_EXPORT SALOME_VTKViewType {}; -class PRS_EXPORT SALOME_Plot2dViewType {}; - /*! \class SALOME_Displayer Base class for SALOME displayers @@ -226,8 +277,8 @@ public: //! Destructor virtual ~SALOME_Displayer() {/*! Null body here*/} - //! This Update() method should be called to update given presentation \n - //! created anywhere by anybody. It simply passes control to SALOME_Prs object \n + //! This Update() method should be called to update given presentation + //! created anywhere by anybody. It simply passes control to SALOME_Prs object //! so that it could perform double dispatch. void UpdatePrs( SALOME_Prs* ); @@ -240,20 +291,20 @@ public: // Add new Update() methods here... // Axiluary methods called before and after displaying of objects - virtual void BeforeDisplay( SALOME_View*, const SALOME_OCCViewType& ){/*! Null body here*/}; - virtual void AfterDisplay ( SALOME_View*, const SALOME_OCCViewType& ){/*! Null body here*/}; - virtual void BeforeDisplay( SALOME_View*, const SALOME_VTKViewType& ){/*! Null body here*/}; - virtual void AfterDisplay ( SALOME_View*, const SALOME_VTKViewType& ){/*! Null body here*/}; - virtual void BeforeDisplay( SALOME_View*, const SALOME_Plot2dViewType& ){/*! Null body here*/}; - virtual void AfterDisplay ( SALOME_View*, const SALOME_Plot2dViewType& ){/*! Null body here*/}; + virtual void BeforeDisplay( SALOME_View*, const SALOME_OCCPrs* ) {} //! Null body here + virtual void AfterDisplay ( SALOME_View*, const SALOME_OCCPrs* ) {} //! Null body here + virtual void BeforeDisplay( SALOME_View*, const SALOME_VTKPrs* ) {} //! Null body here + virtual void AfterDisplay ( SALOME_View*, const SALOME_VTKPrs* ) {} //! Null body here + virtual void BeforeDisplay( SALOME_View*, const SALOME_Prs2d* ) {} //! Null body here + virtual void AfterDisplay ( SALOME_View*, const SALOME_Prs2d* ) {} //! Null body here // Axiluary methods called before and after erasing of objects - virtual void BeforeErase( SALOME_View*, const SALOME_OCCViewType& ){/*! Null body here*/}; - virtual void AfterErase ( SALOME_View*, const SALOME_OCCViewType& ){/*! Null body here*/}; - virtual void BeforeErase( SALOME_View*, const SALOME_VTKViewType& ){/*! Null body here*/}; - virtual void AfterErase ( SALOME_View*, const SALOME_VTKViewType& ){/*! Null body here*/}; - virtual void BeforeErase( SALOME_View*, const SALOME_Plot2dViewType& ){/*! Null body here*/}; - virtual void AfterErase ( SALOME_View*, const SALOME_Plot2dViewType& ){/*! Null body here*/}; + virtual void BeforeErase( SALOME_View*, const SALOME_OCCPrs* ) {} //! Null body here + virtual void AfterErase ( SALOME_View*, const SALOME_OCCPrs* ) {} //! Null body here + virtual void BeforeErase( SALOME_View*, const SALOME_VTKPrs* ) {} //! Null body here + virtual void AfterErase ( SALOME_View*, const SALOME_VTKPrs* ) {} //! Null body here + virtual void BeforeErase( SALOME_View*, const SALOME_Prs2d* ) {} //! Null body here + virtual void AfterErase ( SALOME_View*, const SALOME_Prs2d* ) {} //! Null body here }; diff --git a/src/SOCC/SOCC_ViewModel.cxx b/src/SOCC/SOCC_ViewModel.cxx index 65bd597ff..725b2856d 100755 --- a/src/SOCC/SOCC_ViewModel.cxx +++ b/src/SOCC/SOCC_ViewModel.cxx @@ -619,39 +619,6 @@ void SOCC_Viewer::GlobalSelection( const bool update ) const } } -/*! - Auxiliary method called before displaying of objects -*/ -void SOCC_Viewer::BeforeDisplay( SALOME_Displayer* d ) -{ - d->BeforeDisplay( this, SALOME_OCCViewType() ); -} - -/*! - Auxiliary method called after displaying of objects -*/ -void SOCC_Viewer::AfterDisplay( SALOME_Displayer* d ) -{ - d->AfterDisplay( this, SALOME_OCCViewType() ); -} - - -/*! - Auxiliary method called before erasing of objects -*/ -void SOCC_Viewer::BeforeErase( SALOME_Displayer* d ) -{ - d->BeforeErase( this, SALOME_OCCViewType() ); -} - -/*! - Auxiliary method called after erase of objects -*/ -void SOCC_Viewer::AfterErase( SALOME_Displayer* d ) -{ - d->AfterErase( this, SALOME_OCCViewType() ); -} - /*! Get new and current trihedron size corresponding to the current model size */ diff --git a/src/SOCC/SOCC_ViewModel.h b/src/SOCC/SOCC_ViewModel.h index 1c4feb978..9156cc397 100755 --- a/src/SOCC/SOCC_ViewModel.h +++ b/src/SOCC/SOCC_ViewModel.h @@ -60,11 +60,6 @@ public: virtual void Erase( const SALOME_OCCPrs*, const bool = false ); virtual void EraseAll( const bool = false ); virtual SALOME_Prs* CreatePrs( const char* entry = 0 ); - virtual void BeforeDisplay( SALOME_Displayer* d ); - virtual void AfterDisplay ( SALOME_Displayer* d ); - - virtual void BeforeErase( SALOME_Displayer* d ); - virtual void AfterErase ( SALOME_Displayer* d ); virtual void LocalSelection( const SALOME_OCCPrs*, const int ); virtual void GlobalSelection( const bool = false ) const; diff --git a/src/SPlot2d/SPlot2d_ViewModel.cxx b/src/SPlot2d/SPlot2d_ViewModel.cxx index 587395da4..fc61189b3 100644 --- a/src/SPlot2d/SPlot2d_ViewModel.cxx +++ b/src/SPlot2d/SPlot2d_ViewModel.cxx @@ -294,38 +294,6 @@ SALOME_Prs* SPlot2d_Viewer::CreatePrs( const char* entry ) return prs; } -/*! - Axiluary method called before displaying of objects -*/ -void SPlot2d_Viewer::BeforeDisplay( SALOME_Displayer* d ) -{ - d->BeforeDisplay( this, SALOME_Plot2dViewType() ); -} - -/*! - Axiluary method called after displaying of objects -*/ -void SPlot2d_Viewer::AfterDisplay( SALOME_Displayer* d ) -{ - d->AfterDisplay( this, SALOME_Plot2dViewType() ); -} - -/*! - Axiluary method called before erasing of objects -*/ -void SPlot2d_Viewer::BeforeErase( SALOME_Displayer* d ) -{ - d->BeforeErase( this, SALOME_Plot2dViewType() ); -} - -/*! - Axiluary method called after erasing of objects -*/ -void SPlot2d_Viewer::AfterErase( SALOME_Displayer* d ) -{ - d->AfterErase( this, SALOME_Plot2dViewType() ); -} - /*! Returns true if interactive object is presented in the viewer and displayed */ diff --git a/src/SPlot2d/SPlot2d_ViewModel.h b/src/SPlot2d/SPlot2d_ViewModel.h index 73e6b48e8..77ffe0ae2 100644 --- a/src/SPlot2d/SPlot2d_ViewModel.h +++ b/src/SPlot2d/SPlot2d_ViewModel.h @@ -71,11 +71,6 @@ public: virtual void EraseAll(const bool = false); virtual void Repaint(); virtual SALOME_Prs* CreatePrs( const char* entry = 0 ); - virtual void BeforeDisplay( SALOME_Displayer* d ); - virtual void AfterDisplay ( SALOME_Displayer* d ); - - virtual void BeforeErase( SALOME_Displayer* d ); - virtual void AfterErase ( SALOME_Displayer* d ); virtual bool isVisible( const Handle(SALOME_InteractiveObject)& IObject ); virtual void GetVisible( SALOME_ListIO& theList ); diff --git a/src/SVTK/SVTK_ViewModel.cxx b/src/SVTK/SVTK_ViewModel.cxx index d3f12d5b9..4bdc295f5 100644 --- a/src/SVTK/SVTK_ViewModel.cxx +++ b/src/SVTK/SVTK_ViewModel.cxx @@ -620,40 +620,6 @@ SALOME_Prs* SVTK_Viewer::CreatePrs( const char* entry ) return prs; } -/*! - Auxiliary method called before displaying of objects -*/ -void SVTK_Viewer::BeforeDisplay( SALOME_Displayer* d ) -{ - d->BeforeDisplay( this, SALOME_VTKViewType() ); -} - -/*! - Auxiliary method called after displaying of objects -*/ -void SVTK_Viewer::AfterDisplay( SALOME_Displayer* d ) -{ - d->AfterDisplay( this, SALOME_VTKViewType() ); -} - - -/*! - Auxiliary method called before erasing of objects -*/ -void SVTK_Viewer::BeforeErase( SALOME_Displayer* d ) -{ - d->BeforeErase( this, SALOME_VTKViewType() ); -} - -/*! - Auxiliary method called after displaying of objects -*/ -void SVTK_Viewer::AfterErase( SALOME_Displayer* d ) -{ - d->AfterErase( this, SALOME_VTKViewType() ); -} - - /*! \return true if object is displayed in viewer \param obj - object to be checked diff --git a/src/SVTK/SVTK_ViewModel.h b/src/SVTK/SVTK_ViewModel.h index 93bf7c40a..14671db12 100644 --- a/src/SVTK/SVTK_ViewModel.h +++ b/src/SVTK/SVTK_ViewModel.h @@ -144,18 +144,6 @@ public: //! See #SALOME_View::CreatePrs( const char* entry = 0 ) SALOME_Prs* CreatePrs( const char* entry = 0 ); - //! See #SALOME_View::BeforeDisplay( SALOME_Displayer* d ) - virtual void BeforeDisplay( SALOME_Displayer* d ); - - //! See #SALOME_View::AfterDisplay( SALOME_Displayer* d ) - virtual void AfterDisplay( SALOME_Displayer* d ); - - //! See #SALOME_View::BeforeDisplay( SALOME_Displayer* d ) - virtual void BeforeErase( SALOME_Displayer* d ); - - //! See #SALOME_View::AfterDisplay( SALOME_Displayer* d ) - virtual void AfterErase( SALOME_Displayer* d ); - //! See #SALOME_View::isVisible( const Handle(SALOME_InteractiveObject)& ) virtual bool isVisible( const Handle(SALOME_InteractiveObject)& ); -- 2.39.2