BUG: AngReader - only fixOrderData on square grids?

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
BlueQuartzSoftware · Oct 3, 2023 · 4c85341 · 4c85341
1 parent 7d87e2c
commit 4c85341
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 38 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # set project's name
-project(EbsdLibProj VERSION 1.0.25)
+project(EbsdLibProj VERSION 1.0.26)
 
 # ---------- Setup output Directories -------------------------
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY

diff --git a/Source/EbsdLib/IO/TSL/AngReader.cpp b/Source/EbsdLib/IO/TSL/AngReader.cpp
@@ -406,27 +406,26 @@ int AngReader::readFile()
       setErrorMessage(result.second);
       return result.first;
     }
-  }
-
-  std::vector<std::string> arrayNames = {"Phi1", "Phi", "Phi2", "X Position", "Y Position", "Image Quality", "Confidence Index", "PhaseData", "SEM Signal", "Fit"};
-  for(const auto& arrayName : arrayNames)
-  {
-    void* oldArray = getPointerByName(arrayName);
 
-    if(getPointerType(arrayName) == EbsdLib::NumericTypes::Type::Float)
-    {
-      CopyTupleUsingIndexList<float>(oldArray, indexMap);
-    }
-    else if(getPointerType(arrayName) == EbsdLib::NumericTypes::Type::Int32)
+    std::vector<std::string> arrayNames = {"Phi1", "Phi", "Phi2", "X Position", "Y Position", "Image Quality", "Confidence Index", "PhaseData", "SEM Signal", "Fit"};
+    for(const auto& arrayName : arrayNames)
     {
-      CopyTupleUsingIndexList<int32_t>(oldArray, indexMap);
-    }
-    else
-    {
-      std::cout << "Type returned was not of Float or int32. The Array name probably isn't correct." << std::endl;
+      void* oldArray = getPointerByName(arrayName);
+
+      if(getPointerType(arrayName) == EbsdLib::NumericTypes::Type::Float)
+      {
+        CopyTupleUsingIndexList<float>(oldArray, indexMap);
+      }
+      else if(getPointerType(arrayName) == EbsdLib::NumericTypes::Type::Int32)
+      {
+        CopyTupleUsingIndexList<int32_t>(oldArray, indexMap);
+      }
+      else
+      {
+        std::cout << "Type returned was not of Float or int32. The Array name probably isn't correct." << std::endl;
+      }
     }
   }
-
   return getErrorCode();
 }
 

diff --git a/Source/EbsdLib/IO/TSL/H5OIMReader.cpp b/Source/EbsdLib/IO/TSL/H5OIMReader.cpp
@@ -169,33 +169,36 @@ int H5OIMReader::readFile()
   }
 
   std::vector<int64_t> indexMap;
-  std::pair<int, std::string> result = fixOrderOfData(indexMap);
-
-  if(result.first < 0)
-  {
-    std::cout << result.second << std::endl;
-    return result.first;
-  }
-
-  std::vector<std::string> arrayNames = {"Phi1", "Phi", "Phi2", "X Position", "Y Position", "Image Quality", "Confidence Index", "PhaseData", "SEM Signal", "Fit"};
-  for(const auto& arrayName : arrayNames)
+  std::string grid = getGrid();
+  if(grid.find(EbsdLib::Ang::SquareGrid) == 0)
   {
-    void* oldArray = getPointerByName(arrayName);
+    std::pair<int, std::string> result = fixOrderOfData(indexMap);
 
-    if(getPointerType(arrayName) == EbsdLib::NumericTypes::Type::Float)
-    {
-      CopyTupleUsingIndexList<float>(oldArray, indexMap);
-    }
-    else if(getPointerType(arrayName) == EbsdLib::NumericTypes::Type::Int32)
+    if(result.first < 0)
     {
-      CopyTupleUsingIndexList<int32_t>(oldArray, indexMap);
+      std::cout << result.second << std::endl;
+      return result.first;
     }
-    else
+
+    std::vector<std::string> arrayNames = {"Phi1", "Phi", "Phi2", "X Position", "Y Position", "Image Quality", "Confidence Index", "PhaseData", "SEM Signal", "Fit"};
+    for(const auto& arrayName : arrayNames)
     {
-      std::cout << "Type returned was not of Float or int32. The Array name probably isn't correct." << std::endl;
+      void* oldArray = getPointerByName(arrayName);
+
+      if(getPointerType(arrayName) == EbsdLib::NumericTypes::Type::Float)
+      {
+        CopyTupleUsingIndexList<float>(oldArray, indexMap);
+      }
+      else if(getPointerType(arrayName) == EbsdLib::NumericTypes::Type::Int32)
+      {
+        CopyTupleUsingIndexList<int32_t>(oldArray, indexMap);
+      }
+      else
+      {
+        std::cout << "Type returned was not of Float or int32. The Array name probably isn't correct." << std::endl;
+      }
     }
   }
-
   return getErrorCode();
 }