X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=vtk%2FBmp2Dcm.cxx;h=78d1e206db0e5cc523660a447470d7226a086d17;hb=3f4f97595ab182ee8c0f0f2732c3aaa52ba4df08;hp=ac7325452cbc85851f994425864dcbb75c7539b4;hpb=73ce3e4fb7a74c705771c67ef45cc227ab79e929;p=gdcm.git

diff --git a/vtk/Bmp2Dcm.cxx b/vtk/Bmp2Dcm.cxx
index ac732545..78d1e206 100755
--- a/vtk/Bmp2Dcm.cxx
+++ b/vtk/Bmp2Dcm.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: Bmp2Dcm.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/06/26 15:40:38 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2007/10/30 16:42:58 $
+  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
@@ -67,9 +67,9 @@ int main( int argc, char *argv[] )
 
    if (am->ArgMgrDefined("debug"))
       GDCM_NAME_SPACE::Debug::DebugOn();
-      
-   int verbose  = am->ArgMgrDefined("verbose");
-         
+
+   bool verbose = ( 0 != am->ArgMgrDefined("verbose") );
+
    const char *fileName = am->ArgMgrGetString("filein");
    const char *dirName  = am->ArgMgrGetString("dirin");
 
@@ -78,46 +78,52 @@ int main( int argc, char *argv[] )
         (fileName != 0 && dirName != 0) )
    {
        std::cout <<std::endl
-                 << "Either 'filein=' or 'dirin=' must be present;" 
+                 << "Either 'filein=' or 'dirin=' must be present;"
                  << std::endl << "Not both" << std::endl;
-       am->ArgMgrUsage(usage); // Display 'usage'  
+       am->ArgMgrUsage(usage); // Display 'usage'
        delete am;
        return 0;
  }
- 
+
    std::string patName  = am->ArgMgrGetString("patname", dirName);
-    
-   bool userDefinedStudy = am->ArgMgrDefined("studyUID");
-   const char *studyUID  = am->ArgMgrGetString("studyUID");  
+   bool userDefinedStudy = ( 0 != am->ArgMgrDefined("studyUID") );
+   const char *studyUID;
+   if (userDefinedStudy)
+      studyUID  = am->ArgMgrGetString("studyUID");
+
+   // not described *on purpose* in the Usage !
+   bool userDefinedSerie = ( 0 != am->ArgMgrDefined("serieUID") );
+   const char *serieUID;
+   if(userDefinedSerie)
+      serieUID = am->ArgMgrGetString("serieUID");
 
-// not described *on purpose* in the Usage ! 
-   bool userDefinedSerie = am->ArgMgrDefined("serieUID");   
-   const char *serieUID  = am->ArgMgrGetString("serieUID");
-       
     /* if unused Param we give up */
    if ( am->ArgMgrPrintUnusedLabels() )
    {
       am->ArgMgrUsage(usage);
       delete am;
       return 0;
-   } 
- 
+   }
+
    delete am;  // ------ we don't need Arguments Manager any longer ------
 
+
+   // ----- Begin Processing -----
+
    int *dim;
    std::string nomFich;
-   
+
    if ( fileName != 0 ) // ====== Deal with a single file ======
-   { 
+   {
      vtkBMPReader* Reader = vtkBMPReader::New();
      if ( Reader->CanReadFile(fileName ) == 0) {
-         // skip 'non BMP' files   
+         // skip 'non BMP' files
         Reader->Delete();
         if (verbose)
             std::cout << "Sorry, [" << fileName << "] is not a BMP file!" << std::endl;
         return 0;
     }
-    
+
     if (verbose)
        std::cout << "deal with [" <<  fileName << "]" << std::endl;
      //Read BMP file
@@ -142,7 +148,18 @@ int main( int argc, char *argv[] )
    
      }
      else  // ====== Deal with a (single Patient) Directory ======
-     {    
+     { 
+     
+        if ( ! GDCM_NAME_SPACE::DirList::IsDirectory(dirName) )
+        {
+          std::cout << "KO : [" << dirName << "] is not a Directory." << std::endl;
+          return 0;
+        }
+        else
+        {
+          if (verbose)
+            std::cout << "OK : [" << dirName << "] is a Directory." << std::endl;
+        } 
         std::string strStudyUID;
         std::string strSerieUID;