Fix stupid syntax like :

 fh->gdcm::FileHelper::Delete();
 to :
fh->Delete();
to please M$VC6

diff --git a/Example/PhilipsToBrucker.cxx b/Example/PhilipsToBrucker.cxx
index 471512c5f79e78be413bafa1b2e406247c9df1ad..a532b83adb3a06ada8bd239402c88731dfd705c8 100755 (executable)
--- a/Example/PhilipsToBrucker.cxx
+++ b/Example/PhilipsToBrucker.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: PhilipsToBrucker.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/01/10 16:04:18 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2006/01/18 15:45:20 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -36,7 +36,7 @@
   *            according to their Patient/Study/Serie/Image characteristics
   *          - fills a single level Directory with *all* the files,
   *            converted into a Brucker-like Dicom, Intags compliant
-  *          
+  * 
   */  
 
 typedef std::map<std::string, gdcm::File*> SortedFiles;
@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
       return 0;
    }
 
-   char *dirNamein;   
+   char *dirNamein;
    dirNamein  = am->ArgMgrGetString("dirin",(char *)"."); 
 
    char *dirNameout;   
@@ -172,7 +172,6 @@ int main(int argc, char *argv[])
    {
        std::cout << "Output Directory [" << dirNameout << "]" << " already exists; Used as is." << std::endl;
    }
-    
    std::string strDirNamein(dirNamein);
    gdcm::DirList dirList(strDirNamein, true); // get recursively the list of files
    
@@ -273,7 +272,7 @@ int main(int argc, char *argv[])
          for (j=0;j<nbSeriesToDrop; j++)
          {
             if(seriesNumber == seriesToDrop[j])
-            { 
+            {
                drop = true;
                break;
             }
@@ -427,13 +426,12 @@ int main(int argc, char *argv[])
       system (  systemCommand.c_str() );
       */
             
-      // Load the pixels in RAM.
-      
+      // Load the pixels in RAM.      
       
       fh = gdcm::FileHelper::New(currentFile);     
       fh->GetImageDataRaw(); // Don't convert (Gray Pixels + LUT) into (RGB pixels) ?!?
       fh->SetWriteTypeToDcmExplVR();
       fh->Write(fullWriteFilename);
-      fh->gdcm::FileHelper::Delete();                
+      fh->Delete();       
    }
  }

diff --git a/Example/PhilipsToBrucker2.cxx b/Example/PhilipsToBrucker2.cxx
index 1fd2dc2148a3f5f632b738dd774f144571d7e1fe..a01221c00dc0df44d8b1e322e005acacb5ce6f43 100755 (executable)
--- a/Example/PhilipsToBrucker2.cxx
+++ b/Example/PhilipsToBrucker2.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: PhilipsToBrucker2.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/01/18 10:21:37 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2006/01/18 15:45:21 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -522,7 +522,7 @@ int main(int argc, char *argv[])
       {
          std::cout << "Fail to write :[" << fullWriteFilename << "]"
                    << std::endl;
-      }
-      fh->gdcm::FileHelper::Delete();                
+      } 
+      fh->Delete();                
    }
  }

diff --git a/Example/PrintDicomDir.cxx b/Example/PrintDicomDir.cxx
index 28f0a1abde25f2c6cc4f8b76aa6ee2bc6c5a21ad..dc82ec88506064d5109af6695ee7328aed55097c 100644 (file)
--- a/Example/PrintDicomDir.cxx
+++ b/Example/PrintDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: PrintDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/01/17 15:36:26 $
-  Version:   $Revision: 1.31 $
+  Date:      $Date: 2006/01/18 15:45:21 $
+  Version:   $Revision: 1.32 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -35,7 +35,7 @@ int main(int argc, char* argv[])
    START_USAGE(usage)
    " \n PrintDicomDir :\n",
    " Display the tree-like structure of a DICOMDIR File",
-   " usage: PrintDicomDir filein=fileName [level=n] [debug] ",
+   " usage: PrintDicomDir filein=fileName [level=n][detail=m][debug]   ",
    "        detail = 1 : Patients, 2 : Studies, 3 : Series, 4 : Images ",
    "                 5 : Full Content ",
    "        level = 0,1,2 : depending on user (what he wants to see)",

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index 7e2530fc41a50ac9b09d3d6282f69d895224f488..1a6f11f303245036b8131567a5388d2cea6420c7 100644 (file)
--- a/Example/PrintFile.cxx
+++ b/Example/PrintFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: PrintFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/12/14 09:51:33 $
-  Version:   $Revision: 1.76 $
+  Date:      $Date: 2006/01/18 15:45:21 $
+  Version:   $Revision: 1.77 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -371,7 +371,7 @@ errno = 0;
       if (ori != "\\" )
          std::cout << "Orientation [" << ori << "]" << std::endl;
  
-       o->gdcm::Orientation::Delete(); 
+      o->Delete();  
 //------------------------------
 
 
@@ -581,8 +581,7 @@ errno = 0;
          std::string ori = o->GetOrientation ( f );
          if (ori != "\\" )
             std::cout << "Orientation [" << ori << "]" << std::endl;
-   
-         o->gdcm::Orientation::Delete(); 
+         o->Delete(); 
 
 //-------------------------------