Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/medical/DICOM/dicomReader/src/DicomVFile.cc

Version: [ ReleaseNotes ] [ 1.0 ] [ 1.1 ] [ 2.0 ] [ 3.0 ] [ 3.1 ] [ 3.2 ] [ 4.0 ] [ 4.0.p1 ] [ 4.0.p2 ] [ 4.1 ] [ 4.1.p1 ] [ 5.0 ] [ 5.0.p1 ] [ 5.1 ] [ 5.1.p1 ] [ 5.2 ] [ 5.2.p1 ] [ 5.2.p2 ] [ 6.0 ] [ 6.0.p1 ] [ 6.1 ] [ 6.2 ] [ 6.2.p1 ] [ 6.2.p2 ] [ 7.0 ] [ 7.0.p1 ] [ 7.1 ] [ 7.1.p1 ] [ 8.0 ] [ 8.0.p1 ] [ 8.1 ] [ 8.1.p1 ] [ 8.1.p2 ] [ 8.2 ] [ 8.2.p1 ] [ 8.3 ] [ 8.3.p1 ] [ 8.3.p2 ] [ 9.0 ] [ 9.0.p1 ] [ 9.0.p2 ] [ 9.1 ] [ 9.1.p1 ] [ 9.1.p2 ] [ 9.1.p3 ] [ 9.2 ] [ 9.2.p1 ] [ 9.2.p2 ] [ 9.2.p3 ] [ 9.2.p4 ] [ 9.3 ] [ 9.3.p1 ] [ 9.3.p2 ] [ 9.4 ] [ 9.4.p1 ] [ 9.4.p2 ] [ 9.4.p3 ] [ 9.4.p4 ] [ 9.5 ] [ 9.5.p1 ] [ 9.5.p2 ] [ 9.6 ] [ 9.6.p1 ] [ 9.6.p2 ] [ 9.6.p3 ] [ 9.6.p4 ] [ 10.0 ] [ 10.0.p1 ] [ 10.0.p2 ] [ 10.0.p3 ] [ 10.0.p4 ] [ 10.1 ] [ 10.1.p1 ] [ 10.1.p2 ] [ 10.1.p3 ] [ 10.2 ] [ 10.2.p1 ] [ 10.2.p2 ] [ 10.2.p3 ] [ 10.3 ] [ 10.3.p1 ] [ 10.3.p2 ] [ 10.3.p3 ] [ 10.4 ] [ 10.4.p1 ] [ 10.4.p2 ] [ 10.4.p3 ] [ 10.5 ] [ 10.5.p1 ] [ 10.6 ] [ 10.6.p1 ] [ 10.6.p2 ] [ 10.6.p3 ] [ 10.7 ] [ 10.7.p1 ] [ 10.7.p2 ] [ 10.7.p3 ] [ 10.7.p4 ] [ 11.0 ] [ 11.0.p1 ] [ 11.0.p2 ] [ 11.0.p3, ] [ 11.0.p4 ] [ 11.1 ] [ 11.1.1 ] [ 11.1.2 ] [ 11.1.3 ] [ 11.2 ] [ 11.2.1 ] [ 11.2.2 ] [ 11.3.0 ]

Diff markup

Differences between /examples/extended/medical/DICOM/dicomReader/src/DicomVFile.cc (Version 11.3.0) and /examples/extended/medical/DICOM/dicomReader/src/DicomVFile.cc (Version 11.1)


  1 //                                                  1 //
  2 // *******************************************      2 // ********************************************************************
  3 // * License and Disclaimer                         3 // * License and Disclaimer                                           *
  4 // *                                                4 // *                                                                  *
  5 // * The  Geant4 software  is  copyright of th      5 // * The  Geant4 software  is  copyright of the Copyright Holders  of *
  6 // * the Geant4 Collaboration.  It is provided      6 // * the Geant4 Collaboration.  It is provided  under  the terms  and *
  7 // * conditions of the Geant4 Software License      7 // * conditions of the Geant4 Software License,  included in the file *
  8 // * LICENSE and available at  http://cern.ch/      8 // * LICENSE and available at  http://cern.ch/geant4/license .  These *
  9 // * include a list of copyright holders.           9 // * include a list of copyright holders.                             *
 10 // *                                               10 // *                                                                  *
 11 // * Neither the authors of this software syst     11 // * Neither the authors of this software system, nor their employing *
 12 // * institutes,nor the agencies providing fin     12 // * institutes,nor the agencies providing financial support for this *
 13 // * work  make  any representation or  warran     13 // * work  make  any representation or  warranty, express or implied, *
 14 // * regarding  this  software system or assum     14 // * regarding  this  software system or assume any liability for its *
 15 // * use.  Please see the license in the file      15 // * use.  Please see the license in the file  LICENSE  and URL above *
 16 // * for the full disclaimer and the limitatio     16 // * for the full disclaimer and the limitation of liability.         *
 17 // *                                               17 // *                                                                  *
 18 // * This  code  implementation is the result      18 // * This  code  implementation is the result of  the  scientific and *
 19 // * technical work of the GEANT4 collaboratio     19 // * technical work of the GEANT4 collaboration.                      *
 20 // * By using,  copying,  modifying or  distri     20 // * By using,  copying,  modifying or  distributing the software (or *
 21 // * any work based  on the software)  you  ag     21 // * any work based  on the software)  you  agree  to acknowledge its *
 22 // * use  in  resulting  scientific  publicati     22 // * use  in  resulting  scientific  publications,  and indicate your *
 23 // * acceptance of all terms of the Geant4 Sof     23 // * acceptance of all terms of the Geant4 Software license.          *
 24 // *******************************************     24 // ********************************************************************
 25 //                                                 25 //
 26 #include "DicomVFile.hh"                           26 #include "DicomVFile.hh"
 27                                                    27 
 28 #include "dcmtk/dcmdata/dcdeftag.h"            << 
 29 #include "dcmtk/dcmdata/dcfilefo.h"                28 #include "dcmtk/dcmdata/dcfilefo.h"
                                                   >>  29 #include "dcmtk/dcmdata/dcdeftag.h"
 30 #include "dcmtk/dcmdata/dcpixel.h"                 30 #include "dcmtk/dcmdata/dcpixel.h"
 31 #include "dcmtk/dcmdata/dcpixseq.h"            << 
 32 #include "dcmtk/dcmdata/dcpxitem.h"                31 #include "dcmtk/dcmdata/dcpxitem.h"
                                                   >>  32 #include "dcmtk/dcmdata/dcpixseq.h"
 33                                                    33 
 34 //....oooOO0OOooo........oooOO0OOooo........oo     34 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 35 DicomVFile::DicomVFile(DcmDataset* dset) : the <<  35 DicomVFile::DicomVFile(DcmDataset* dset) : theDataset(dset)
 36                                                <<  36 {
                                                   >>  37 }
                                                   >>  38  
 37 //....oooOO0OOooo........oooOO0OOooo........oo     39 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 38 std::vector<G4double> DicomVFile::Read1Data(Dc <<  40 std::vector<G4double> DicomVFile::Read1Data( DcmDataset * dset, DcmTagKey tagKey, G4int nData )
 39 {                                                  41 {
 40   std::vector<G4double> dataV;                     42   std::vector<G4double> dataV;
 41                                                <<  43     
 42   for (int ii = 0; ii < nData; ++ii) {         <<  44   for(int ii=0; ii<nData; ++ii) {
 43     G4double data;                                 45     G4double data;
 44     Uint16 datai;                                  46     Uint16 datai;
 45     // see  http://support.dcmtk.org/docs/clas     47     // see  http://support.dcmtk.org/docs/classDcmItem.html for types
 46     if (dset->findAndGetFloat64(tagKey, data,  <<  48     if (dset->findAndGetFloat64(tagKey, data,ii).good() ) {
 47       dataV.push_back(data);                       49       dataV.push_back(data);
 48     }                                          <<  50     } else if (dset->findAndGetUint16(tagKey, datai,ii).good() ) {
 49     else if (dset->findAndGetUint16(tagKey, da << 
 50       dataV.push_back(datai);                      51       dataV.push_back(datai);
 51     }                                          <<  52     } else {
 52     else {                                     <<  53       G4cout <<"ERROR  (" << std::showbase // show the 0x prefix
 53       G4cout << "ERROR  (" << std::showbase  / <<  54              << std::internal // fill between the prefix and the number
 54              << std::internal  // fill between <<  55              << std::setfill('0') << std::hex << std::setw(4) << tagKey.getGroup() 
 55              << std::setfill('0') << std::hex  <<  56              << "," << tagKey.getElement() << ") "<< std::dec << ii << std::endl; 
 56              << tagKey.getElement() << ") " << <<  57       G4Exception("DicomHandler::ReadData",
 57       G4Exception("DicomHandler::ReadData", "" <<  58                   "",
 58                   (std::to_string(data) + G4St <<  59                   JustWarning,
 59                    + std::to_string(tagKey.get <<  60                   (std::to_string(data) +G4String(" Have not read (")
 60                    + ")" + " : " + std::to_str <<  61                    + std::to_string(tagKey.getGroup())+","+std::to_string(tagKey.getElement())
 61                     .c_str());                 <<  62                    +")"+" : "+std::to_string(ii)).c_str());
 62     }                                              63     }
 63   }                                                64   }
 64                                                <<  65   
 65   return dataV;                                    66   return dataV;
 66 }                                                  67 }
 67                                                    68 
                                                   >>  69 
 68 //....oooOO0OOooo........oooOO0OOooo........oo     70 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 69 OFString DicomVFile::Read1DataStr(DcmDataset*  <<  71 OFString DicomVFile::Read1DataStr( DcmDataset * dset, DcmTagKey tagKey )
 70 {                                                  72 {
 71   //  const char* data = "";                       73   //  const char* data = "";
 72   OFString data;                               <<  74   OFString data;  
 73   // see  http://support.dcmtk.org/docs/classD     75   // see  http://support.dcmtk.org/docs/classDcmItem.html for types
 74   if (dset->findAndGetOFString(tagKey, data).g <<  76   if (dset->findAndGetOFString(tagKey, data).good() ) {
 75   }                                            <<  77   } else {
 76   else {                                       <<  78     G4cout <<"ERROR  (" << std::showbase // show the 0x prefix
 77     G4cout << "ERROR  (" << std::showbase  //  <<  79            << std::internal // fill between the prefix and the number
 78            << std::internal  // fill between t <<  80            << std::setfill('0') << std::hex << std::setw(4) << tagKey.getGroup() << "," 
 79            << std::setfill('0') << std::hex << <<  81            << tagKey.getElement() << ") "<< std::dec << std::endl; 
 80            << tagKey.getElement() << ") " << s <<  82     G4Exception("DicomHandler::ReadData",
 81     G4Exception("DicomHandler::ReadData", "",  <<  83                 "",
 82                 (" Have not read (" + std::to_ <<  84                 JustWarning,
 83                  + std::to_string(tagKey.getEl <<  85                 (" Have not read (" + std::to_string(tagKey.getGroup())+","
 84                   .c_str());                   <<  86                  +std::to_string(tagKey.getElement())+")"+" : ").c_str());
 85   }                                                87   }
 86                                                    88 
 87   return data.c_str();                             89   return data.c_str();
 88 }                                                  90 }
 89                                                    91