Remove use of IdStrGetExamInfo, IdStrGetSerieInfo, IdAcrReadFile,

IdAcrInquireIRMInfo (LibIDO)

diff --git a/lib/maracasVisuLib/src/kernel/marDicom.cpp b/lib/maracasVisuLib/src/kernel/marDicom.cpp
index f89d4c08455d98dc74ba423df167f94bfdd27b16..d928b9ec712f7a5ebaaa8ec6861b5ccbd06be57a 100644 (file)
--- a/lib/maracasVisuLib/src/kernel/marDicom.cpp
+++ b/lib/maracasVisuLib/src/kernel/marDicom.cpp
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: marDicom.cpp,v $
   Language:  C++
-  Date:      $Date: 2008/10/31 16:32:54 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/11/14 11:33:20 $
+  Version:   $Revision: 1.2 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -14,7 +14,7 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-
+/*
 extern "C"
 {
 #include <idacr.h>
@@ -266,9 +266,9 @@ bool marDicom_ReadAllImageData( wxString& fn,
 // -------------------------------------------------------------------------
 void marDicom::loadVolume( bool force )
 {
-/*
-TODO: this function calls 11 534 336 to kVolume::setPixel !!!!
-*/
+//
+//TODO: this function calls 11 534 336 to kVolume::setPixel !!!!
+//
     wxString number, tmp;
     int size, i, j, k, dx, dy, dz, loc;
     double vX, vY, vZ;
@@ -434,3 +434,4 @@ wxArrayString marDicom::getRelationalArraySerieData( )
 }
 
 // eof - dicom.cxx
+ */

diff --git a/lib/maracasVisuLib/src/kernel/marDicom.h b/lib/maracasVisuLib/src/kernel/marDicom.h
index 91b73d03c87c8ea622e5b1dac6ec838447f8ce79..f01c438be92cfceec6324e19e955da5abe621391 100644 (file)
--- a/lib/maracasVisuLib/src/kernel/marDicom.h
+++ b/lib/maracasVisuLib/src/kernel/marDicom.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: marDicom.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/31 16:32:55 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/11/14 11:33:20 $
+  Version:   $Revision: 1.2 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -16,6 +16,7 @@
 =========================================================================*/
 #ifndef __MAR__KERNEL__DICOM__HXX__
 #define __MAR__KERNEL__DICOM__HXX__
+/*
 
 #include <kgfo/volume.h>
 #include <wx/list.h>
@@ -148,9 +149,10 @@ class MAR_KERNEL_EXPORT marDicom : public marObject
 
     bool setActualStudy( wxString& s );
     bool setActualSerie( wxString& s );
-
-    /** General methods
-     */
+    
+    //
+    // General methods
+    //
     void reset( )
        {
            freeVolume( );
@@ -159,9 +161,9 @@ class MAR_KERNEL_EXPORT marDicom : public marObject
        }
 
     void copyFrom( const marObject& from );
-
-    /** Persistence methods
-     */
+   //
+   //Persistence methods
+   //
     bool save( std::ofstream& os );
     bool load( std::ifstream& is );
 
@@ -178,4 +180,6 @@ class MAR_KERNEL_EXPORT marDicom : public marObject
 
 };
 
+
+*/
 #endif // __MAR__KERNEL__DICOM__HXX__