X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FexGC.cxx;h=8a55ded29cf6604e52d8ccac5e114b6e4d58b714;hb=20233e0e4bc268a63105f697c663feedecbe99f7;hp=56ec83cc7f87458dff2f7e38d4b321389f698c19;hpb=efd3ea11eb9d6da5f3034f5e46649d250b90c75a;p=gdcm.git

diff --git a/Example/exGC.cxx b/Example/exGC.cxx
index 56ec83cc..8a55ded2 100644
--- a/Example/exGC.cxx
+++ b/Example/exGC.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: exGC.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/09 15:31:15 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2005/10/25 14:52:27 $
+  Version:   $Revision: 1.10 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,10 +19,11 @@
 #include "gdcmFile.h"
 #include "gdcmFileHelper.h"
 #include "gdcmDocument.h"
-#include "gdcmValEntry.h"
-#include "gdcmBinEntry.h"
+#include "gdcmDataEntry.h"
 #include "gdcmSeqEntry.h"
 
+#include <stdlib.h> // for exit
+
 typedef struct  // Maybe we should add it to gdcm ?
 {
    uint8_t r;
@@ -71,22 +72,24 @@ int main(int argc, char *argv[])
 // ============================================================
    // a gdcm::File contains all the Dicom Field but the Pixels Element
 
-   gdcm::File *f1= new gdcm::File( fileName );
-
-
    std::cout << argv[1] << std::endl;
 
-   f1 = new gdcm::File( fileName );
-   if (!f1->IsReadable()) {
+   gdcm::File *f = gdcm::File::New();
+   f->SetLoadMode( gdcm::LD_ALL);
+   f->SetFileName( fileName );
+   bool res = f->Load();        
+
+   if (!res) {
        std::cerr << "Sorry, " << fileName <<"  not a gdcm-readable "
                  << "DICOM / ACR File"
                  <<std::endl;
+       f->Delete();
        return 0;
    }
    std::cout << " ... is readable " << std::endl;
 
 /*
-   if (!f1->IsMonochrome()) {
+   if (!f->IsMonochrome()) {
        std::cerr << "Sorry, " << fileName <<"  not a 'color' File "
            << " "
                  <<std::endl;
@@ -99,16 +102,18 @@ int main(int argc, char *argv[])
 // ============================================================
 
    // We need a gdcm::FileHelper, since we want to load the pixels        
-   gdcm::FileHelper *fh1 = new gdcm::FileHelper(f1);
+   gdcm::FileHelper *fh = gdcm::FileHelper::New(f);
 
    // (unit8_t DOESN'T mean it's mandatory for the image to be a 8 bits one) 
 
-   uint8_t *imageData = fh1->GetImageData();
+   uint8_t *imageData = fh->GetImageData();
 
    if ( imageData == 0 )
    {
        std::cerr << "Sorry, Pixels of" << fileName <<"  are not "
                  << " gdcm-readable."  << std::endl;
+       f->Delete();
+       fh->Delete();
        return 0;
    }
 
@@ -116,9 +121,11 @@ int main(int argc, char *argv[])
    // ------                              without Sequences     -------------
 
  
-   gdcm::FileHelper *copy = new gdcm::FileHelper( output );
+   gdcm::FileHelper *copy = gdcm::FileHelper::New( );
+   copy->SetFileName( output );
+   copy->Load();
  
-   gdcm::DocEntry *d = f1->GetFirstEntry();
+   gdcm::DocEntry *d = f->GetFirstEntry();
    while(d)
    {
       // We skip SeqEntries, since user cannot do much with them
@@ -127,27 +134,21 @@ int main(int argc, char *argv[])
            && !( d->GetGroup()%2 ) )
       { 
 
-         if ( gdcm::BinEntry *b = dynamic_cast<gdcm::BinEntry*>(d) )
+         if ( gdcm::DataEntry *de = dynamic_cast<gdcm::DataEntry *>(d) )
          {              
-            copy->GetFile()->InsertBinEntry( b->GetBinArea(),b->GetLength(),
-                                             b->GetGroup(),b->GetElement(),
-                                             b->GetVR() );
-         }
-         else if ( gdcm::ValEntry *v = dynamic_cast<gdcm::ValEntry*>(d) )
-         {   
-             copy->GetFile()->InsertValEntry( v->GetValue(),
-                                              v->GetGroup(),v->GetElement(),
-                                              v->GetVR() ); 
+            copy->GetFile()->InsertEntryBinArea( de->GetBinArea(),de->GetLength(),
+                                                 de->GetGroup(),de->GetElement(),
+                                                 de->GetVR() );
          }
          else
          {
           // We skip gdcm::SeqEntries
          }
       }
-      d = f1->GetNextEntry();
+      d = f->GetNextEntry();
    }
 
-   int imageSize = fh1->GetImageDataSize();
+   int imageSize = fh->GetImageDataSize();
 // Black up all 'grey' pixels
    int i;
    int n = 0;
@@ -158,28 +159,28 @@ int main(int argc, char *argv[])
            ((rgb8_t *)imageData)[i].r == ((rgb8_t *)imageData)[i].b )
       {
          n++;
-         ((rgb8_t *)imageData)[i].r = background;
-         ((rgb8_t *)imageData)[i].g = background;
-         ((rgb8_t *)imageData)[i].b = background;
+         ((rgb8_t *)imageData)[i].r = (unsigned char)background;
+         ((rgb8_t *)imageData)[i].g = (unsigned char)background;
+         ((rgb8_t *)imageData)[i].b = (unsigned char)background;
       }
    }
    
-    std::cout << n << " points put to black (within " 
-              << imageSize/3 << ")" << std::endl;
+   std::cout << n << " points put to black (within " 
+             << imageSize/3 << ")" << std::endl;
 
    n = 0;
    for (i = 0; i<imageSize/3; i++)
    {
-   if ( ((rgb8_t *)imageData)[i].r < threshold
-     &&
-        ((rgb8_t *)imageData)[i].g < threshold
-     &&
-        ((rgb8_t *)imageData)[i].b < threshold )
+      if ( ((rgb8_t *)imageData)[i].r < threshold
+         &&
+         ((rgb8_t *)imageData)[i].g < threshold
+         &&
+         ((rgb8_t *)imageData)[i].b < threshold )
       {
          n++;
-        ((rgb8_t *)imageData)[i].r = background;
-        ((rgb8_t *)imageData)[i].g = background;
-        ((rgb8_t *)imageData)[i].b = background;  
+        ((rgb8_t *)imageData)[i].r = (unsigned char)background;
+        ((rgb8_t *)imageData)[i].g = (unsigned char)background;
+        ((rgb8_t *)imageData)[i].b = (unsigned char)background;  
       }
    }
    
@@ -192,9 +193,9 @@ int main(int argc, char *argv[])
 
    copy->WriteDcmExplVR( output );
 
-   delete f1;
-   delete fh1;
-   delete copy;
+   f->Delete();
+   fh->Delete();
+   copy->Delete();
 
    exit (0);
 }