Fix names

diff --git a/lib/src1/bruker2dicom.cxx b/lib/src1/bruker2dicom.cxx
index 3dc9cbefc91a74057c9a43ab26cbfcc460749ecc..94f235e078dea98d1bdc23c4d5f5091a93e0faab 100644 (file)
--- a/lib/src1/bruker2dicom.cxx
+++ b/lib/src1/bruker2dicom.cxx
@@ -159,7 +159,7 @@ bool Bruker2Dicom::Execute()
          cleanString(acqp_method);
 
          BrukerFieldData b_list_size = br_acqp.GetFieldData("ACQ_O1_list_size");
-         b_list_size.PrintSelf(); //JP
+         //b_list_size.PrintSelf(); //JP
  
          nbSlices =  b_list_size.GetIntValue()[0];
 
@@ -848,7 +848,7 @@ void Bruker2Dicom::dealWithCarto(GDCM_NAME_SPACE::DirListType &fileNames, int NX
 
          while (code[icode][0] != 0)
          {
-            sprintf(file_name_ident, "2dseq_%s",code[icode]); // e.g  "2dseq_ADC"
+            sprintf(file_name_ident, "2dseq.%s",code[icode]); // e.g  "2dseq_ADC"
             std::string::size_type loc = (*it).rfind(file_name_ident); 
 
             if ( loc != std::string::npos )
@@ -1061,7 +1061,8 @@ void Bruker2Dicom::getImhDataType(BrukerFieldData &bDPT, std::string &mhdDataPix
     else
     {
          int brukerDataPixelType = bDPT.GetIntValue()[0];
-         std::cout << "DATTYPE " << brukerDataPixelType << std::endl;          
+         if (verbose)
+           std::cout << "DATTYPE " << brukerDataPixelType << std::endl;          
          //std::string brukerDataPixelType = br_d3proc.GetFieldData("DATTYPE").GetStringValue()[0];
  
 // Cross your fingers !!!

diff --git a/lib/src1/brukerobjectvaryingproperties.cpp b/lib/src1/brukerobjectvaryingproperties.cpp
index 4d1e5758196bc937e2bf6e36c5776983a1a6721a..f33a396bb10a6754262e0d281d0867d8968e5a8b 100644 (file)
--- a/lib/src1/brukerobjectvaryingproperties.cpp
+++ b/lib/src1/brukerobjectvaryingproperties.cpp
@@ -44,7 +44,7 @@ void BrukerObjectVaryingProperties::computeTE(std::map<std::string, BrukerFieldD
 double BrukerObjectVaryingProperties::getTE(unsigned int theValue) const{
    if (theValue < TE.size() ) {return TE[theValue];}
    //else throw 0;
-   else throw(BrukerSizeException("TE", theValue, TE.size() ); 
+   else throw BrukerSizeException("TE", theValue, TE.size() ); 
 }
 
 /*void BrukerObjectVaryingProperties::computeTE(const std::vector< double >& theValue)
@@ -55,7 +55,7 @@ double BrukerObjectVaryingProperties::getTE(unsigned int theValue) const{
 double  BrukerObjectVaryingProperties::getPositionP(unsigned int theValue) const{
    if (theValue < PositionP.size() ) return PositionP[theValue];
 //   else throw 1;
-   else throw(BrukerSizeException("PositionP", theValue, PositionP.size() );    
+   else throw BrukerSizeException("PositionP", theValue, PositionP.size() );    
 }
   
 /*void BrukerObjectVaryingProperties::computePositionP(const std::vector< double >& theValue)
@@ -66,7 +66,7 @@ double  BrukerObjectVaryingProperties::getPositionP(unsigned int theValue) const
 double  BrukerObjectVaryingProperties::getPositionR(unsigned int theValue) const{
    if (theValue < PositionR.size() ) return PositionR[theValue];
 //   else throw 2;
-   else throw(BrukerSizeException("PositionR", theValue, PositionR.size() );
+   else throw BrukerSizeException("PositionR", theValue, PositionR.size() );
 }
 
 /*void BrukerObjectVaryingProperties::computePositionR(const std::vector< double >& theValue)
@@ -77,7 +77,7 @@ double  BrukerObjectVaryingProperties::getPositionR(unsigned int theValue) const
 double  BrukerObjectVaryingProperties::getPositionS(unsigned int theValue) const{
    if (theValue < PositionS.size() )  return PositionS[theValue];
 //   else throw 3;
-   else throw(BrukerSizeException("PositionS", theValue, PositionS.size() );
+   else throw BrukerSizeException("PositionS", theValue, PositionS.size() );
 }
 
 /*void BrukerObjectVaryingProperties::computePositionS(const std::vector< double >& theValue)
@@ -88,7 +88,7 @@ double  BrukerObjectVaryingProperties::getPositionS(unsigned int theValue) const
 int  BrukerObjectVaryingProperties::getAcquisitionOrder(unsigned int theValue) const{
    if (theValue <AcquisitionOrder.size())  return AcquisitionOrder[theValue];
    //else throw 4;
-   else throw(BrukerSizeException("AcquisitionOrder", theValue, AcquisitionOrder.size() );
+   else throw BrukerSizeException("AcquisitionOrder", theValue, AcquisitionOrder.size() );
 }
 
 /*void BrukerObjectVaryingProperties::computeAcquisitionOrder(const std::vector< int >& theValue1, const std::vector< int >& theValue2)
@@ -111,7 +111,7 @@ void BrukerObjectVaryingProperties::computeAcquisitionOrder(std::map<std::string
 std :: vector < std :: vector < double > >  BrukerObjectVaryingProperties::getOrientation(unsigned int theValue) const{
    if (theValue < Orientation.size())return Orientation[theValue];
    //else throw 9;
-   else throw(BrukerSizeException("Orientation", theValue, Orientation.size() );
+   else throw BrukerSizeException("Orientation", theValue, Orientation.size() );
 }
 
 /*void BrukerObjectVaryingProperties::computeOrientation( std :: vector < double > & theValue1,const std::vector< int >& theValue2)
@@ -133,7 +133,7 @@ void BrukerObjectVaryingProperties::computeOrientation(std::map<std::string, Bru
    if (BrukerHM[(std::string) "ACQ_grad_matrix"].GetDoubleValue().size() != LoopStruct[3]*9) throw 12;
    if (LoopStruct.size() < 4 ) 
    //throw 13;
-      throw(BrukerSizeException("LoopStruct", 4, LoopStruct.size() );
+      throw BrukerSizeException("LoopStruct", 4, LoopStruct.size() );
       
    std::vector<double> Temp1D(3,0.0);
    std::vector<std::vector<double> > Temp2D;