X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Fkernel%2Fvolume.hxx;h=57b9253a830edc23d5a95b2c33cd37ca8b380590;hb=87b6a1645b4dd6293e9c6ed9b33731d82a8623af;hp=ed641d963a1e3eaf00149681e17bc3747333c045;hpb=c5feadbb145eecf6d73f793535b7e23eb18db2cb;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/kernel/volume.hxx b/lib/maracasVisuLib/src/kernel/volume.hxx
index ed641d9..57b9253 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: 2008/10/31 16:32:56 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2009/05/14 13:54:43 $
+  Version:   $Revision: 1.5 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -21,18 +21,18 @@
 #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>
 #endif // KGFO_USE_VTK
 
-class MAR_KERNEL_EXPORT kVolume
+class creaMaracasVisu_EXPORT kVolume
 {
     public:
 
@@ -50,11 +50,11 @@ class MAR_KERNEL_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 MAR_KERNEL_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