Skip to content

Commit

Permalink
Limit typing and strip RGB/ARGB support
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyoungbq
nyoungbq committed Dec 13, 2024
1 parent 1dfd72c commit ae81266
Show file tree
Hide file tree
Showing 6 changed files with 395 additions and 109 deletions.
95 changes: 91 additions & 4 deletions ...ins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaximumProjectionImageFilter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

#include "ITKImageProcessing/Common/ITKArrayHelper.hpp"

#include "simplnx/Common/TypesUtility.hpp"
#include "simplnx/DataStructure/IDataArray.hpp"
#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp"
#include "simplnx/Parameters/ArraySelectionParameter.hpp"
#include "simplnx/Parameters/BoolParameter.hpp"
Expand All @@ -18,8 +20,15 @@ namespace cxITKMaximumProjectionImageFilter
{
using ArrayOptionsType = ITK::ScalarPixelIdTypeList;
// VectorPixelIDTypeList;

template <class PixelT>
using FilterOutputTypeUI8 = uint8;

template <class PixelT>
using FilterOutputType = float;
using FilterOutputTypeUI16 = uint16;

template <class PixelT>
using FilterOutputTypeF32 = float32;

struct ITKMaximumProjectionImageFilterFunctor
{
Expand Down Expand Up @@ -132,8 +141,49 @@ IFilter::PreflightResult ITKMaximumProjectionImageFilter::preflightImpl(const Da
outputArrayPath = outputGeomPath.createChildPath(originalGeometry.getCellDataPath().getTargetName()).createChildPath(outputArrayName);
}

Result<OutputActions> helperOutputActions =
ITK::DataCheck<cxITKMaximumProjectionImageFilter::ArrayOptionsType, cxITKMaximumProjectionImageFilter::FilterOutputType>(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath);
Result<OutputActions> helperOutputActions = {};
DataType type = dataStructure.getDataAs<IDataArray>(selectedInputArray)->getDataType();
switch(type)
{
case DataType::uint8: {
helperOutputActions =
ITK::DataCheck<cxITKMaximumProjectionImageFilter::ArrayOptionsType, cxITKMaximumProjectionImageFilter::FilterOutputTypeUI8>(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath);
break;
}
case DataType::uint16: {
helperOutputActions =
ITK::DataCheck<cxITKMaximumProjectionImageFilter::ArrayOptionsType, cxITKMaximumProjectionImageFilter::FilterOutputTypeUI16>(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath);
break;
}
case DataType::float32: {
helperOutputActions =
ITK::DataCheck<cxITKMaximumProjectionImageFilter::ArrayOptionsType, cxITKMaximumProjectionImageFilter::FilterOutputTypeF32>(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath);
break;
}
case DataType::int8:
[[fallthrough]];
case DataType::int16:
[[fallthrough]];
case DataType::int32:
[[fallthrough]];
case DataType::uint32:
[[fallthrough]];
case DataType::int64:
[[fallthrough]];
case DataType::uint64: {
[[fallthrough]];
}
case DataType::float64: {
[[fallthrough]];
}
case DataType::boolean: {
return MakePreflightErrorResult(-76600, fmt::format("Input {} type is not currently supported. Please reach out to devs if you have a use case.", DataTypeToString(type)));
}
}
if(helperOutputActions.invalid())
{
return {std::move(helperOutputActions)};
}

// Consolidate actions
resultOutputActions.value().actions.insert(resultOutputActions.value().actions.end(), helperOutputActions.value().actions.begin(), helperOutputActions.value().actions.end());
Expand Down Expand Up @@ -164,8 +214,45 @@ Result<> ITKMaximumProjectionImageFilter::executeImpl(DataStructure& dataStructu

const cxITKMaximumProjectionImageFilter::ITKMaximumProjectionImageFilterFunctor itkFunctor = {projectionDimension};

auto result = ITK::Execute<cxITKMaximumProjectionImageFilter::ArrayOptionsType, cxITKMaximumProjectionImageFilter::FilterOutputType>(dataStructure, selectedInputArray, imageGeomPath,
Result<> result = {};
DataType type = dataStructure.getDataAs<IDataArray>(selectedInputArray)->getDataType();
switch(type)
{
case DataType::uint8: {
result = ITK::Execute<cxITKMaximumProjectionImageFilter::ArrayOptionsType, cxITKMaximumProjectionImageFilter::FilterOutputTypeUI8>(dataStructure, selectedInputArray, imageGeomPath,
outputArrayPath, itkFunctor, shouldCancel);
break;
}
case DataType::uint16: {
result = ITK::Execute<cxITKMaximumProjectionImageFilter::ArrayOptionsType, cxITKMaximumProjectionImageFilter::FilterOutputTypeUI16>(dataStructure, selectedInputArray, imageGeomPath,
outputArrayPath, itkFunctor, shouldCancel);
break;
}
case DataType::float32: {
result = ITK::Execute<cxITKMaximumProjectionImageFilter::ArrayOptionsType, cxITKMaximumProjectionImageFilter::FilterOutputTypeF32>(dataStructure, selectedInputArray, imageGeomPath,
outputArrayPath, itkFunctor, shouldCancel);
break;
}
case DataType::int8:
[[fallthrough]];
case DataType::int16:
[[fallthrough]];
case DataType::int32:
[[fallthrough]];
case DataType::uint32:
[[fallthrough]];
case DataType::int64:
[[fallthrough]];
case DataType::uint64: {
[[fallthrough]];
}
case DataType::float64: {
[[fallthrough]];
}
case DataType::boolean: {
return MakeErrorResult(-76601, fmt::format("Input {} type is not currently supported. Please reach out to devs if you have a use case.", DataTypeToString(type)));
}
}
if(result.invalid())
{
return result;
Expand Down
99 changes: 95 additions & 4 deletions ...gins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianProjectionImageFilter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

#include "ITKImageProcessing/Common/ITKArrayHelper.hpp"

#include "simplnx/Common/TypesUtility.hpp"
#include "simplnx/DataStructure/IDataArray.hpp"
#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp"
#include "simplnx/Parameters/ArraySelectionParameter.hpp"
#include "simplnx/Parameters/BoolParameter.hpp"
Expand All @@ -17,9 +19,19 @@ using namespace nx::core;
namespace cxITKMedianProjectionImageFilter
{
using ArrayOptionsType = ITK::ScalarPixelIdTypeList;

// Uncommenting below line enables RGB/ARGB images that are currently unsupported
// using ArrayOptionsType = ITK::ArrayOptions<ITK::ArrayComponentOptions<true, false, true>, ITK::ArrayUseAllTypes>;
// VectorPixelIDTypeList;

template <class PixelT>
using FilterOutputTypeUI8 = uint8;

template <class PixelT>
using FilterOutputType = float;
using FilterOutputTypeUI16 = uint16;

template <class PixelT>
using FilterOutputTypeF32 = float32;

struct ITKMedianProjectionImageFilterFunctor
{
Expand Down Expand Up @@ -132,8 +144,50 @@ IFilter::PreflightResult ITKMedianProjectionImageFilter::preflightImpl(const Dat
outputArrayPath = outputGeomPath.createChildPath(originalGeometry.getCellDataPath().getTargetName()).createChildPath(outputArrayName);
}

Result<OutputActions> helperOutputActions =
ITK::DataCheck<cxITKMedianProjectionImageFilter::ArrayOptionsType, cxITKMedianProjectionImageFilter::FilterOutputType>(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath);
Result<OutputActions> helperOutputActions = {};
DataType type = dataStructure.getDataAs<IDataArray>(selectedInputArray)->getDataType();
switch(type)
{
case DataType::uint8: {
helperOutputActions =
ITK::DataCheck<cxITKMedianProjectionImageFilter::ArrayOptionsType, cxITKMedianProjectionImageFilter::FilterOutputTypeUI8>(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath);
break;
}
case DataType::uint16: {
helperOutputActions =
ITK::DataCheck<cxITKMedianProjectionImageFilter::ArrayOptionsType, cxITKMedianProjectionImageFilter::FilterOutputTypeUI16>(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath);
break;
}
case DataType::float32: {
helperOutputActions =
ITK::DataCheck<cxITKMedianProjectionImageFilter::ArrayOptionsType, cxITKMedianProjectionImageFilter::FilterOutputTypeF32>(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath);
break;
}
case DataType::int8:
[[fallthrough]];
case DataType::int16:
[[fallthrough]];
case DataType::int32:
[[fallthrough]];
case DataType::uint32:
[[fallthrough]];
case DataType::int64:
[[fallthrough]];
case DataType::uint64: {
[[fallthrough]];
}
case DataType::float64: {
[[fallthrough]];
}
case DataType::boolean: {
return MakePreflightErrorResult(-76590, fmt::format("Input {} type is not currently supported. Please reach out to devs if you have a use case.", DataTypeToString(type)));
}
}

if(helperOutputActions.invalid())
{
return {std::move(helperOutputActions)};
}

// Consolidate actions
resultOutputActions.value().actions.insert(resultOutputActions.value().actions.end(), helperOutputActions.value().actions.begin(), helperOutputActions.value().actions.end());
Expand Down Expand Up @@ -164,8 +218,45 @@ Result<> ITKMedianProjectionImageFilter::executeImpl(DataStructure& dataStructur

const cxITKMedianProjectionImageFilter::ITKMedianProjectionImageFilterFunctor itkFunctor = {projectionDimension};

auto result = ITK::Execute<cxITKMedianProjectionImageFilter::ArrayOptionsType, cxITKMedianProjectionImageFilter::FilterOutputType>(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath,
Result<> result = {};
DataType type = dataStructure.getDataAs<IDataArray>(selectedInputArray)->getDataType();
switch(type)
{
case DataType::uint8: {
result = ITK::Execute<cxITKMedianProjectionImageFilter::ArrayOptionsType, cxITKMedianProjectionImageFilter::FilterOutputTypeUI8>(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath,
itkFunctor, shouldCancel);
break;
}
case DataType::uint16: {
result = ITK::Execute<cxITKMedianProjectionImageFilter::ArrayOptionsType, cxITKMedianProjectionImageFilter::FilterOutputTypeUI16>(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath,
itkFunctor, shouldCancel);
break;
}
case DataType::float32: {
result = ITK::Execute<cxITKMedianProjectionImageFilter::ArrayOptionsType, cxITKMedianProjectionImageFilter::FilterOutputTypeF32>(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath,
itkFunctor, shouldCancel);
break;
}
case DataType::int8:
[[fallthrough]];
case DataType::int16:
[[fallthrough]];
case DataType::int32:
[[fallthrough]];
case DataType::uint32:
[[fallthrough]];
case DataType::int64:
[[fallthrough]];
case DataType::uint64: {
[[fallthrough]];
}
case DataType::float64: {
[[fallthrough]];
}
case DataType::boolean: {
return MakeErrorResult(-76591, fmt::format("Input {} type is not currently supported. Please reach out to devs if you have a use case.", DataTypeToString(type)));
}
}
if(result.invalid())
{
return result;
Expand Down
95 changes: 91 additions & 4 deletions ...ins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMinimumProjectionImageFilter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

#include "ITKImageProcessing/Common/ITKArrayHelper.hpp"

#include "simplnx/Common/TypesUtility.hpp"
#include "simplnx/DataStructure/IDataArray.hpp"
#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp"
#include "simplnx/Parameters/ArraySelectionParameter.hpp"
#include "simplnx/Parameters/BoolParameter.hpp"
Expand All @@ -18,8 +20,15 @@ namespace cxITKMinimumProjectionImageFilter
{
using ArrayOptionsType = ITK::ScalarPixelIdTypeList;
// VectorPixelIDTypeList;

template <class PixelT>
using FilterOutputTypeUI8 = uint8;

template <class PixelT>
using FilterOutputType = float;
using FilterOutputTypeUI16 = uint16;

template <class PixelT>
using FilterOutputTypeF32 = float32;

struct ITKMinimumProjectionImageFilterFunctor
{
Expand Down Expand Up @@ -132,8 +141,49 @@ IFilter::PreflightResult ITKMinimumProjectionImageFilter::preflightImpl(const Da
outputArrayPath = outputGeomPath.createChildPath(originalGeometry.getCellDataPath().getTargetName()).createChildPath(outputArrayName);
}

Result<OutputActions> helperOutputActions =
ITK::DataCheck<cxITKMinimumProjectionImageFilter::ArrayOptionsType, cxITKMinimumProjectionImageFilter::FilterOutputType>(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath);
Result<OutputActions> helperOutputActions = {};
DataType type = dataStructure.getDataAs<IDataArray>(selectedInputArray)->getDataType();
switch(type)
{
case DataType::uint8: {
helperOutputActions =
ITK::DataCheck<cxITKMinimumProjectionImageFilter::ArrayOptionsType, cxITKMinimumProjectionImageFilter::FilterOutputTypeUI8>(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath);
break;
}
case DataType::uint16: {
helperOutputActions =
ITK::DataCheck<cxITKMinimumProjectionImageFilter::ArrayOptionsType, cxITKMinimumProjectionImageFilter::FilterOutputTypeUI16>(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath);
break;
}
case DataType::float32: {
helperOutputActions =
ITK::DataCheck<cxITKMinimumProjectionImageFilter::ArrayOptionsType, cxITKMinimumProjectionImageFilter::FilterOutputTypeF32>(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath);
break;
}
case DataType::int8:
[[fallthrough]];
case DataType::int16:
[[fallthrough]];
case DataType::int32:
[[fallthrough]];
case DataType::uint32:
[[fallthrough]];
case DataType::int64:
[[fallthrough]];
case DataType::uint64: {
[[fallthrough]];
}
case DataType::float64: {
[[fallthrough]];
}
case DataType::boolean: {
return MakePreflightErrorResult(-76610, fmt::format("Input {} type is not currently supported. Please reach out to devs if you have a use case.", DataTypeToString(type)));
}
}
if(helperOutputActions.invalid())
{
return {std::move(helperOutputActions)};
}

// Consolidate actions
resultOutputActions.value().actions.insert(resultOutputActions.value().actions.end(), helperOutputActions.value().actions.begin(), helperOutputActions.value().actions.end());
Expand Down Expand Up @@ -164,8 +214,45 @@ Result<> ITKMinimumProjectionImageFilter::executeImpl(DataStructure& dataStructu

const cxITKMinimumProjectionImageFilter::ITKMinimumProjectionImageFilterFunctor itkFunctor = {projectionDimension};

auto result = ITK::Execute<cxITKMinimumProjectionImageFilter::ArrayOptionsType, cxITKMinimumProjectionImageFilter::FilterOutputType>(dataStructure, selectedInputArray, imageGeomPath,
Result<> result = {};
DataType type = dataStructure.getDataAs<IDataArray>(selectedInputArray)->getDataType();
switch(type)
{
case DataType::uint8: {
result = ITK::Execute<cxITKMinimumProjectionImageFilter::ArrayOptionsType, cxITKMinimumProjectionImageFilter::FilterOutputTypeUI8>(dataStructure, selectedInputArray, imageGeomPath,
outputArrayPath, itkFunctor, shouldCancel);
break;
}
case DataType::uint16: {
result = ITK::Execute<cxITKMinimumProjectionImageFilter::ArrayOptionsType, cxITKMinimumProjectionImageFilter::FilterOutputTypeUI16>(dataStructure, selectedInputArray, imageGeomPath,
outputArrayPath, itkFunctor, shouldCancel);
break;
}
case DataType::float32: {
result = ITK::Execute<cxITKMinimumProjectionImageFilter::ArrayOptionsType, cxITKMinimumProjectionImageFilter::FilterOutputTypeF32>(dataStructure, selectedInputArray, imageGeomPath,
outputArrayPath, itkFunctor, shouldCancel);
break;
}
case DataType::int8:
[[fallthrough]];
case DataType::int16:
[[fallthrough]];
case DataType::int32:
[[fallthrough]];
case DataType::uint32:
[[fallthrough]];
case DataType::int64:
[[fallthrough]];
case DataType::uint64: {
[[fallthrough]];
}
case DataType::float64: {
[[fallthrough]];
}
case DataType::boolean: {
return MakeErrorResult(-76601, fmt::format("Input {} type is not currently supported. Please reach out to devs if you have a use case.", DataTypeToString(type)));
}
}
if(result.invalid())
{
return result;
Expand Down
Loading

0 comments on commit ae81266

Please sign in to comment.