From: jean-pierre roux Date: Wed, 27 May 2009 14:38:23 +0000 (+0000) Subject: Use exceptions not to hand any longer on illegal files X-Git-Tag: CREATOOLS.2-0-3~45 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaBruker.git;a=commitdiff_plain;h=e290be9f28dc24bfb58f239c098b67c2a76cfbd9 Use exceptions not to hand any longer on illegal files --- diff --git a/lib/src1/bruker2dicom.cxx b/lib/src1/bruker2dicom.cxx index 0473bb3..3dc9cbe 100644 --- a/lib/src1/bruker2dicom.cxx +++ b/lib/src1/bruker2dicom.cxx @@ -1,6 +1,7 @@ #include "bruker2dicom.h" #include #include +#include "brukerexception.h" #ifndef PATH_MAX // If not defined yet : do it #define PATH_MAX 2048 @@ -30,7 +31,8 @@ bool Bruker2Dicom::Execute() bool res=CreateDirectory(strDirNameOut); if (!res) { std::cout << "[" << OutputDirName << "] Directory creation failure " << std::endl; - exit (0); + //exit (0); + throw ( BrukerHopelessException ("Output directory creation failure ")); } std::string strDirNamein(InputDirName); @@ -71,7 +73,8 @@ bool Bruker2Dicom::Execute() if (!canOpen) { std::cout << "Hopeless! no 'subject' found" << std::endl; - exit(0); /// \TODO throw an exception ! + throw ( BrukerHopelessException ("Hopeless! no 'subject' found in root input directory ")); + //exit(0); /// \TODO throw an exception ! } else { @@ -79,8 +82,7 @@ bool Bruker2Dicom::Execute() } //br_subject.PrintSelf(); - // get info for 'Study Description' - + // get info for 'Study Description' BrukerFieldData b_name=br_subject.GetFieldData("SUBJECT_name_string"); std::string subject_name = b_name.GetStringValue()[0]; @@ -197,7 +199,8 @@ void Bruker2Dicom::DealWithNiveau1(std::string level1Directory, std::string curr if (!res) { std::cout << "[" << currentOutputDirName << "] Directory creation failure " << std::endl; - exit (0); + throw ( BrukerHopelessException ("Level 1 output directory creation failure ")); + // exit (0); } GDCM_NAME_SPACE::DirList dirList(level1Directory, false, true); // DON'T get recursively the list of files GDCM_NAME_SPACE::DirListType fileNames; @@ -265,7 +268,8 @@ void Bruker2Dicom::DealWithNiveau1(std::string level1Directory, std::string curr if (!canOpen) { std::cout << "Hopeless! neither 'method' nor 'imnd' found" << std::endl; - exit(0); /// \TODO throw an exception ! + throw ( BrukerHopelessException ("Hopeless! neither 'method' nor 'imnd' found ")); + //exit(0); /// \TODO throw an exception ! } } if (verbose) @@ -301,7 +305,8 @@ void Bruker2Dicom::DealWithNiveau2(std::string level2Directory, std::string curr if (!res) { std::cout << "[" << currentOutputDirName << "] Directory creation failure " << std::endl; - exit (0); + throw ( BrukerHopelessException ("Hopeless! Level2 output directory creation failure")); + //exit (0); } GDCM_NAME_SPACE::DirList dirList(level2Directory, false, true); // DON'T get recursively the list of files @@ -398,7 +403,8 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr if (!res) { std::cout << "[" << currentOutputDirName << "] Directory creation failure " << std::endl; - exit (0); + throw ( BrukerHopelessException ("Hopeless! Level3 output directory creation failure")); + //exit (0); } GDCM_NAME_SPACE::DirList dirList(level3Directory, false, true); // DON'T get recursively the list of files @@ -423,21 +429,23 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr sprintf(char_d3proc,"%s%c%s", level3Directory.c_str(), GDCM_NAME_SPACE::GDCM_FILESEPARATOR,"d3proc" ); if (verbose) - std::cout << "try d3proc: --- => [" << char_d3proc << "]" << std::endl; + std::cout << "d3proc: --- => [" << char_d3proc << "]" << std::endl; std::string str_d3proc(char_d3proc); canOpen = br_d3proc.LoadFile(str_d3proc); if (!canOpen) { std::cout << "Hopeless! no 'd3proc' found" << std::endl; - exit(0); /// \TODO throw an exception ! + throw ( BrukerHopelessException ("Hopeless! no 'd3proc' found")); + //exit(0); /// \TODO throw an exception ! } canOpen = br_d3proc.FillMap(); if (!canOpen) { std::cout << "Hopeless! FillMap failed on 'd3proc'" << std::endl; - exit(0); /// \TODO throw an exception ! + throw ( BrukerHopelessException ("Hopeless! FillMap failed on 'd3proc'")); + //exit(0); /// \TODO throw an exception ! } //-------------- end try d3proc; @@ -452,7 +460,7 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr // GDCM_NAME_SPACE::GDCM_FILESEPARATOR + // "d3proc"; if (verbose) - std::cout << "try reco --- => [" << char_reco << "]" << std::endl; + std::cout << "reco --- => [" << char_reco << "]" << std::endl; std::string str_reco(char_reco); canOpen = br_reco.LoadFile(str_reco); @@ -467,8 +475,9 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr canOpen = br_reco.LoadFile(str_reco); if (!canOpen) { - std::cout << "Hopeless! cannot find 'reco' in [" << str_reco << "]" << std::endl; - exit(0); /// \TODO throw an exception ! + std::cout << "Hopeless! cannot find 'reco' in [" << str_reco << "]" << std::endl; + throw ( BrukerHopelessException ("Hopeless! cannot find 'reco'")); + //exit(0); /// \TODO throw an exception ! } } @@ -476,7 +485,8 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr if (!canOpen) { std::cout << "Hopeless! FillMap failed on [" << str_reco << "]" << std::endl; - exit(0); /// \TODO throw an exception ! + throw ( BrukerHopelessException ("Hopeless!FillMap failed on 'reco'")); + //exit(0); /// \TODO throw an exception ! } //std::cout << "------------------------------------------------------------------------------------------------" << std::cout; // br_reco.PrintSelf(); @@ -488,16 +498,19 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr BrukerFieldData bX = br_d3proc.GetFieldData("IM_SIX"); int NX = bX.GetIntValue()[0]; - std::cout << "IM_SIX " << NX << std::endl; + if (verbose) + std::cout << "IM_SIX " << NX << std::endl; BrukerFieldData bY=br_d3proc.GetFieldData("IM_SIY"); int NY = bY.GetIntValue()[0]; - std::cout << "IM_SIY " << NY << std::endl; + if (verbose) + std::cout << "IM_SIY " << NY << std::endl; /// \todo : check if there are actually 3 dimensions or only 2 BrukerFieldData bZ= br_d3proc.GetFieldData("IM_SIZ"); int nbFrames = bZ.GetIntValue()[0]; - std::cout << "IM_SIZ " << nbFrames << std::endl; + if (verbose) + std::cout << "IM_SIZ " << nbFrames << std::endl; // WARNING DATTYPE is, either in {ip_short, ip_int, ip_char, ...}, or in {1, 2, 3, ...} @@ -525,18 +538,22 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr res = CreateDirectory( currentOutputMhdDirName ); if (!res) { std::cout << "[" << currentOutputDirName << "] Directory creation failure " << std::endl; - exit (0); + throw ( BrukerHopelessException ("Hopeless!FillMap failed on 'reco'")); + //exit (0); } if (verbose) std::cout << "Directory creation [" << currentOutputDirName << "]" << std::endl; } // end if mhd - std::cout << "nbFrames " << nbFrames << std::endl; - std::cout << "nbSlices " << nbSlices << std::endl; + if (verbose) + std::cout << "nbFrames " << nbFrames << std::endl; + if (verbose) + std::cout << "nbSlices " << nbSlices << std::endl; int k; int nbInstants = nbFrames/nbSlices; - std::cout << "nbInstants (deduced )" << nbInstants << std::endl; + if (verbose) + std::cout << "nbInstants (deduced )" << nbInstants << std::endl; int instantNb; int sliceNb; FILE *fp; // for MHD files @@ -552,7 +569,8 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr if (!fp) { std::cout << "Cannot open [" << original2dseqName << "] for reading" << std::endl; - exit (0); + throw ( BrukerHopelessException ("Hopeless! Cannot open '2dseq'")); + //exit (0); } unsigned char *buffer_2dseq = new unsigned char[NX*NY*pixelSize*nbSlices*nbInstants]; @@ -561,13 +579,21 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr // This one will be important! // --------------------------- - imageSet = CreateImageSet ( ); + try { + imageSet = CreateImageSet ( ); + } + catch (BrukerInitException& e) + { + std::cout << "Exception " << e.what() << std::endl; + return; + } serieNumber++; strSerieUID = GDCM_NAME_SPACE::Util::CreateUniqueUID(); if (nbInstants==1) // creer un seul fichier .mhd pour toutes les Slices! (images natives) { - std::cout << "Single instant : do not split" << std::endl; + if (verbose) + std::cout << "Single instant : do not split" << std::endl; if (mhd) { sprintf(outputMhdFileName, "%s%cMhdData_All_the_Slices.mhd", currentOutputMhdDirName, @@ -576,7 +602,8 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr if (!fp) { std::cout << "Cannot open [" << outputMhdFileName << "] for writting" << std::endl; - exit(0); + throw ( BrukerHopelessException ("Hopeless! Cannot open mhd file for writting")); + //exit(0); } else { @@ -601,6 +628,7 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr if (!fp) { std::cout << "Cannot open [" << output2dseqSliceFileName << "] for writting" << std::endl; + throw ( BrukerHopelessException ("Hopeless! Cannot open 2dseq file for writting")); } else { @@ -656,7 +684,8 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr if (!fp) { std::cout << "Cannot open [" << outputMhdFileName << "] for writting" << std::endl; - exit(0); + throw ( BrukerHopelessException ("Hopeless! Cannot open mhd file for writting")); + //exit(0); } else { @@ -685,7 +714,8 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr if (!fp) { std::cout << "Cannot open [" << output2dseqSliceFileName << "] for writting" << std::endl; - exit (0); + throw ( BrukerHopelessException ("Hopeless! Cannot open 2dseqSliceFile file for writting")); + //exit (0); } int frameSize = NX*NY*pixelSize; for (instantNb=0; instantNb Bruker2Dicom::CreateImageSet ( ) std::vector tempVect = br_acqp.GetLoopStructure() ; std::map map = br_acqp.GetBrukerHeaderMap(); bool result = br_acqp.ObjectVaryingProperties.init(map,tempVect); + + if (result == false) + { + throw ( BrukerInitException ("Bruker2Dicom::CreateImageSet failure ") ); + } br_acqp.SetImageLoopStructure(); br_acqp.SetBrukerImageList(); @@ -1205,7 +1241,7 @@ void Bruker2Dicom::MakeDicomImage(unsigned char *tabPixels, char charImageOrientation[256]; /* -std::cout << "try charImageOrientation " << +std::cout << "charImageOrientation " << imageSet[imgNum].getRotationMatrixRPS2XYZ()[0][0] << " " << imageSet[imgNum].getRotationMatrixRPS2XYZ()[0][1] << " " << imageSet[imgNum].getRotationMatrixRPS2XYZ()[0][2] << " " << diff --git a/lib/src1/brukerexception.h b/lib/src1/brukerexception.h index 94f8375..27a107a 100644 --- a/lib/src1/brukerexception.h +++ b/lib/src1/brukerexception.h @@ -38,4 +38,45 @@ private: }; + +class creaBruker_EXPORT BrukerInitException: public std::exception +{ +public: + BrukerInitException( const std::string& message + ) + : m_message(message) + {} + + ~BrukerInitException() throw() {} + + virtual const char* what() const throw() { + return m_message.c_str(); + } + + +private: + std::string m_message; + +}; + +class creaBruker_EXPORT BrukerHopelessException: public std::exception +{ +public: + BrukerHopelessException( const std::string& message + ) + : m_message(message) + {} + + ~BrukerHopelessException() throw() {} + + virtual const char* what() const throw() { + return m_message.c_str(); + } + + +private: + std::string m_message; + +}; + #endif diff --git a/lib/src1/brukerobjectvaryingproperties.cpp b/lib/src1/brukerobjectvaryingproperties.cpp index 67f649b..2d6f733 100644 --- a/lib/src1/brukerobjectvaryingproperties.cpp +++ b/lib/src1/brukerobjectvaryingproperties.cpp @@ -199,14 +199,22 @@ void BrukerObjectVaryingProperties::computePositionTimePerNR(std::map & BrukerHM, std::vector & LoopStruct) { - computeAcquisitionOrder( BrukerHM, LoopStruct); - computeOrientation(BrukerHM, LoopStruct); - computePositionP(BrukerHM); - computePositionR(BrukerHM); - computePositionS(BrukerHM); - computePositionTimePerNR(BrukerHM, LoopStruct); - computeTE(BrukerHM); - + try { + computeAcquisitionOrder (BrukerHM, LoopStruct); + computeOrientation (BrukerHM, LoopStruct); + computePositionP (BrukerHM); + computePositionR (BrukerHM); + computePositionS (BrukerHM); + computePositionTimePerNR(BrukerHM, LoopStruct); + computeTE (BrukerHM); + } + + catch (...) + { + std::cout << "Failure during BrukerObjectVaryingProperties::init " << std::endl; + return false; + } + return true; }