OpenImageDialog free the loaded library, viewers create marimagedata in viewer_widget

[creaMaracasVisu.git] / lib / maracasVisuLib / src / kernel / volume.hxx

diff --git a/lib/maracasVisuLib/src/kernel/volume.hxx b/lib/maracasVisuLib/src/kernel/volume.hxx
index baf121bc3d12a803b3246c070fe0986fc5183601..31d20f664d293874ca1ba816e970964a3cd7a0aa 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: 2010/03/15 14:12:30 $
+  Version:   $Revision: 1.6 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -21,13 +21,6 @@
 #include "marTypes.h"
 #include <string>
 
-#ifdef KGFO_USE_IDO
-extern "C"
-{
-#include <idvol.h>
-};
-#endif // KGFO_USE_IDO
-
 #ifdef KGFO_USE_VTK
 #include <vtkImageData.h>
 #endif // KGFO_USE_VTK
@@ -50,11 +43,6 @@ class creaMaracasVisu_EXPORT kVolume
     static const vtkIdType VTKTypes[];
 
 #endif // KGFO_USE_VTK
-#ifdef KGFO_USE_IDO
-
-    static const int IDOTypes[];
-
-#endif // KGFO_USE_IDO
 
     public:
 
@@ -196,62 +184,6 @@ 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
 };
 
 #endif // KGFO__VOLUME__HXX