Fix names

[creaBruker.git] / lib / src1 / brukerobjectvaryingproperties.cpp

diff --git a/lib/src1/brukerobjectvaryingproperties.cpp b/lib/src1/brukerobjectvaryingproperties.cpp
index 67f649b65c2530aca6246ba169f579bfce82b10f..f33a396bb10a6754262e0d281d0867d8968e5a8b 100644 (file)
--- a/lib/src1/brukerobjectvaryingproperties.cpp
+++ b/lib/src1/brukerobjectvaryingproperties.cpp
@@ -10,7 +10,7 @@
 //
 //
 #include "brukerobjectvaryingproperties.h"
-//#include "brukerexception.h"
+#include "brukerexception.h"
 
 
 BrukerObjectVaryingProperties::BrukerObjectVaryingProperties()
@@ -43,7 +43,8 @@ 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 0;
+   else throw BrukerSizeException("TE", theValue, TE.size() ); 
 }
 
 /*void BrukerObjectVaryingProperties::computeTE(const std::vector< double >& theValue)
@@ -53,7 +54,8 @@ 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 1;
+   else throw BrukerSizeException("PositionP", theValue, PositionP.size() );    
 }
   
 /*void BrukerObjectVaryingProperties::computePositionP(const std::vector< double >& theValue)
@@ -63,7 +65,8 @@ 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 2;
+   else throw BrukerSizeException("PositionR", theValue, PositionR.size() );
 }
 
 /*void BrukerObjectVaryingProperties::computePositionR(const std::vector< double >& theValue)
@@ -73,7 +76,8 @@ 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 3;
+   else throw BrukerSizeException("PositionS", theValue, PositionS.size() );
 }
 
 /*void BrukerObjectVaryingProperties::computePositionS(const std::vector< double >& theValue)
@@ -83,7 +87,8 @@ 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 4;
+   else throw BrukerSizeException("AcquisitionOrder", theValue, AcquisitionOrder.size() );
 }
 
 /*void BrukerObjectVaryingProperties::computeAcquisitionOrder(const std::vector< int >& theValue1, const std::vector< int >& theValue2)
@@ -105,7 +110,8 @@ 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 9;
+   else throw BrukerSizeException("Orientation", theValue, Orientation.size() );
 }
 
 /*void BrukerObjectVaryingProperties::computeOrientation( std :: vector < double > & theValue1,const std::vector< int >& theValue2)
@@ -125,8 +131,10 @@ std :: vector < std :: vector < double > >  BrukerObjectVaryingProperties::getOr
 
 void BrukerObjectVaryingProperties::computeOrientation(std::map<std::string, BrukerFieldData> & BrukerHM, std::vector<int> & LoopStruct){
    if (BrukerHM[(std::string) "ACQ_grad_matrix"].GetDoubleValue().size() != LoopStruct[3]*9) throw 12;
-   if (LoopStruct.size() < 4 ) throw 13;
-
+   if (LoopStruct.size() < 4 ) 
+   //throw 13;
+      throw BrukerSizeException("LoopStruct", 4, LoopStruct.size() );
+      
    std::vector<double> Temp1D(3,0.0);
    std::vector<std::vector<double> > Temp2D;
    std::vector<std::vector<std::vector<double> > > Temp3D;
@@ -199,14 +207,22 @@ void BrukerObjectVaryingProperties::computePositionTimePerNR(std::map<std::strin
  */
 bool BrukerObjectVaryingProperties::init(std::map<std::string, BrukerFieldData> & BrukerHM, std::vector<int> & 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;
 }