Store DataObject::Type in the DataObjectModification struct.

Signed-off-by: Michael Jackson <[email protected]>
BlueQuartzSoftware · Oct 25, 2023 · 58b2165 · 58b2165
1 parent 17a2a05
commit 58b2165
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/...ntationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.cpp b/...ntationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.cpp
@@ -189,7 +189,8 @@ IFilter::PreflightResult BadDataNeighborOrientationCheckFilter::preflightImpl(co
                                            fmt::format("The following DataArrays all must have equal number of tuples but this was not satisfied.\n{}", tupleValidityCheck.error()))};
   }
 
-  resultOutputActions.value().modifiedActions.emplace_back(DataObjectModification{pGoodVoxelsArrayPathValue, DataObjectModification::ModifiedType::DataArrayModified});
+  resultOutputActions.value().modifiedActions.emplace_back(
+      DataObjectModification{pGoodVoxelsArrayPathValue, DataObjectModification::ModifiedType::Modified, dataStructure.getData(pGoodVoxelsArrayPathValue)->getDataObjectType()});
 
   // Return both the resultOutputActions and the preflightUpdatedValues via std::move()
   return {std::move(resultOutputActions), std::move(preflightUpdatedValues)};

diff --git a/...Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.cpp b/...Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.cpp
@@ -74,7 +74,8 @@ IFilter::PreflightResult RotateEulerRefFrameFilter::preflightImpl(const DataStru
 
   std::vector<PreflightValue> preflightUpdatedValues;
 
-  resultOutputActions.value().modifiedActions.emplace_back(DataObjectModification{pCellEulerAnglesArrayPathValue, DataObjectModification::ModifiedType::DataArrayModified});
+  resultOutputActions.value().modifiedActions.emplace_back(
+      DataObjectModification{pCellEulerAnglesArrayPathValue, DataObjectModification::ModifiedType::Modified, dataStructure.getData(pCellEulerAnglesArrayPathValue)->getDataObjectType()});
 
   // Return both the resultOutputActions and the preflightUpdatedValues via std::move()
   return {std::move(resultOutputActions), std::move(preflightUpdatedValues)};

diff --git a/src/complex/Filter/Output.hpp b/src/complex/Filter/Output.hpp
@@ -115,18 +115,14 @@ struct COMPLEX_EXPORT DataObjectModification
 
   enum class ModifiedType : uint64
   {
-    DataArrayModified = 0,
-    DataArrayPossiblyDeleted = 1,
-    AttributeMatrixModified = 2,
-    DataGroupModified = 3,
-    AttributeMatrixPossiblyDeleted = 4,
-    DataGroupPossiblyDeleted = 5,
-    GeometryModified = 6,
-    GeometryPossiblyDeleted = 7
+    Modified = 0,
+    PossiblyDeleted = 1,
+    Unknown = 2,
   };
 
   DataPath modifiedPath;
-  ModifiedType modifiedType;
+  ModifiedType modifiedType = ModifiedType::Unknown;
+  DataObject::Type dataObjectType = DataObject::Type::Unknown;
 };
 
 /**

diff --git a/src/complex/Utilities/FilterUtilities.cpp b/src/complex/Utilities/FilterUtilities.cpp
@@ -28,14 +28,14 @@ Result<> CreateOutputDirectories(const fs::path& outputPath)
 void AppendDataObjectModifications(const DataStructure& dataStructure, std::vector<DataObjectModification>& modifiedActions, const DataPath& parentPath, const std::vector<DataPath>& ignoredDataPaths)
 {
   std::optional<std::vector<DataPath>> result = complex::GetAllChildArrayDataPaths(dataStructure, parentPath, ignoredDataPaths);
-  if(result->empty())
+  if(!result)
   {
     return;
   }
 
   for(const auto& child : result.value())
   {
-    modifiedActions.push_back(DataObjectModification{child, DataObjectModification::ModifiedType::DataArrayModified});
+    modifiedActions.push_back(DataObjectModification{child, DataObjectModification::ModifiedType::Modified, dataStructure.getDataRef(child).getDataObjectType()});
   }
 }