From c5ac3331cd0380dd44c10ccb9a17ed8587380144 Mon Sep 17 00:00:00 2001 From: jpr Date: Tue, 26 Jun 2007 15:42:14 +0000 Subject: [PATCH] Some updates --- Example/CMakeLists.txt | 104 ++++++++++++++-------------- Example/DenseMultiFramesToDicom.cxx | 9 +-- Example/WriteDicomSimple.cxx | 18 ++--- 3 files changed, 67 insertions(+), 64 deletions(-) diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt index 0a5ad0f9..59317ac0 100644 --- a/Example/CMakeLists.txt +++ b/Example/CMakeLists.txt @@ -4,57 +4,59 @@ INCLUDE_DIRECTORIES( ${GDCM_BINARY_DIR} ${GDCM_BINARY_DIR}/src) SET(EXAMPLE_SOURCES -#names starting with 'ex' are examples -#Txt2Mat -#exDicomRTStructSetFile -#exExtractCSA -exReadPapyrus -exReadWriteFile -exColorToRGB -exGrey2RGB -exGC -exImageLighten -#exInLine -exOverlaysACR -exOverlaysDCM -exCurveData -exExtractTag -exSerieHelper -exXCoherentFileSet -exExtractDicomTags -exMoveImagesToSingleSerieUID -#the following are utilities -PrintDicomDir -PrintFile -MakeDicomDir -AnonymizeDicomDir -# without loading it as a gdcm::DicomDir -Anonymize -# for full gdcm readable files -AnonymizeNoLoad -# without loading the Pixel Data -AnonymizeMultiPatient -# without loading the Pixel Data -PatchHeader -ToInTag -#MagnetomVisionToBrucker -ReWrite -ReWriteExtended -RawToDicom -TestValidate -ToMRIregister -#BatchUncompress -ExtractOverlays -#the following will be transformed into 'examples', or 'utilities' -# or will be removed## Better you don't use them (not fully checked ...) -FindTags -FlatHashTablePrint -Volume2Dicom -WriteDicomSimple -WriteRead -#WriteDicomAsJPEG -exCTPET -#Slice + #names starting with 'ex' are examples + #Txt2Mat + #exDicomRTStructSetFile + #exExtractCSA + exReadPapyrus + exReadWriteFile + exColorToRGB + exGrey2RGB + exGC + exImageLighten + #exInLine + exOverlaysACR + exOverlaysDCM + exCurveData + exExtractTag + exSerieHelper + exXCoherentFileSet + exExtractDicomTags + exMoveImagesToSingleSerieUID + #the following are utilities + PrintDicomDir + PrintFile + MakeDicomDir + AnonymizeDicomDir + # without loading it as a gdcm::DicomDir + Anonymize + # for full gdcm readable files + AnonymizeNoLoad + # without loading the Pixel Data + AnonymizeMultiPatient + # without loading the Pixel Data + PatchHeader + ToInTag + ReWrite + ReWriteExtended + RawToDicom + TestValidate + ToMRIregister + DenseMultiFramesToDicom + + #BatchUncompress + ExtractOverlays + #the following will be transformed into 'examples', or 'utilities' + # or will be removed + # Better you don't use them (not fully checked ...) + FindTags + FlatHashTablePrint + Volume2Dicom + WriteDicomSimple + WriteRead + #WriteDicomAsJPEG + exCTPET + #Slice ) FOREACH(name ${EXAMPLE_SOURCES}) diff --git a/Example/DenseMultiFramesToDicom.cxx b/Example/DenseMultiFramesToDicom.cxx index 48a74617..cba55e5b 100755 --- a/Example/DenseMultiFramesToDicom.cxx +++ b/Example/DenseMultiFramesToDicom.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: DenseMultiFramesToDicom.cxx,v $ Language: C++ - Date: $Date: 2007/06/21 15:06:12 $ - Version: $Revision: 1.5 $ + Date: $Date: 2007/06/26 15:42:14 $ + Version: $Revision: 1.6 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -93,7 +93,7 @@ The terms brightness and contrast are not used in radiology imaging int main(int argc, char *argv[]) { START_USAGE(usage) - " \n DenseMultiFramessToDicom : \n", + " \n DenseMultiFramesToDicom : \n", " - explores recursively the given (single Patient, single Study) directory", " - examines the '.txt' files ", " - Converts the files into 16 bits Dicom files, ", @@ -103,7 +103,7 @@ int main(int argc, char *argv[]) " [studyUID = ] [patName = ] ", " [listonly] [verbose] [debug] ", " ", - "studyUID : *aware* user wants to add the serie ", + " studyUID : *aware* user wants to add the serie ", " to an already existing study ", " verbose : user wants to run the program in 'verbose mode' ", " debug : *developer* wants to run the program in 'debug mode' ", @@ -306,6 +306,7 @@ All pixels with zero strain values are outside the masks. } //float *f = new float(nx*ny); + // -->float *f = new float[nx*ny]; // Would be better ! float *f = (float *) malloc(nx*ny*nf*sizeof(float)); // float mini = FLT_MAX, maxi = FLT_MIN; float val; diff --git a/Example/WriteDicomSimple.cxx b/Example/WriteDicomSimple.cxx index d2946978..80856449 100644 --- a/Example/WriteDicomSimple.cxx +++ b/Example/WriteDicomSimple.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: WriteDicomSimple.cxx,v $ Language: C++ - Date: $Date: 2007/05/23 14:18:04 $ - Version: $Revision: 1.19 $ + Date: $Date: 2007/06/26 15:42:14 $ + Version: $Revision: 1.20 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -96,31 +96,31 @@ int main(int argc, char *argv[]) // Set the image size str.str(""); str << SIZE_X; - header->InsertEntryString(str.str(),0x0028,0x0011); // Columns + header->InsertEntryString(str.str(),0x0028,0x0011,"US"); // Columns str.str(""); str << SIZE_Y; - header->InsertEntryString(str.str(),0x0028,0x0010); // Rows + header->InsertEntryString(str.str(),0x0028,0x0010,"US"); // Rows // Set the pixel type str.str(""); str << COMPONENT_SIZE * 8; - header->InsertEntryString(str.str(),0x0028,0x0100); // Bits Allocated - header->InsertEntryString(str.str(),0x0028,0x0101); // Bits Stored + header->InsertEntryString(str.str(),0x0028,0x0100,"US"); // Bits Allocated + header->InsertEntryString(str.str(),0x0028,0x0101,"US"); // Bits Stored str.str(""); str << ( COMPONENT_SIZE * 8 ) - 1; - header->InsertEntryString(str.str(),0x0028,0x0102); // High Bit + header->InsertEntryString(str.str(),0x0028,0x0102,"US"); // High Bit // Set the pixel representation str.str(""); str << "0"; // Unsigned - header->InsertEntryString(str.str(),0x0028,0x0103); // Pixel Representation + header->InsertEntryString(str.str(),0x0028,0x0103,"US"); // Pixel Representation // Set the samples per pixel str.str(""); str << COMPONENT; - header->InsertEntryString(str.str(),0x0028,0x0002); // Samples per Pixel + header->InsertEntryString(str.str(),0x0028,0x0002,"US"); // Samples per Pixel // Step 2 : Create the output image -- 2.46.1