]> Creatis software - creaMaracasVisu.git/commitdiff
git://git.creatis.insa-lyon.fr / creaMaracasVisu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8c87fb5)
- Avoid warnings
authorjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Mon, 26 Jan 2009 11:22:47 +0000 (11:22 +0000)
committerjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Mon, 26 Jan 2009 11:22:47 +0000 (11:22 +0000)
- Comment out useless references to libIDO

lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h patch | blob | history
lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h patch | blob | history
lib/maracasVisuLib/src/kernel/volume.cxx patch | blob | history
lib/maracasVisuLib/src/kernel/volume.hxx patch | blob | history

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h
index 63ffd091ab6d45854ec2e5b1c15429b8cc3fc8fe..8fe719b8804b052c52e31034105a2350e5f9a768 100644 (file)
--- 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 <wxVTKRenderWindowInteractor.h>
 
 #include <vtkCommand.h> 
 #include <vtkImageData.h> 
@@ -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 bc5d35ffb04697bbc9e7be88743e92cddf957c62..19f0210a8605dfb2e0c893c400ecc174c6f6986f 100644 (file)
--- 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 ee35a73f46be30fc79056dd5748e2b322e3bbdd8..028e649f9f4910bd3314144ab62fe45ae7edf426 100644 (file)
--- 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 baf121bc3d12a803b3246c070fe0986fc5183601..3e3c056ee43471ec1fcc243ba0840dfaaedcd883 100644 (file)
--- 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 <string>
 
-#ifdef KGFO_USE_IDO
-extern "C"
-{
-#include <idvol.h>
-};
-#endif // KGFO_USE_IDO
+//#ifdef KGFO_USE_IDO
+//extern "C"
+//{
+//#include <idvol.h>
+//};
+//#endif // KGFO_USE_IDO
 
 #ifdef KGFO_USE_VTK
 #include <vtkImageData.h>
@@ -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
Medical image visualization library