X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FTestWrite.cxx;h=4c4607c9d4d3533b96ed776f0924e113fe4bdd61;hb=d00078b5e19310b379c8339fa8fe38362e8ca392;hp=402f7c684298e0e5e71e2be4753407dd3ea8f1cd;hpb=220ad8c527f2b2edf1ba19af8897aca8f4a49cf7;p=gdcm.git

diff --git a/Example/TestWrite.cxx b/Example/TestWrite.cxx
index 402f7c68..4c4607c9 100644
--- a/Example/TestWrite.cxx
+++ b/Example/TestWrite.cxx
@@ -1,27 +1,45 @@
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: TestWrite.cxx,v $
+  Language:  C++
+  Date:      $Date: 2005/01/20 16:16:58 $
+  Version:   $Revision: 1.15 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+#include "gdcmHeader.h"
+#include "gdcmFileHelper.h"
+
 #include <iostream>
-#include <stdio.h>
-#include "gdcm.h"
 
-int main(int argc, char* argv[])
+int main(int argc, char *argv[])
 {  
-   std::string toto;
-   char zozo[200];
-
+   std::string zozo;
 
-   gdcmHeader* e1;
-   gdcmFile  * f1;
+   gdcm::Header *e1;
+   gdcm::FileHelper *f1;
 
-   //gdcmDocument * d;  //not used
    void* imageData;
    int dataSize;
 
    if (argc < 3) {
          std::cerr << "usage: " << std::endl 
-                   << argv[0] << " fileName writtingMode "
+                   << argv[0] << " OriginalFileName writtingMode "
                 << std::endl 
-                   << "(a : ACR, d : DICOM Implicit VR,"
-                   << " x : DICOM Explicit VR  r : RAW)"
+                   << "(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;
    }
 /*
@@ -44,9 +62,10 @@ int main(int argc, char* argv[])
              << "--------------------- file :" << argv[1] 
              << std::endl;
      
-   toto = argv[1]; 
+   std::string toto = argv[1]; 
+   std::string mode = argv[2];
 
-   e1 = new gdcmHeader( toto.c_str(), false );
+   e1 = new gdcm::Header( toto.c_str() );
    if (!e1->IsReadable())
    {
        std::cerr << "Sorry, not a Readable DICOM / ACR File"  <<std::endl;
@@ -54,7 +73,7 @@ int main(int argc, char* argv[])
    }
   // e1->Print(); 
    
-   f1 = new gdcmFile(e1);
+   f1 = new gdcm::FileHelper(e1);
 // ---     
 
    dataSize = f1->GetImageDataSize();
@@ -74,43 +93,45 @@ int main(int argc, char* argv[])
              << " SampleserPixel="      << sPP
              << " PlanarConfiguration=" << planarConfig 
              << " PhotometricInterpretation=" 
-                                << e1->GetEntryByNumber(0x0028,0x0004) 
+                                << e1->GetEntry(0x0028,0x0004) 
              << std::endl;
 
    int numberOfScalarComponents=e1->GetNumberOfScalarComponents();
    std::cout << "NumberOfScalarComponents " << numberOfScalarComponents <<std::endl;
-   transferSyntaxName = e1->GetTransfertSyntaxName();
+   transferSyntaxName = e1->GetTransferSyntaxName();
    std::cout << " TransferSyntaxName= [" << transferSyntaxName << "]" << std::endl;
    
-   if (  transferSyntaxName != "Implicit VR - Little Endian"
+/*   if (  transferSyntaxName != "Implicit VR - Little Endian"
       && transferSyntaxName != "Explicit VR - Little Endian"     
       && transferSyntaxName != "Deflated Explicit VR - Little Endian"      
       && transferSyntaxName != "Explicit VR - Big Endian"
       && transferSyntaxName != "Uncompressed ACR-NEMA"     ) {
       std::cout << std::endl << "==========================================="
                 << std::endl; 
-      f1->ParsePixelData();
+      f1->GetPixelReadConverter()->Print();
       std::cout << std::endl << "==========================================="
                 << std::endl; 
-   }
+   }*/
    imageData= f1->GetImageData();
 
-   switch (argv[2][0]) {
+   switch (mode[0])
+   {
    case 'a' :
             // ecriture d'un fichier ACR 
             // à partir d'un dcmHeader correct.
 
-      sprintf(zozo, "%s.ACR", toto.c_str());
-      printf ("WriteACR\n");
+      zozo = toto + ".ACR";
+      std::cout << "WriteACR" << std::endl;
       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.
 
-      sprintf(zozo, "%s.DCM", toto.c_str());
-      printf ("WriteDCM Implicit VR\n");
+      zozo = toto + ".DCM";
+      std::cout << "WriteDCM Implicit VR" << std::endl;
       f1->WriteDcmImplVR(zozo);
       break;
 
@@ -118,7 +139,7 @@ int main(int argc, char* argv[])
               // ecriture d'un fichier DICOM Explicit VR 
               // à partir d'un dcmHeader correct.
 
-      sprintf(zozo, "%s.XDCM", toto.c_str());
+      zozo = toto + ".XDCM";
       std::cout << "WriteDCM Explicit VR" << std::endl;
       f1->WriteDcmExplVR(zozo);
       break;
@@ -127,11 +148,34 @@ int main(int argc, char* argv[])
              //  Ecriture d'un Raw File, a afficher avec 
              // affim filein= dimx= dimy= nbit= signe=
 
-      sprintf(zozo, "%s.RAW", toto.c_str());
+      zozo = toto + ".RAW";
       std::cout << "WriteRaw" << std::endl;
       f1->WriteRawData(zozo);
       break;
 
+   case 'v' :
+
+     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
+     {
+        std::cout << "videoinv for 16 bits" << std::endl;    
+        for (int i=0; i<dataSize/2; i++) 
+        {
+           ((uint16_t*)imageData)[i] += 60000; //32767;
+        }
+     }
+     zozo = toto + ".VDCM";
+     std::cout << "WriteDCM Explicit VR + VideoInv" << std::endl;
+     f1->WriteDcmExplVR(zozo);
+     break;
+
    }
   return 0;
 }