Program: gdcm
Module: $RCSfile: RawToDicom.cxx,v $
Language: C++
- Date: $Date: 2006/07/17 13:27:57 $
- Version: $Revision: 1.6 $
+ Date: $Date: 2007/09/18 11:01:55 $
+ Version: $Revision: 1.13 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
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 <iostream>
#include <sstream>
+void ConvertSwapZone(int pixelSize, void *Raw, size_t RawSize);
+
+void ConvertSwapZone(int pixelSize, void *Raw, size_t RawSize)
+{
+ unsigned int i;
+ if ( pixelSize == 2 )
+ {
+ uint16_t *im16 = (uint16_t*)Raw;
+ for( i = 0; i < RawSize / 2; i++ )
+ {
+ im16[i]= (im16[i] >> 8) | (im16[i] << 8 );
+ }
+ }
+ else if ( pixelSize == 4 )
+ {
+ uint32_t s32;
+ uint16_t high;
+ uint16_t low;
+ uint32_t *im32 = (uint32_t*)Raw;
+
+ for( i = 0; i < RawSize / 4; i++ )
+ {
+ low = im32[i] & 0x0000ffff; // 3412
+ high = im32[i] >> 16;
+ s32 = low;
+ im32[i] = ( s32 << 16 ) | high;
+ }
+
+ }
+}
+
int main(int argc, char *argv[])
{
START_USAGE(usage)
" fileout=outputFileName ",
" rows=nb of Rows ",
" lines=nb of Lines, ",
- " pixeltype={8U|8S|16U|16S|32U|32S} ",
" [frames = nb of Frames] //defaulted to 1 ",
- " [samples = {1|3}} //defaulted to 1(1:Gray,3:RGB) ",
- " [patientname = Patient's name] ",
+ " pixeltype={8U|8S|16U|16S|32U|32S} ",
+ " [{b|l}] b:BigEndian,l:LittleEndian default : l ",
+ " [samples = {1|3}} //(1:Gray,3:RGB) defaulted to 1",
+ " [monochrome1] ",
+ " [studyid = ] [patientname = Patient's name] ",
" [debug] ",
" ",
- " debug : developper wants to run the program in 'debug mode' ",
+ " monochrome1 = user wants MONOCHROME1 photom. interp. (0=white) ",
+ " studyUID : *aware* user wants to add the serie ",
+ " to an already existing study ",
+ " debug : developper wants to run the program in 'debug mode' ",
FINISH_USAGE
- // Initialize Arguments Manager
- gdcm::ArgMgr *am= new gdcm::ArgMgr(argc, argv);
+ // ------------ Initialize Arguments Manager ----------------
+ GDCM_NAME_SPACE::ArgMgr *am= new GDCM_NAME_SPACE::ArgMgr(argc, argv);
if (argc == 1 || am->ArgMgrDefined("usage") )
{
int nZ = am->ArgMgrGetInt("frames", 1);
int samplesPerPixel = am->ArgMgrGetInt("samples", 1);
-
+ int b = am->ArgMgrDefined("b");
+ int l = am->ArgMgrDefined("l");
+
char *pixelType = am->ArgMgrWantString("pixeltype", usage);
-
+
+ bool monochrome1 = ( 0 != am->ArgMgrDefined("monochrome1") );
+
if (am->ArgMgrDefined("debug"))
- gdcm::Debug::DebugOn();
+ GDCM_NAME_SPACE::Debug::DebugOn();
+ bool userDefinedStudy = ( 0 != am->ArgMgrDefined("studyUID") );
+
+ const char *studyUID;
+ if (userDefinedStudy)
+ studyUID = am->ArgMgrGetString("studyUID");
+
+ // not described *on purpose* in the Usage !
+ bool userDefinedSerie = am->ArgMgrDefined("serieUID");
+ const char *serieUID;
+ if(userDefinedSerie)
+ serieUID = am->ArgMgrGetString("serieUID");
/* if unused Param we give up */
if ( am->ArgMgrPrintUnusedLabels() )
// ----------- End Arguments Manager ---------
+ /// \TODO Deal with all the images of a directory
// Read the Raw file
std::ifstream *Fp = new std::ifstream(inputFileName, std::ios::in | std::ios::binary);
return 0;
}
+ bool bigEndian = GDCM_NAME_SPACE::Util::IsCurrentProcessorBigEndian();
+
std::string strPixelType(pixelType);
int pixelSign;
int pixelSize;
if (strPixelType == "8S")
{
pixelSize = 1;
- pixelSign = 0;
+ pixelSign = 1;
}
else if (strPixelType == "8U")
{
pixelSize = 1;
- pixelSign = 1;
+ pixelSign = 0;
}
else if (strPixelType == "16S")
{
pixelSize = 2;
- pixelSign = 0;
+ pixelSign = 1;
}
else if (strPixelType == "16U")
{
pixelSize = 2;
- pixelSign = 1;
+ pixelSign = 0;
}
else if (strPixelType == "32S")
{
pixelSize = 4;
- pixelSign = 0;
+ pixelSign = 1;
}
else if (strPixelType == "32U")
{
pixelSize = 4;
- pixelSign = 1;
+ pixelSign = 0;
}
else
{
std::cout << "Wrong 'pixeltype' (" << strPixelType << ")" << std::endl;
return 1;
}
+
+ std::string strStudyUID;
+ std::string strSerieUID;
+
+ if (userDefinedStudy)
+ strSerieUID = studyUID;
+ else
+ strStudyUID = GDCM_NAME_SPACE::Util::CreateUniqueUID();
+ if (userDefinedStudy)
+ strSerieUID = serieUID;
+ else
+ strStudyUID = GDCM_NAME_SPACE::Util::CreateUniqueUID();
+
+
int dataSize = nX*nY*nZ*pixelSize*samplesPerPixel;
uint8_t *pixels = new uint8_t[dataSize];
Fp->read((char*)pixels, (size_t)dataSize);
-
-
+
+ if ( pixelSize !=1 && ( (l && bigEndian) || (b && ! bigEndian) ) )
+ {
+ ConvertSwapZone(pixelSize, pixels, dataSize);
+ }
+
// Create an empty FileHelper
- gdcm::FileHelper *fileH = gdcm::FileHelper::New();
+ GDCM_NAME_SPACE::FileHelper *fileH = GDCM_NAME_SPACE::FileHelper::New();
// Get the (empty) image header.
- gdcm::File *fileToBuild = fileH->GetFile();
-
-
- // If you want to use this program as a template to create
- // a 'Single Study UID - Single Serie UID' file set
- // keep the following lines out of the loop
+ GDCM_NAME_SPACE::File *fileToBuild = fileH->GetFile();
// 'Study Instance UID'
// The user is allowed to create his own Study,
// keeping the same 'Study Instance UID' for various images
// The user may add images to a 'Manufacturer Study',
// adding new Series to an already existing Study
- std::string studyUID = gdcm::Util::CreateUniqueUID();
- fileToBuild->InsertEntryString(studyUID, 0x0020,0x000d,"UI");
+
+ fileToBuild->InsertEntryString(strStudyUID,0x0020,0x000d,"UI"); // Study UID
// 'Serie Instance UID'
// The user is allowed to create his own Series,
// keeping the same 'Serie Instance UID' for various images
// The user shouldn't add any image to a 'Manufacturer Serie'
// but there is no way no to prevent him for doing that
- std::string serieUID = gdcm::Util::CreateUniqueUID();
- fileToBuild->InsertEntryString(serieUID, 0x0020,0x000e,"UI");
-
- // end of 'keep out of loop lines
+
+ fileToBuild->InsertEntryString(strSerieUID,0x0020,0x000e,"UI"); // Serie UID
std::ostringstream str;
str.str("");
str << samplesPerPixel;
-// If you deal with a Serie of images, it up to you to tell gdcm,
-// for each image, what are the values of :
+// If you deal with a Serie of images, as slices of a volume,
+// it up to you to tell gdcm, for each image, what are the values of :
+//
// 0020 0032 DS 3 Image Position (Patient)
// 0020 0037 DS 6 Image Orientation (Patient)
if (strlen(patientName) != 0)
fileToBuild->InsertEntryString(patientName,0x0010,0x0010, "PN"); // Patient's Name
-
-
+
+ // 0=white
+ if(monochrome1)
+ fileH->SetPhotometricInterpretationToMonochrome1();
+
// Set the image Pixel Data
fileH->SetImageData(pixels,dataSize);
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff