add origin updating to base reader class and overload in OIM where its not needed

Author: nyoungbq

src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OimData.cpp

@@ -20,6 +20,18 @@ Result<> ReadH5OimData::operator()()
   return execute();
 }
 
+// -----------------------------------------------------------------------------
+Result<> ReadH5OimData::updateOrigin(const std::string& scanName)
+{
+  /*
+   * This function intentionally has no logic in order to avoid extra calculations;
+   * The origins were set in preflight, but this file type is an outlier in that it stores
+   * the origin in the header. Thus, this function overrides the general need to access
+   * the X and Y positions data as seen in the super/baseclass.
+   */
+  return {};
+}
+
 // -----------------------------------------------------------------------------
 Result<> ReadH5OimData::copyRawEbsdData(int index)
 {

src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OimData.hpp

@@ -26,6 +26,7 @@ class ORIENTATIONANALYSIS_EXPORT ReadH5OimData : public IEbsdOemReader<H5OIMRead
 
   Result<> copyRawEbsdData(int index) override;
   Result<> copyRawEbsdData(const std::string& scanName) override;
+  Result<> updateOrigin(const std::string& scanName) override;
 };
 
 } // namespace nx::core

src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/IEbsdOemReader.hpp

@@ -81,6 +81,13 @@ class ORIENTATIONANALYSIS_EXPORT IEbsdOemReader
         auto& imageGeom = m_DataStructure.getDataRefAs<ImageGeom>(DataPath({currentScanName}));
         imageGeom.setUnits(IGeometry::LengthUnit::Micrometer);
         copyDataResults = copyRawEbsdData(currentScanName);
+
+        if(copyDataResults.invalid())
+        {
+          return copyDataResults;
+        }
+
+        copyDataResults = updateOrigin(currentScanName);
       }
 
       if(copyDataResults.invalid())
@@ -123,10 +130,11 @@ class ORIENTATIONANALYSIS_EXPORT IEbsdOemReader
     }
 
     // These arrays are purposely created using the AngFile constant names for BOTH the Oim and the Esprit readers!
-    auto& crystalStructures = m_DataStructure.getDataRefAs<UInt32Array>(imagePath.createChildPath(m_InputValues->CellEnsembleAttributeMatrixName).createChildPath(EbsdLib::AngFile::CrystalStructures));
-    auto& materialNames = m_DataStructure.getDataRefAs<StringArray>(imagePath.createChildPath(m_InputValues->CellEnsembleAttributeMatrixName).createChildPath(EbsdLib::AngFile::MaterialName));
+    const DataPath cellEnsembleAM = imagePath.createChildPath(m_InputValues->CellEnsembleAttributeMatrixName);
+    auto& crystalStructures = m_DataStructure.getDataRefAs<UInt32Array>(cellEnsembleAM.createChildPath(EbsdLib::AngFile::CrystalStructures));
+    auto& materialNames = m_DataStructure.getDataRefAs<StringArray>(cellEnsembleAM.createChildPath(EbsdLib::AngFile::MaterialName));
     auto& latticeConstantsArray =
-        m_DataStructure.getDataRefAs<Float32Array>(imagePath.createChildPath(m_InputValues->CellEnsembleAttributeMatrixName).createChildPath(EbsdLib::AngFile::LatticeConstants));
+        m_DataStructure.getDataRefAs<Float32Array>(cellEnsembleAM.createChildPath(EbsdLib::AngFile::LatticeConstants));
     Float32Array::store_type* latticeConstants = latticeConstantsArray.getDataStore();
 
     crystalStructures[0] = EbsdLib::CrystalStructure::UnknownCrystalStructure;
@@ -157,6 +165,23 @@ class ORIENTATIONANALYSIS_EXPORT IEbsdOemReader
 
   virtual Result<> copyRawEbsdData(int index) = 0;
   virtual Result<> copyRawEbsdData(const std::string& scanName) = 0;
+  virtual Result<> updateOrigin(const std::string& scanName)
+  {
+    const DataPath imagePath({scanName});
+
+    auto& imageGeom = m_DataStructure.getDataRefAs<ImageGeom>(imagePath);
+    const usize totalCells = imageGeom.getNumberOfCells();
+
+    const auto* xPos = reinterpret_cast<float32*>(m_Reader->getPointerByName(EbsdLib::Ang::XPosition));
+    const auto* yPos = reinterpret_cast<float32*>(m_Reader->getPointerByName(EbsdLib::Ang::YPosition));
+
+    float32 minX = *std::min_element(xPos, xPos + totalCells);
+    float32 minY = *std::min_element(yPos, yPos + totalCells);
+
+    imageGeom.setOrigin(minX, minY, 0.0f);
+
+    return {};
+  }
 
 protected:
   std::shared_ptr<T> m_Reader;