From d552a1b07417679feb335043234b75218647ba86 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Fri, 14 Nov 2008 11:33:20 +0000 Subject: [PATCH] Remove use of IdStrGetExamInfo, IdStrGetSerieInfo, IdAcrReadFile, IdAcrInquireIRMInfo (LibIDO) --- lib/maracasVisuLib/src/kernel/marDicom.cpp | 13 +++++++------ lib/maracasVisuLib/src/kernel/marDicom.h | 20 ++++++++++++-------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/lib/maracasVisuLib/src/kernel/marDicom.cpp b/lib/maracasVisuLib/src/kernel/marDicom.cpp index f89d4c0..d928b9e 100644 --- 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 @@ -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 91b73d0..f01c438 100644 --- 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 #include @@ -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__ -- 2.47.1