Added more verbose error message when parsing .ang files that do not conform to the expected numeric types

Author: imikejackson

Documentation/ReferenceManual/ReleaseNotes/ReleaseNotes_6_4_0.md

@@ -40,6 +40,7 @@ The developers of DREAM.3D maintain a pair of Google Groups for discussions on t
 + DREAM3D Issue #748: Only write an ODF angle file if there are valid angles.
 + DREAM3D Issue #748: Change default number of Lambert squares to 64.
 + DREAM3D Issue #748: Example pipelines; rotate the sample reference frame before processing the data
++ EbsdLib: Added more verbose error message when parsing .ang files that do not conform to the expected numeric types.
 
 ### Fixed SIMPLView Issues ###
 

Source/EbsdLib/TSL/AngReader.cpp

@@ -451,7 +451,7 @@ void AngReader::readData(QFile& in, QByteArray& buf)
     {
       ss.string()->clear();
 
-      ss << "Error parsing the data line.\n"
+      ss << "Error parsing the data line (Numeric conversion). Error code is " << getErrorCode() << " and occurred at data column " << m_ErrorColumn << " (Zero Based)\n"
          << buf << "\n*** Header information ***\nRows=" << numRows << " EvenCols=" << nEvenCols << " OddCols=" << nOddCols << "  Calculated Data Points: " << totalDataPoints
          << "\n***Parsing Position ***\nCurrent Row: " << yChange << "  Current Column Index: " << col << "  Current Data Point Count: " << counter << "\n";
       setErrorMessage(*(ss.string()));
@@ -663,6 +663,7 @@ void AngReader::parseDataLine(QByteArray& line, size_t i)
    * Some TSL ang files do NOT have all 10 columns. Assume these are lacking the last
    * 2 columns and all the other columns are the same as above.
    */
+  m_ErrorColumn = 0;
   float p1 = 0.0f, p = 0.0f, p2 = 0.0f, x = -1.0f, y = -1.0f, iqual = -1.0f, conf = -1.0f, semSignal = -1.0f, fit = -1.0f;
   int ph = 0;
   size_t offset = 0;
@@ -675,6 +676,7 @@ void AngReader::parseDataLine(QByteArray& line, size_t i)
     if(!ok)
     {
       setErrorCode(-2501);
+      m_ErrorColumn = 0;
     }
     m_Phi1[offset] = p1;
   }
@@ -684,6 +686,7 @@ void AngReader::parseDataLine(QByteArray& line, size_t i)
     if(!ok)
     {
       setErrorCode(-2502);
+      m_ErrorColumn = 1;
     }
     m_Phi[offset] = p;
   }
@@ -693,6 +696,7 @@ void AngReader::parseDataLine(QByteArray& line, size_t i)
     if(!ok)
     {
       setErrorCode(-2503);
+      m_ErrorColumn = 2;
     }
     m_Phi2[offset] = p2;
   }
@@ -702,6 +706,7 @@ void AngReader::parseDataLine(QByteArray& line, size_t i)
     if(!ok)
     {
       setErrorCode(-2504);
+      m_ErrorColumn = 3;
     }
     m_X[offset] = x;
   }
@@ -711,6 +716,7 @@ void AngReader::parseDataLine(QByteArray& line, size_t i)
     if(!ok)
     {
       setErrorCode(-2505);
+      m_ErrorColumn = 4;
     }
     m_Y[offset] = y;
   }
@@ -720,6 +726,7 @@ void AngReader::parseDataLine(QByteArray& line, size_t i)
     if(!ok)
     {
       setErrorCode(-2506);
+      m_ErrorColumn = 5;
     }
     m_Iq[offset] = iqual;
   }
@@ -729,6 +736,7 @@ void AngReader::parseDataLine(QByteArray& line, size_t i)
     if(!ok)
     {
       setErrorCode(-2507);
+      m_ErrorColumn = 6;
     }
     m_Ci[offset] = conf;
   }
@@ -738,18 +746,29 @@ void AngReader::parseDataLine(QByteArray& line, size_t i)
     if(!ok)
     {
       setErrorCode(-2508);
+      m_ErrorColumn = 7;
     }
     m_PhaseData[offset] = ph;
   }
-
+  
   if(tokens.size() >= 9)
   {
     semSignal = tokens[8].toFloat(&ok);
+    if(!ok)
+    {
+      setErrorCode(-2509);
+      m_ErrorColumn = 8;
+    }
     m_SEMSignal[offset] = semSignal;
   }
   if(tokens.size() >= 10)
   {
     fit = tokens[9].toFloat(&ok);
+    if(!ok)
+    {
+      setErrorCode(-2510);
+      m_ErrorColumn = 9;
+    }
     m_Fit[offset] = fit;
   }
 }

Source/EbsdLib/TSL/AngReader.h

@@ -146,6 +146,7 @@ class EbsdLib_EXPORT AngReader : public EbsdReader
 
   private:
     AngPhase::Pointer   m_CurrentPhase;
+    int m_ErrorColumn = 0;
 
 
     void readData(QFile& in, QByteArray& buf);