Skip to content

Commit

Permalink
Fix up documentation and test compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
@blowekamp
blowekamp committed Mar 16, 2020
1 parent 24bc712 commit 6d6c7a9
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
8 changes: 4 additions & 4 deletions include/itkDICOMOrientImageFilter.h
View file
Expand Up @@ -94,10 +94,10 @@ class ITK_TEMPLATE_EXPORT DICOMOrientImageFilter : public ImageToImageFilter<TIn
UNKNOWN = 0,
Right = 2, // 0b0010
Left = 3,
Posterior = 4, // back - 0b0100
Anterior = 5, // front
Inferior = 8, // below - 0b1000
Superior = 9 // above
Posterior = 4, ///< back - 0b0100
Anterior = 5, ///< front
Inferior = 8, ///< bottom - 0b1000
Superior = 9 ///< above
};

enum class CoordinateMajornessTermsEnum : uint8_t
Expand Down
34 changes: 17 additions & 17 deletions test/itkDICOMOrientImageFilterGTest.cxx
View file
Expand Up @@ -82,7 +82,7 @@ TEST(DICOMOrientImageFilter, Streaming)


using OrientFilterType = itk::DICOMOrientImageFilter<ImageType>;
using PermuiteArrayType = OrientFilterType::PermuteOrderArrayType;
using PermuteArrayType = OrientFilterType::PermuteOrderArrayType;
using FlipArrayType = OrientFilterType::FlipAxesArrayType;
auto filter = OrientFilterType::New();
filter->SetInput(sourceFilter->GetOutput());
Expand All @@ -95,8 +95,8 @@ TEST(DICOMOrientImageFilter, Streaming)
CheckImage(sourceFilter->GetOutput(), filter->GetOutput());
EXPECT_EQ(filter->GetOutput()->GetBufferedRegion().GetSize(), itk::Size<3>({ { 1, 2, 3 } }));
EXPECT_EQ(filter->GetInputCoordinateOrientation(), OrientFilterType::OrientationEnum::RAS);
EXPECT_EQ(filter->GetPermuteOrder(), PermuiteArrayType({ { 0, 1, 2 } }));
EXPECT_EQ(filter->GetFlipAxes(), FlipArrayType({ { 1, 1, 0 } }));
EXPECT_EQ(filter->GetPermuteOrder(), PermuteArrayType({ 0, 1, 2 }));
EXPECT_EQ(filter->GetFlipAxes(), FlipArrayType({ 1, 1, 0 }));
{
ImageType::DirectionType d;
d.SetIdentity();
Expand Down Expand Up @@ -125,8 +125,8 @@ TEST(DICOMOrientImageFilter, Values)

EXPECT_EQ(filter->GetDesiredCoordinateOrientation(), OrientFilterType::OrientationEnum::LPS);
EXPECT_EQ(filter->GetInputCoordinateOrientation(), OrientFilterType::OrientationEnum::LPS);
EXPECT_EQ(filter->GetPermuteOrder(), PermuiteArrayType({ { 0, 1, 2 } }));
EXPECT_EQ(filter->GetFlipAxes(), FlipArrayType({ { 0, 0, 0 } }));
EXPECT_EQ(filter->GetPermuteOrder(), PermuiteArrayType({ 0, 1, 2 }));
EXPECT_EQ(filter->GetFlipAxes(), FlipArrayType({ 0, 0, 0 }));
{
ImageType::DirectionType d;
d.SetIdentity();
Expand All @@ -140,8 +140,8 @@ TEST(DICOMOrientImageFilter, Values)

EXPECT_EQ(filter->GetDesiredCoordinateOrientation(), OrientFilterType::OrientationEnum::RAS);
EXPECT_EQ(filter->GetInputCoordinateOrientation(), OrientFilterType::OrientationEnum::LPS);
EXPECT_EQ(filter->GetPermuteOrder(), PermuiteArrayType({ { 0, 1, 2 } }));
EXPECT_EQ(filter->GetFlipAxes(), FlipArrayType({ { 1, 1, 0 } }));
EXPECT_EQ(filter->GetPermuteOrder(), PermuiteArrayType({ 0, 1, 2 }));
EXPECT_EQ(filter->GetFlipAxes(), FlipArrayType({ 1, 1, 0 }));
{
ImageType::DirectionType d;
d.Fill(0.0);
Expand All @@ -162,8 +162,8 @@ TEST(DICOMOrientImageFilter, Values)
CheckImage(sourceFilter->GetOutput(), filter->GetOutput());
EXPECT_EQ(filter->GetDesiredCoordinateOrientation(), OrientFilterType::OrientationEnum::LIA);
EXPECT_EQ(filter->GetInputCoordinateOrientation(), OrientFilterType::OrientationEnum::LPS);
EXPECT_EQ(filter->GetPermuteOrder(), PermuiteArrayType({ { 0, 2, 1 } }));
EXPECT_EQ(filter->GetFlipAxes(), FlipArrayType({ { 0, 1, 1 } }));
EXPECT_EQ(filter->GetPermuteOrder(), PermuiteArrayType({ 0, 2, 1 }));
EXPECT_EQ(filter->GetFlipAxes(), FlipArrayType({ 0, 1, 1 }));
{
ImageType::DirectionType d;
d.Fill(0.0);
Expand All @@ -178,30 +178,30 @@ TEST(DICOMOrientImageFilter, Values)
CheckImage(sourceFilter->GetOutput(), filter->GetOutput());
EXPECT_EQ(filter->GetDesiredCoordinateOrientation(), OrientFilterType::OrientationEnum::IRP);
EXPECT_EQ(filter->GetInputCoordinateOrientation(), OrientFilterType::OrientationEnum::LPS);
EXPECT_EQ(filter->GetPermuteOrder(), PermuiteArrayType({ { 2, 0, 1 } }));
EXPECT_EQ(filter->GetFlipAxes(), FlipArrayType({ { 1, 1, 0 } }));
EXPECT_EQ(filter->GetPermuteOrder(), PermuiteArrayType({ 2, 0, 1 }));
EXPECT_EQ(filter->GetFlipAxes(), FlipArrayType({ 1, 1, 0 }));

filter->SetDesiredCoordinateOrientation(OrientFilterType::OrientationEnum::SLA);
filter->UpdateLargestPossibleRegion();
CheckImage(sourceFilter->GetOutput(), filter->GetOutput());
EXPECT_EQ(filter->GetDesiredCoordinateOrientation(), OrientFilterType::OrientationEnum::SLA);
EXPECT_EQ(filter->GetInputCoordinateOrientation(), OrientFilterType::OrientationEnum::LPS);
EXPECT_EQ(filter->GetPermuteOrder(), PermuiteArrayType({ { 2, 0, 1 } }));
EXPECT_EQ(filter->GetFlipAxes(), FlipArrayType({ { 0, 0, 1 } }));
EXPECT_EQ(filter->GetPermuteOrder(), PermuiteArrayType({ 2, 0, 1 }));
EXPECT_EQ(filter->GetFlipAxes(), FlipArrayType({ 0, 0, 1 }));

filter->SetDesiredCoordinateOrientation(OrientFilterType::OrientationEnum::RPI);
filter->UpdateLargestPossibleRegion();
CheckImage(sourceFilter->GetOutput(), filter->GetOutput());
EXPECT_EQ(filter->GetInputCoordinateOrientation(), OrientFilterType::OrientationEnum::LPS);
EXPECT_EQ(filter->GetPermuteOrder(), PermuiteArrayType({ { 0, 1, 2 } }));
EXPECT_EQ(filter->GetFlipAxes(), FlipArrayType({ { 1, 0, 1 } }));
EXPECT_EQ(filter->GetPermuteOrder(), PermuiteArrayType({ 0, 1, 2 }));
EXPECT_EQ(filter->GetFlipAxes(), FlipArrayType({ 1, 0, 1 }));

filter->SetDesiredCoordinateOrientation(OrientFilterType::OrientationEnum::LAI);
filter->UpdateLargestPossibleRegion();
CheckImage(sourceFilter->GetOutput(), filter->GetOutput());
EXPECT_EQ(filter->GetInputCoordinateOrientation(), OrientFilterType::OrientationEnum::LPS);
EXPECT_EQ(filter->GetPermuteOrder(), PermuiteArrayType({ { 0, 1, 2 } }));
EXPECT_EQ(filter->GetFlipAxes(), FlipArrayType({ { 0, 1, 1 } }));
EXPECT_EQ(filter->GetPermuteOrder(), PermuiteArrayType({ 0, 1, 2 }));
EXPECT_EQ(filter->GetFlipAxes(), FlipArrayType({ 0, 1, 1 }));

filter->SetDesiredCoordinateOrientation(OrientFilterType::OrientationEnum::LAS);
filter->UpdateLargestPossibleRegion();
Expand Down

0 comments on commit 6d6c7a9

Please sign in to comment.