X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FTestWrite.cxx;h=a3c4806e2bf7632eac51e6707097656a33bb78c6;hb=5bf7c51796867388334836847a6874640bc83f89;hp=5e58ac2d9404b14a27f70924dbd841e5173361da;hpb=9bc08a72beb8acf114c306262e06386e75f7b967;p=gdcm.git

diff --git a/Example/TestWrite.cxx b/Example/TestWrite.cxx
index 5e58ac2d..a3c4806e 100644
--- a/Example/TestWrite.cxx
+++ b/Example/TestWrite.cxx
@@ -8,8 +8,8 @@ int main(int argc, char* argv[])
    char zozo[200];
 
 
-   gdcmHeader* e1;
-   gdcmFile  * f1;
+   gdcm::Header* e1;
+   gdcm::File  * f1;
 
    //gdcmDocument * d;  //not used
    void* imageData;
@@ -17,11 +17,12 @@ int main(int argc, char* argv[])
 
    if (argc < 3) {
          std::cerr << "usage: " << std::endl 
-                   << argv[0] << " fileName writtingMode "
+                   << argv[0] << " OriginalFileName writtingMode "
                 << std::endl 
-                   << "(a : ACR, gives fileNamed : DICOM Implicit VR,"
-                   << " x : DICOM Explicit VR  r : RAW,"
-                   << " v : explicit VR + computes the video inv image"
+                   << "(a : ACR, produces a file named OriginalFileName.ACR"
+                   << " x : DICOM Explicit VR, produces a file named OriginalFileName.XDCM"
+                   << " r : RAW, produces a file named OriginalFileName.RAW"
+                   << " v : explicit VR + computes the video inv image --> OriginalFileName.VDCM"
                 << std::endl;
 
          return 0;
@@ -48,7 +49,7 @@ int main(int argc, char* argv[])
      
    toto = argv[1]; 
 
-   e1 = new gdcmHeader( toto.c_str() );
+   e1 = new gdcm::Header( toto.c_str() );
    if (!e1->IsReadable())
    {
        std::cerr << "Sorry, not a Readable DICOM / ACR File"  <<std::endl;
@@ -56,7 +57,7 @@ int main(int argc, char* argv[])
    }
   // e1->Print(); 
    
-   f1 = new gdcmFile(e1);
+   f1 = new gdcm::File(e1);
 // ---     
 
    dataSize = f1->GetImageDataSize();
@@ -91,7 +92,7 @@ int main(int argc, char* argv[])
       && transferSyntaxName != "Uncompressed ACR-NEMA"     ) {
       std::cout << std::endl << "==========================================="
                 << std::endl; 
-      f1->ParsePixelData();
+      f1->GetPixelConverter()->Print();
       std::cout << std::endl << "==========================================="
                 << std::endl; 
    }
@@ -107,7 +108,8 @@ int main(int argc, char* argv[])
       f1->WriteAcr(zozo);
       break;
 
-   case 'd' :
+   case 'd' :  // Not document in the 'usage', because the method is knowed to be bugged. 
+
            // ecriture d'un fichier DICOM Implicit VR 
            // à partir d'un dcmHeader correct.
 
@@ -136,19 +138,26 @@ int main(int argc, char* argv[])
 
    case 'v' :
 
-     if ( f1->GetHeader()->GetBitsStored() == 8)
-        for (int i=0; i<dataSize; i++) {
-           ((char *)imageData)[i] += 127;
+     if ( f1->GetHeader()->GetBitsAllocated() == 8)
+     {
+        std::cout << "videoinv for 8 bits" << std::endl;
+        for (int i=0; i<dataSize; i++) 
+        {
+           ((uint8_t*)imageData)[i] += 127;
         }
-     else  
-        for (int i=0; i<dataSize/2; i++) {
-           ((unsigned short *)imageData)[i] += 32767;
+     }
+     else
+     {
+        std::cout << "videoinv for 16 bits" << std::endl;    
+        for (int i=0; i<dataSize/2; i++) 
+        {
+           ((uint16_t*)imageData)[i] += 60000; //32767;
         }
-
-         sprintf(zozo, "%s.DCM", toto.c_str());
-         printf ("WriteDCM Implicit VR\n");
-         f1->WriteDcmImplVR(zozo);
-         break;
+     }
+     sprintf(zozo, "%s.VDCM", toto.c_str());
+     printf ("WriteDCM Explicit VR + VideoInv\n");
+     f1->WriteDcmExplVR(zozo);
+     break;
 
    }
   return 0;