From: jean-pierre roux Date: Thu, 6 Nov 2008 10:00:49 +0000 (+0000) Subject: virtual desctructors X-Git-Tag: EED.02Oct2009~173 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=206564e24c5c40e1f8830bfd17ebb4cc99175ec2;p=creaMaracasVisu.git virtual desctructors --- diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.cxx index 1e497c9..e0a6830 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.cxx @@ -1720,4 +1720,6 @@ void AutoControlPoints::SetNumSplineInterpolation(int num) } //----------------------------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------------------------- -//----------------------------------------------------------------------------------------------------------------------------------------- \ No newline at end of file +//----------------------------------------------------------------------------------------------------------------------------------------- + + diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.h b/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.h index e0bad6b..54fecfb 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.h @@ -109,4 +109,6 @@ class AutoControlPoints : Vector }; -#endif // __AutoControlPoints_h_INCLUDED__ \ No newline at end of file +#endif // __AutoControlPoints_h_INCLUDED__ + + diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourPropagation.h b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourPropagation.h index 69ac0ea..56d57af 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourPropagation.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourPropagation.h @@ -70,4 +70,6 @@ class MARACASVISULIB_EXPORTS ContourPropagation std::vector _planevector; }; -#endif //__ContourPropagation_h_INCLUDED__ \ No newline at end of file +#endif //__ContourPropagation_h_INCLUDED__ + + diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.cxx index 17d0810..bba3667 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.cxx @@ -110,4 +110,6 @@ void ExtractControlPoints2D::SetNumberOfSplineInterpolation(double val) { _numinterspline = val; } -//----------------------------------------------------------------------------------------- \ No newline at end of file +//------------------------------------------------------------------------------ + + diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.h b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.h index 070ea64..6e6944f 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.h @@ -34,4 +34,6 @@ class MARACASVISULIB_EXPORTS ExtractControlPoints2D std::vector _InZ; }; -#endif \ No newline at end of file +#endif + + diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.h b/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.h index 9ede3ea..27eea17 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.h @@ -98,4 +98,6 @@ class PropContour std::vector _planevector; }; -#endif // __Propagation_h_INCLUDED__ \ No newline at end of file +#endif // __Propagation_h_INCLUDED__ + + diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/contoursIntersection.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/contoursIntersection.cxx index 0fb1259..24c0e4f 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/contoursIntersection.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/contoursIntersection.cxx @@ -35,4 +35,6 @@ void contoursIntersection::Intersection(double x01, double y01, double x02, doub //----------------------------------------------------------- //----------------------------------------------------------- //----------------------------------------------------------- -//----------------------------------------------------------- \ No newline at end of file +//----------------------------------------------------------- + + diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/contoursIntersection.h b/lib/maracasVisuLib/src/interface/wxWindows/Contour/contoursIntersection.h index 06255d0..3096880 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/contoursIntersection.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/contoursIntersection.h @@ -47,4 +47,6 @@ class contoursIntersection std::vector _InY2; std::vector _InZ2; }; -#endif \ No newline at end of file +#endif + + diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/vectorFunctions.h b/lib/maracasVisuLib/src/interface/wxWindows/Contour/vectorFunctions.h index e31e824..7492fcd 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/vectorFunctions.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/vectorFunctions.h @@ -27,4 +27,6 @@ class vectorFunctions double x, double y, double z ); }; -#endif \ No newline at end of file +#endif + + diff --git a/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h b/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h index a8cb92a..aad7c52 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h @@ -53,7 +53,7 @@ class manualPoint{ public: manualPoint(); - ~manualPoint(); + virtual ~manualPoint(); void SetPoint(double x,double y,double z); void SetPointX(double x); void SetPointY(double y); @@ -76,7 +76,7 @@ private: class MARACASVISULIB_EXPORTS manualContourModel{ public: manualContourModel(); - ~manualContourModel(); + virtual ~manualContourModel(); virtual manualContourModel * Clone(); void CopyAttributesTo( manualContourModel *cloneObject ); @@ -145,7 +145,7 @@ class MARACASVISULIB_EXPORTS manualContourModelCircle : public manualContourMode { public: manualContourModelCircle(); - ~manualContourModelCircle(); + virtual ~manualContourModelCircle(); virtual manualContourModelCircle *Clone(); void CopyAttributesTo( manualContourModelCircle *cloneObject); virtual void GetSpline_i_Point(int i, double *x, double *y, double *z); @@ -164,7 +164,7 @@ class manualContourModelBullEyeSector : public manualContourModel { public: manualContourModelBullEyeSector(); - ~manualContourModelBullEyeSector(); + virtual ~manualContourModelBullEyeSector(); virtual manualContourModelBullEyeSector *Clone(); void CopyAttributesTo( manualContourModelBullEyeSector *cloneObject); void SetSector( double radioA, @@ -201,7 +201,7 @@ class MARACASVISULIB_EXPORTS manualContourModelBullEye : public manualContourMod { public: manualContourModelBullEye(); - ~manualContourModelBullEye(); + virtual ~manualContourModelBullEye(); virtual manualContourModelBullEye *Clone(); void CopyAttributesTo( manualContourModelBullEye *cloneObject); virtual void Save(FILE *ff); @@ -250,7 +250,7 @@ class MARACASVISULIB_EXPORTS manualContourModelRoi : public manualContourModel { public: manualContourModelRoi(); - ~manualContourModelRoi(); + virtual ~manualContourModelRoi(); virtual manualContourModelRoi *Clone(); void CopyAttributesTo( manualContourModelRoi *cloneObject); private: @@ -301,7 +301,7 @@ protected: class MARACASVISULIB_EXPORTS manualViewBaseContour{ public: manualViewBaseContour(); - ~manualViewBaseContour(); + virtual ~manualViewBaseContour(); virtual int GetType(); virtual void Save(FILE *pFile); @@ -462,7 +462,7 @@ class MARACASVISULIB_EXPORTS manualViewContour: public manualViewBaseContour { public: manualViewContour(); - ~manualViewContour(); + virtual ~manualViewContour(); virtual manualViewContour * Clone(); void CopyAttributesTo( manualViewContour *cloneObject ); @@ -497,7 +497,7 @@ class manualView3VContour: public manualViewContour { public: manualView3VContour(int type); - ~manualView3VContour(); + virtual ~manualView3VContour(); virtual manualView3VContour * Clone(); void CopyAttributesTo( manualView3VContour *cloneObject ); @@ -526,7 +526,7 @@ class manualView3DContour: public manualViewContour { public: manualView3DContour(); - ~manualView3DContour(); + virtual ~manualView3DContour(); virtual manualView3DContour * Clone(); void CopyAttributesTo( manualView3DContour *cloneObject ); @@ -557,7 +557,7 @@ class MARACASVISULIB_EXPORTS manualViewRoi: public manualViewBaseContour { public: manualViewRoi(); - ~manualViewRoi(); + virtual ~manualViewRoi(); virtual int GetType(); virtual manualViewRoi * Clone(); @@ -596,7 +596,7 @@ class MARACASVISULIB_EXPORTS manualViewBullEye: public manualViewRoi { public: manualViewBullEye(); - ~manualViewBullEye(); + virtual ~manualViewBullEye(); virtual int GetType(); virtual manualViewBullEye * Clone(); @@ -629,7 +629,7 @@ class MARACASVISULIB_EXPORTS manualViewCircle: public manualViewContour { public: manualViewCircle(); - ~manualViewCircle(); + virtual ~manualViewCircle(); virtual int GetType(); virtual manualViewCircle * Clone(); @@ -659,7 +659,7 @@ class MARACASVISULIB_EXPORTS manualContourBaseControler: public InteractorStyleM { public: manualContourBaseControler(); - ~manualContourBaseControler(); + virtual ~manualContourBaseControler(); virtual manualContourBaseControler * Clone(); void CopyAttributesTo( manualContourBaseControler *cloneObject ); @@ -755,7 +755,7 @@ class MARACASVISULIB_EXPORTS manualContourControler: public manualContourBaseCon { public: manualContourControler(); - ~manualContourControler(); + virtual ~manualContourControler(); virtual manualContourControler * Clone(); void CopyAttributesTo( manualContourControler *cloneObject ); @@ -784,7 +784,7 @@ class MARACASVISULIB_EXPORTS manualContour3VControler: public manualContourCont { public: manualContour3VControler(int type); - ~manualContour3VControler(); + virtual ~manualContour3VControler(); virtual manualContour3VControler * Clone(); void CopyAttributesTo( manualContour3VControler *cloneObject ); @@ -828,7 +828,7 @@ class MARACASVISULIB_EXPORTS manualContour3DControler: public manualContourCont { public: manualContour3DControler(); - ~manualContour3DControler(); + virtual ~manualContour3DControler(); virtual manualContour3DControler * Clone(); void CopyAttributesTo( manualContour3DControler *cloneObject ); @@ -857,7 +857,7 @@ class MARACASVISULIB_EXPORTS manualContour3V3DControler: public manualContour3DC { public: manualContour3V3DControler(); - ~manualContour3V3DControler(); + virtual ~manualContour3V3DControler(); virtual manualContour3V3DControler * Clone(); void CopyAttributesTo( manualContour3V3DControler *cloneObject ); @@ -886,7 +886,7 @@ class MARACASVISULIB_EXPORTS manualContourPerpPlaneControler: public manualConto { public: manualContourPerpPlaneControler(); - ~manualContourPerpPlaneControler(); + virtual ~manualContourPerpPlaneControler(); virtual manualContourPerpPlaneControler * Clone(); void CopyAttributesTo( manualContourPerpPlaneControler *cloneObject ); @@ -929,7 +929,7 @@ class MARACASVISULIB_EXPORTS manualRoiControler: public manualContourBaseControl { public: manualRoiControler(); - ~manualRoiControler(); + virtual ~manualRoiControler(); virtual manualRoiControler * Clone(); void CopyAttributesTo( manualRoiControler *cloneObject ); @@ -954,7 +954,7 @@ class MARACASVISULIB_EXPORTS manualCircleControler: public manualContourControle { public: manualCircleControler(); - ~manualCircleControler(); + virtual ~manualCircleControler(); virtual manualCircleControler * Clone(); void CopyAttributesTo( manualCircleControler *cloneObject ); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/InterfaceVtkPanelWidgets.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/InterfaceVtkPanelWidgets.h index 17809bb..7ea762b 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/InterfaceVtkPanelWidgets.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/InterfaceVtkPanelWidgets.h @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: InterfaceVtkPanelWidgets.h,v $ Language: C++ - Date: $Date: 2008/10/31 16:32:41 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/11/06 10:00:54 $ + Version: $Revision: 1.2 $ Copyright: (c) 2002, 2003 License: @@ -22,6 +22,7 @@ class InterfaceVtkPanelWidgets { public: + virtual ~InterfaceVtkPanelWidgets(); virtual void CallBackOnMouseWheel( wxMouseEvent& event ); virtual void CallBackOnLeftDClick( wxMouseEvent& event ); }; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pLogicalFunction.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pLogicalFunction.h index 6f938e5..216cb92 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pLogicalFunction.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pLogicalFunction.h @@ -75,7 +75,7 @@ public: return false; } */ - + /** Get Point list of the funcion @param return points diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.h index 37a4ff8..87031dc 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.h @@ -51,7 +51,7 @@ class MARACASVISULIB_EXPORTS vtkBaseData { public: vtkBaseData(); - ~vtkBaseData(); + virtual ~vtkBaseData(); vtkImageData* GetImageData(); marImageData* GetMarImageData(); void SetMarImageData(marImageData *marimagedata); @@ -76,7 +76,7 @@ protected: class MARACASVISULIB_EXPORTS vtkMPRBaseData: public vtkBaseData{ public: vtkMPRBaseData(); - ~vtkMPRBaseData(); + virtual ~vtkMPRBaseData(); virtual void Configure(); int GetMaxPositionX( ); int GetMaxPositionY( ); @@ -106,7 +106,7 @@ private: class MARACASVISULIB_EXPORTS vtkMPR3DDataViewer { public: vtkMPR3DDataViewer(); - ~vtkMPR3DDataViewer(); + virtual ~vtkMPR3DDataViewer(); vtkImageActor* GetImageActor(int id); vtkActor* GetOutlineActor(); virtual void Refresh(); @@ -232,7 +232,7 @@ public: //Constructo-Destructor //---------------------- vtkClipping3DDataViewer(); - ~vtkClipping3DDataViewer(); + virtual ~vtkClipping3DDataViewer(); // vtkImageActor* GetImageActor(int id); vtkActor* GetOutlineActor(); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.h index b1f17cb..70a911b 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.h @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: wxMPRWidget.h,v $ Language: C++ - Date: $Date: 2008/10/31 16:47:51 $ - Version: $Revision: 1.2 $ + Date: $Date: 2008/11/06 10:00:54 $ + Version: $Revision: 1.3 $ Copyright: (c) 2002, 2003 License: @@ -530,7 +530,7 @@ class wxVtkMPR3DView { public: wxVtkMPR3DView( wxVtk3DBaseView *wxvtk3Dbaseview ); - ~wxVtkMPR3DView(); + virtual ~wxVtkMPR3DView(); void VisibleImageActor(int idPosition, bool visible); void VisiblePointWidget( bool visible ); void VisiblePlaneWidget( bool visible ); @@ -581,7 +581,7 @@ class wxVtkClipping3DView { public: wxVtkClipping3DView( wxVtk3DBaseView* wxvtk3Dbaseview ); - ~wxVtkClipping3DView(); + virtual ~wxVtkClipping3DView(); virtual void Refresh(); virtual void Configure(); void SetVtkClipping3DDataViewer( vtkClipping3DDataViewer *vtkclipping3Ddataviewer ); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxReadingPriorityPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxReadingPriorityPanel.h index a49a007..f429be0 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxReadingPriorityPanel.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxReadingPriorityPanel.h @@ -24,7 +24,7 @@ class PriorityLoop { public: PriorityLoop(); - ~PriorityLoop(); + virtual ~PriorityLoop(); void SetStartEndActualMax(int start,int end, int actual,int deltaImg, int maxImages); void Iteration(); void InitLoop(); @@ -80,7 +80,7 @@ class PriorityLoop { class BarLoading :public wxPanel{ public: BarLoading(wxWindow *parent, int w, int h); - ~BarLoading(); + virtual ~BarLoading(); void SetI(int i); void Reset(); void Paint(); @@ -139,7 +139,7 @@ private: class PriorityLoadImageBar : public PriorityLoop{ public: PriorityLoadImageBar(marFilesBase *marfilesbase, BarLoading *bar); - ~PriorityLoadImageBar(); + virtual ~PriorityLoadImageBar(); void Action_i(int i); virtual void RefreshForce(); @@ -215,7 +215,7 @@ private: class LoadRangeImage : public wxPanel, InterfaceVtkPanelWidgets{ public: LoadRangeImage(wxWindow *parent,marFilesBase *marfilesbase/*,wxImageViewerWidget *imageViewerWidget*/); - ~LoadRangeImage(); + virtual ~LoadRangeImage(); // EED Borrame // void OnSliceStart(wxScrollEvent& event); // void OnSliceEnd(wxScrollEvent& event); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h index cc9046c..fce85df 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h @@ -98,7 +98,7 @@ class MARACASVISULIB_EXPORTS wxVtkBaseView{ public: wxVtkBaseView( ); wxVtkBaseView( wxWindow *parent ); - ~wxVtkBaseView(); + virtual ~wxVtkBaseView(); wxVTKRenderWindowInteractor *GetWxVTKRenderWindowInteractor(); virtual void Configure(); virtual void Refresh(); @@ -135,7 +135,7 @@ class vtkInfoTextImageInteractor; class MARACASVISULIB_EXPORTS wxVtk2DBaseView: public wxVtkBaseView{ public: wxVtk2DBaseView(wxWindow *parent); - ~wxVtk2DBaseView(); + virtual ~wxVtk2DBaseView(); virtual void Configure(bool okimage=true); vtkImageViewer2_XYZ* _imageViewer2XYZ; vtkBaseData* GetVtkBaseData(); @@ -177,7 +177,7 @@ class MARACASVISULIB_EXPORTS InteractorStyleMaracas { public: InteractorStyleMaracas(); - ~InteractorStyleMaracas(); + virtual ~InteractorStyleMaracas(); virtual InteractorStyleMaracas * Clone(); void CopyAttributesTo( InteractorStyleMaracas *cloneObject ); @@ -218,7 +218,7 @@ private: class MARACASVISULIB_EXPORTS manualInteractorWindowLevel : public InteractorStyleMaracas { public: manualInteractorWindowLevel(); - ~manualInteractorWindowLevel(); + virtual ~manualInteractorWindowLevel(); protected: bool _stateWindowLevel; @@ -270,7 +270,7 @@ private: class vtkInfoTextImageInteractor : public InteractorStyleMaracas{ public: vtkInfoTextImageInteractor(); - ~vtkInfoTextImageInteractor(); + virtual ~vtkInfoTextImageInteractor(); void SetModelVtkInfoTextImage(vtkInfoTextImage *vtkinfotextimage); vtkInfoTextImage *GetVtkInfoTextImage(); @@ -289,7 +289,7 @@ private: class vtkInteractorScrollZ : public InteractorStyleMaracas { public: vtkInteractorScrollZ(); - ~vtkInteractorScrollZ(); + virtual ~vtkInteractorScrollZ(); virtual bool OnMouseMove(); virtual bool OnRightButtonDown(); @@ -424,7 +424,7 @@ private: class MARACASVISULIB_EXPORTS wxVtk3DBaseView: public wxVtkBaseView{ public: wxVtk3DBaseView( wxWindow *parent ); - ~wxVtk3DBaseView(); + virtual ~wxVtk3DBaseView(); vtkCamera* GetCamera(); virtual vtkRenderer* GetRenderer(); virtual vtkRenderWindow* GetRenWin(); diff --git a/lib/maracasVisuLib/src/kernel/marObject.h b/lib/maracasVisuLib/src/kernel/marObject.h index b049ae4..2d3217c 100644 --- a/lib/maracasVisuLib/src/kernel/marObject.h +++ b/lib/maracasVisuLib/src/kernel/marObject.h @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: marObject.h,v $ Language: C++ - Date: $Date: 2008/10/31 16:32:56 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/11/06 10:00:59 $ + Version: $Revision: 1.2 $ Copyright: (c) 2002, 2003 License: @@ -34,7 +34,7 @@ class MAR_KERNEL_EXPORT marObject /** Default destructor. */ - ~marObject( ); + virtual ~marObject( ); /** Parameters assignation methods. *