X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Example%2FDense2007ToDicom.cxx;h=97e2105f9c99101f0adbc1fc86f56190e72d1179;hb=7807e926c2319c5adfc037665992307222bc8f27;hp=bf76dcee397034af2c3af41e4541c28281753330;hpb=d93bdc3a545dc713354ab0c8ad9558ee11dfe0e9;p=gdcm.git

diff --git a/Example/Dense2007ToDicom.cxx b/Example/Dense2007ToDicom.cxx
index bf76dcee..97e2105f 100755
--- a/Example/Dense2007ToDicom.cxx
+++ b/Example/Dense2007ToDicom.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: Dense2007ToDicom.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/03/28 15:36:57 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2008/03/31 15:05:07 $
+  Version:   $Revision: 1.9 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
    const char *strain      = am->ArgMgrWantString("strain",usage);
    const char *peak_strain = am->ArgMgrWantString("peak_strain",usage);
 
-   const char *patientName = am->ArgMgrGetString("patientname");
+   const char *patientName = am->ArgMgrGetString("patientname", "Patient^Name");
    
    bool createMultiFrame = (am->ArgMgrDefined("m") != 0);
          
@@ -121,11 +121,11 @@ int main(int argc, char *argv[])
    std::string strStudyUID =  GDCM_NAME_SPACE::Util::CreateUniqueUID();
        
    std::cout << "Success in open file [" << peak_strain << "]" << std::endl;
-   LoadPeakStrain(fromPeakStrain, peak_strain, patientName,strStudyUID);
+   LoadPeakStrain(fromPeakStrain, GDCM_NAME_SPACE::Util::GetName(peak_strain), patientName,strStudyUID);
    fromPeakStrain.close();  
 
    std::cout << "Success in open file [" << strain << "]" << std::endl;
-   LoadStrain(fromStrain, strain, patientName, createMultiFrame, strStudyUID);
+   LoadStrain(fromStrain, GDCM_NAME_SPACE::Util::GetName(strain), patientName, createMultiFrame, strStudyUID);
    fromStrain.close();      
    return 1;            
 }
@@ -295,64 +295,62 @@ std::cout << "------------stop skipping ---------------- " << std::endl;
 
    } // end for i<NP
 
+   std::string dcmImageName;    
+   std::string serieUID;
+
    std::cout << "--------------- Ecc_strain ------------------" << std::endl;
    float *ecc_strain = new float[NP];
    for (i=0; i<NP; i++) {
       from >> ecc_strain[i]; 
-      if (verbose)
-         std::cout <<  ecc_strain[i] <<  std::endl;
+     // if (verbose)
+     //    std::cout <<  ecc_strain[i] <<  std::endl;
    }
+//followed by their peak Ecc strain, an array of NP elements,
+   serieUID =  GDCM_NAME_SPACE::Util::CreateUniqueUID();
+   dcmImageName = textFileName + "_peak_Ecc_strain.dcm";
+   MakeDicomImage(ecc_strain, X, Y, Z, NP, dcmImageName, patientname, 1, studyUID, serieUID);   
    delete []ecc_strain;
 
    std::cout << "--------------- Err_strain ------------------" << std::endl;
    float *err_strain = new float[NP];
    for (i=0; i<NP; i++) {
       from >> err_strain[i]; 
-      if (verbose)
-         std::cout <<  err_strain[i] <<  std::endl;
+      //if (verbose)
+      //   std::cout <<  err_strain[i] <<  std::endl;
    }
+//followed by their peak Err strain, an array of NP elements,
+   serieUID =  GDCM_NAME_SPACE::Util::CreateUniqueUID();
+   dcmImageName = textFileName + "_peak_Err_strain.dcm";
+   MakeDicomImage(err_strain, X, Y, Z, NP, dcmImageName, patientname, 1, studyUID, serieUID);
    delete []err_strain;
 
    std::cout << "--------------- E11_strain ------------------" << std::endl;
    float *e11_strain = new float[NP];
    for (i=0; i<NP; i++) {
       from >> e11_strain[i]; 
-      if (verbose)
-         std::cout <<  e11_strain[i] <<  std::endl;
-   }  
-   delete []e11_strain;
-
-   std::cout << "--------------- E22_strain ------------------" << std::endl;
-   float *e22_strain = new float[NP];
-   for (i=0; i<NP; i++) {
-      from >> e22_strain[i]; 
-      if (verbose)
-         std::cout <<  e22_strain[i] <<  std::endl;
-   }    
-   delete []e22_strain;
-
-   std::string dcmImageName;    
-   std::string serieUID;
-   
-//followed by their peak Ecc strain, an array of NP elements,
-   serieUID =  GDCM_NAME_SPACE::Util::CreateUniqueUID();
-   dcmImageName = textFileName + "_peak_Ecc_strain.dcm";
-   MakeDicomImage(ecc_strain, X, Y, Z, NP, dcmImageName, patientname, 1, studyUID, serieUID);
-
-//followed by their peak Err strain, an array of NP elements,
-   serieUID =  GDCM_NAME_SPACE::Util::CreateUniqueUID();
-   dcmImageName = textFileName + "_peak_Err_strain.dcm";
-   MakeDicomImage(err_strain, X, Y, Z, NP, dcmImageName, patientname, 1, studyUID, serieUID);
-
+      //if (verbose)
+      //   std::cout <<  e11_strain[i] <<  std::endl;
+   }
 //followed by their peak E11 strain, an array of NP elements,
    serieUID =  GDCM_NAME_SPACE::Util::CreateUniqueUID();
    dcmImageName = textFileName + "_peak_E11_strain.dcm";
    MakeDicomImage(e11_strain, X, Y, Z, NP, dcmImageName, patientname, 1, studyUID, serieUID);
+   delete []e11_strain;          
+
 
+   std::cout << "--------------- E22_strain ------------------" << std::endl;
+   float *e22_strain = new float[NP];
+   for (i=0; i<NP; i++) {
+      from >> e22_strain[i]; 
+      //if (verbose)
+      //   std::cout <<  e22_strain[i] <<  std::endl;
+   }
 //followed by their Peak E22 strain, an array of NP elements,
    serieUID =  GDCM_NAME_SPACE::Util::CreateUniqueUID();
    dcmImageName = textFileName + "_peak_E22_strain.dcm";
    MakeDicomImage(e22_strain, X, Y, Z, NP, dcmImageName, patientname, 1, studyUID, serieUID);         
+   delete []e22_strain;
+     
 }
 
 // =====================================================================================================================