From: jean-pierre roux Date: Mon, 26 Jan 2009 11:22:47 +0000 (+0000) Subject: - Avoid warnings X-Git-Tag: EED.02Oct2009~129 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=1585b16e8aa2b90ce38645293ad5d1ccea7c1023;p=creaMaracasVisu.git - Avoid warnings - Comment out useless references to libIDO --- diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h index 63ffd09..8fe719b 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h @@ -2,7 +2,7 @@ #define _wxVTKRenderWindowInteractorEditContour_h_ -#include "wxVTKRenderWindowInteractor.h" +#include #include #include @@ -14,7 +14,6 @@ - //------------------------------------------------------------------------ //------------------------------------------------------------------------ //------------------------------------------------------------------------ @@ -165,6 +164,7 @@ public: double InitialLevel; }; +class wxVTKRenderWindowInteractor; class vtkInteractorStyle2DMaracas : public vtkInteractorStyleImage{ public: @@ -183,7 +183,7 @@ public: virtual void OnMiddleButtonUp () ; virtual void OnRightButtonDown () ; virtual void OnRightButtonUp () ; - void SetObserver( vtkCommand *obs ); + void SetObserver( vtkCommand *obs ); private: vtkCommand *_obs; @@ -195,26 +195,26 @@ private: -class wxVTKRenderWindowInteractorEditContour : public wxVTKRenderWindowInteractor{ +class wxVTKRenderWindowInteractorEditContour : public wxVTKRenderWindowInteractor { public: - wxVTKRenderWindowInteractorEditContour(wxWindow *parent,wxWindowID id); - ~wxVTKRenderWindowInteractorEditContour(); + wxVTKRenderWindowInteractorEditContour(wxWindow *parent,wxWindowID id); + virtual ~wxVTKRenderWindowInteractorEditContour(); - virtual void OnButtonDown(wxMouseEvent &event); - virtual void OnButtonUp(wxMouseEvent &event); - virtual void OnButtonDouble(wxMouseEvent &event); + virtual void OnButtonDown(wxMouseEvent &event); + virtual void OnButtonUp(wxMouseEvent &event); + virtual void OnButtonDouble(wxMouseEvent &event); virtual void OnMotion(wxMouseEvent &event); - virtual void OnKeyDown(wxKeyEvent &event); + virtual void OnKeyDown(wxKeyEvent &event); - void SetState(int state); - int GetState(); - void SetObserver(vtkCommand *obs); + void SetState(int state); + int GetState(); + void SetObserver(vtkCommand *obs); private: - int _state; - vtkCommand *_obs; + int _state; + vtkCommand *_obs; }; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h index bc5d35f..19f0210 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h @@ -66,7 +66,7 @@ class creaMaracasVisu_EXPORT wxVTKRenderWindowInteractorPlus : public wxVTKRende { public: wxVTKRenderWindowInteractorPlus(wxWindow *parent ,wxVtkBaseView *_wxvtkbaseview); - ~wxVTKRenderWindowInteractorPlus(); + virtual ~wxVTKRenderWindowInteractorPlus(); wxVTKRenderWindowInteractorPlus(); void OnLeftDClick( wxMouseEvent& event ); diff --git a/lib/maracasVisuLib/src/kernel/volume.cxx b/lib/maracasVisuLib/src/kernel/volume.cxx index ee35a73..028e649 100644 --- a/lib/maracasVisuLib/src/kernel/volume.cxx +++ b/lib/maracasVisuLib/src/kernel/volume.cxx @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: volume.cxx,v $ Language: C++ - Date: $Date: 2008/11/21 18:13:38 $ - Version: $Revision: 1.3 $ + Date: $Date: 2009/01/26 11:22:49 $ + Version: $Revision: 1.4 $ Copyright: (c) 2002, 2003 License: @@ -284,6 +284,7 @@ void kVolume::convertCast( Type type ) case FLOAT: convertCastT( ( char* )_raw, ( float* )buffer, size ); break; case DOUBLE: convertCastT( ( char* )_raw, ( double* )buffer, size ); break; case UCHAR: convertCastT( ( char* )_raw, ( uchar* )buffer, size ); break; + default : break; } // fswitch break; @@ -298,7 +299,7 @@ void kVolume::convertCast( Type type ) case FLOAT: convertCastT( ( short* )_raw, ( float* )buffer, size ); break; case DOUBLE: convertCastT( ( short* )_raw, ( double* )buffer, size ); break; case UCHAR: convertCastT( ( short* )_raw, ( uchar* )buffer, size ); break; - + default : break; } // fswitch break; @@ -312,7 +313,7 @@ void kVolume::convertCast( Type type ) case FLOAT: convertCastT( ( int* )_raw, ( float* )buffer, size ); break; case DOUBLE: convertCastT( ( int* )_raw, ( double* )buffer, size ); break; case UCHAR: convertCastT( ( int* )_raw, ( uchar* )buffer, size ); break; - + default : break; } // fswitch break; @@ -326,7 +327,7 @@ void kVolume::convertCast( Type type ) case FLOAT: convertCastT( ( ushort* )_raw, ( float* )buffer, size ); break; case DOUBLE: convertCastT( ( ushort* )_raw, ( double* )buffer, size ); break; case UCHAR: convertCastT( ( ushort* )_raw, ( uchar* )buffer, size ); break; - + default : break; } // fswitch break; @@ -340,7 +341,7 @@ void kVolume::convertCast( Type type ) case FLOAT: convertCastT( ( uint* )_raw, ( float* )buffer, size ); break; case DOUBLE: convertCastT( ( uint* )_raw, ( double* )buffer, size ); break; case UCHAR: convertCastT( ( uint* )_raw, ( uchar* )buffer, size ); break; - + default : break; } // fswitch break; @@ -354,7 +355,7 @@ void kVolume::convertCast( Type type ) case UINT: convertCastT( ( float* )_raw, ( uint* )buffer, size ); break; case DOUBLE: convertCastT( ( float* )_raw, ( double* )buffer, size ); break; case UCHAR: convertCastT( ( float* )_raw, ( uchar* )buffer, size ); break; - + default : break; } // fswitch break; @@ -368,7 +369,7 @@ void kVolume::convertCast( Type type ) case UINT: convertCastT( ( double* )_raw, ( uint* )buffer, size ); break; case FLOAT: convertCastT( ( double* )_raw, ( float* )buffer, size ); break; case UCHAR: convertCastT( ( double* )_raw, ( uchar* )buffer, size ); break; - + default : break; } // fswitch break; @@ -382,7 +383,7 @@ void kVolume::convertCast( Type type ) case UINT: convertCastT( ( uchar* )_raw, ( uint* )buffer, size ); break; case FLOAT: convertCastT( ( uchar* )_raw, ( float* )buffer, size ); break; case DOUBLE: convertCastT( ( uchar* )_raw, ( double* )buffer, size ); break; - + default : break; } // fswitch break; diff --git a/lib/maracasVisuLib/src/kernel/volume.hxx b/lib/maracasVisuLib/src/kernel/volume.hxx index baf121b..3e3c056 100644 --- a/lib/maracasVisuLib/src/kernel/volume.hxx +++ b/lib/maracasVisuLib/src/kernel/volume.hxx @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: volume.hxx,v $ Language: C++ - Date: $Date: 2009/01/15 11:09:47 $ - Version: $Revision: 1.3 $ + Date: $Date: 2009/01/26 11:22:49 $ + Version: $Revision: 1.4 $ Copyright: (c) 2002, 2003 License: @@ -21,12 +21,12 @@ #include "marTypes.h" #include -#ifdef KGFO_USE_IDO -extern "C" -{ -#include -}; -#endif // KGFO_USE_IDO +//#ifdef KGFO_USE_IDO +//extern "C" +//{ +//#include +//}; +//#endif // KGFO_USE_IDO #ifdef KGFO_USE_VTK #include @@ -50,11 +50,11 @@ class creaMaracasVisu_EXPORT kVolume static const vtkIdType VTKTypes[]; #endif // KGFO_USE_VTK -#ifdef KGFO_USE_IDO - - static const int IDOTypes[]; - -#endif // KGFO_USE_IDO +//#ifdef KGFO_USE_IDO +// +// static const int IDOTypes[]; +// +//#endif // KGFO_USE_IDO public: @@ -197,61 +197,61 @@ class creaMaracasVisu_EXPORT kVolume #endif // KGFO_USE_VTK -#ifdef KGFO_USE_IDO - - public: - - kVolume( PPPVOLUME org ); - - kVolume& operator=( PPPVOLUME org ); - void copyFrom( PPPVOLUME org ); - - PPPVOLUME castIdo( ) const - { - return( ( PPPVOLUME )( &_privateIdo[ 1 ] ) ); - } - operator PPPVOLUME( ) const - { - return( ( PPPVOLUME )( &_privateIdo[ 1 ] ) ); - } - operator PPPVOLUME_CHAR( ) const - { - return( ( PPPVOLUME_CHAR )( &_privateIdo[ 1 ] ) ); - } - operator PPPVOLUME_FLOAT( ) const - { - return( ( PPPVOLUME_FLOAT )( &_privateIdo[ 1 ] ) ); - } - operator PPPVOLUME_DOUBLE( ) const - { - return( ( PPPVOLUME_DOUBLE )( &_privateIdo[ 1 ] ) ); - } - operator PPPVOLUME_LONG( ) const - { - return( ( PPPVOLUME_LONG )( &_privateIdo[ 1 ] ) ); - } - operator PPPVOLUME_SHORT( ) const - { - return( ( PPPVOLUME_SHORT )( &_privateIdo[ 1 ] ) ); - } - operator PPPVOLUME_UCHAR( ) const - { - return( ( PPPVOLUME_UCHAR )( &_privateIdo[ 1 ] ) ); - } - operator PPPVOLUME_ULONG( ) const - { - return( ( PPPVOLUME_ULONG )( &_privateIdo[ 1 ] ) ); - } - operator PPPVOLUME_USHORT( ) const - { - return( ( PPPVOLUME_USHORT )( &_privateIdo[ 1 ] ) ); - } - - protected: - - PRIVATE_VOLUME* _privateIdo; - -#endif // KGFO_USE_IDO +//#ifdef KGFO_USE_IDO + +// public: +// +// kVolume( PPPVOLUME org ); +// +// kVolume& operator=( PPPVOLUME org ); +// void copyFrom( PPPVOLUME org ); +// +// PPPVOLUME castIdo( ) const +// { +// return( ( PPPVOLUME )( &_privateIdo[ 1 ] ) ); +// } +// operator PPPVOLUME( ) const +// { +// return( ( PPPVOLUME )( &_privateIdo[ 1 ] ) ); +// } +// operator PPPVOLUME_CHAR( ) const +// { +// return( ( PPPVOLUME_CHAR )( &_privateIdo[ 1 ] ) ); +// } +// operator PPPVOLUME_FLOAT( ) const +// { +// return( ( PPPVOLUME_FLOAT )( &_privateIdo[ 1 ] ) ); +// } +// operator PPPVOLUME_DOUBLE( ) const +// { +// return( ( PPPVOLUME_DOUBLE )( &_privateIdo[ 1 ] ) ); +// } +// operator PPPVOLUME_LONG( ) const +// { +// return( ( PPPVOLUME_LONG )( &_privateIdo[ 1 ] ) ); +// } +// operator PPPVOLUME_SHORT( ) const +// { +// return( ( PPPVOLUME_SHORT )( &_privateIdo[ 1 ] ) ); +// } +// operator PPPVOLUME_UCHAR( ) const +// { +// return( ( PPPVOLUME_UCHAR )( &_privateIdo[ 1 ] ) ); +// } +// operator PPPVOLUME_ULONG( ) const +// { +// return( ( PPPVOLUME_ULONG )( &_privateIdo[ 1 ] ) ); +// } +// operator PPPVOLUME_USHORT( ) const +// { +// return( ( PPPVOLUME_USHORT )( &_privateIdo[ 1 ] ) ); +// } +// +// protected: +// +// PRIVATE_VOLUME* _privateIdo; +// +//#endif // KGFO_USE_IDO }; #endif // KGFO__VOLUME__HXX