diff --git a/cmake/Summary.cmake b/cmake/Summary.cmake index 3ba9a26e06..f7750a3716 100644 --- a/cmake/Summary.cmake +++ b/cmake/Summary.cmake @@ -58,6 +58,7 @@ message(STATUS "* span-lite (${span-lite_VERSION}) ${span-lite_DIR}") message(STATUS "* boost_mp11 (${boost_mp11_VERSION}) ${boost_mp11_DIR}") message(STATUS "* nod (${nod_VERSION}) ${nod_DIR}") message(STATUS "* reproc++ (${reproc_VERSION}) ${reproc++_DIR}") +message(STATUS "* EbsdLib (${EbsdLib_VERSION}) ${EbsdLib_DIR}") message(STATUS "* -------------- Simplnx Configuration Options -------------------------------------") message(STATUS "* SIMPLNX_BUILD_TESTS: ${SIMPLNX_BUILD_TESTS}") diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/Cubic m-3 (Th).tiff b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Cubic m-3 (Th).tiff new file mode 100644 index 0000000000..41a2d59192 Binary files /dev/null and b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Cubic m-3 (Th).tiff differ diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/Cubic m-3m (Oh).tiff b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Cubic m-3m (Oh).tiff new file mode 100644 index 0000000000..6c65915e90 Binary files /dev/null and b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Cubic m-3m (Oh).tiff differ diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/CubicLowOps Cubic m-3 (Th).png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/CubicLowOps Cubic m-3 (Th).png deleted file mode 100644 index 7c34746088..0000000000 Binary files a/src/Plugins/OrientationAnalysis/data/IPF_Legend/CubicLowOps Cubic m-3 (Th).png and /dev/null differ diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/CubicOps Cubic m-3m (Oh).png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/CubicOps Cubic m-3m (Oh).png deleted file mode 100644 index fa36d17f1d..0000000000 Binary files a/src/Plugins/OrientationAnalysis/data/IPF_Legend/CubicOps Cubic m-3m (Oh).png and /dev/null differ diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/Hexagonal 6_m (C6h).tiff b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Hexagonal 6_m (C6h).tiff new file mode 100644 index 0000000000..2547bdb87c Binary files /dev/null and b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Hexagonal 6_m (C6h).tiff differ diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/Hexagonal 6_mmm (D6h).tiff b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Hexagonal 6_mmm (D6h).tiff new file mode 100644 index 0000000000..faa878da0c Binary files /dev/null and b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Hexagonal 6_mmm (D6h).tiff differ diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/HexagonalLowOps Hexagonal 6m (C6h).png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/HexagonalLowOps Hexagonal 6m (C6h).png deleted file mode 100644 index ce1fd1480d..0000000000 Binary files a/src/Plugins/OrientationAnalysis/data/IPF_Legend/HexagonalLowOps Hexagonal 6m (C6h).png and /dev/null differ diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/HexagonalOps Hexagonal 6mmm (D6h).png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/HexagonalOps Hexagonal 6mmm (D6h).png deleted file mode 100644 index 2df2db42b0..0000000000 Binary files a/src/Plugins/OrientationAnalysis/data/IPF_Legend/HexagonalOps Hexagonal 6mmm (D6h).png and /dev/null differ diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/Monoclinic 2_m (C2h).tiff b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Monoclinic 2_m (C2h).tiff new file mode 100644 index 0000000000..3758f4f957 Binary files /dev/null and b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Monoclinic 2_m (C2h).tiff differ diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/MonoclinicOps Monoclinic 2m (C2h).png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/MonoclinicOps Monoclinic 2m (C2h).png deleted file mode 100644 index 89aa260018..0000000000 Binary files a/src/Plugins/OrientationAnalysis/data/IPF_Legend/MonoclinicOps Monoclinic 2m (C2h).png and /dev/null differ diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/OrthoRhombicOps Orthorhombic mmm (D2h).png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/OrthoRhombicOps Orthorhombic mmm (D2h).png deleted file mode 100644 index 96d7f98846..0000000000 Binary files a/src/Plugins/OrientationAnalysis/data/IPF_Legend/OrthoRhombicOps Orthorhombic mmm (D2h).png and /dev/null differ diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/Orthorhombic mmm (D2h).tiff b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Orthorhombic mmm (D2h).tiff new file mode 100644 index 0000000000..08ca042e73 Binary files /dev/null and b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Orthorhombic mmm (D2h).tiff differ diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/Tetragonal 4_m (C4h).tiff b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Tetragonal 4_m (C4h).tiff new file mode 100644 index 0000000000..8c18965491 Binary files /dev/null and b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Tetragonal 4_m (C4h).tiff differ diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/Tetragonal 4_mmm (D4h).tiff b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Tetragonal 4_mmm (D4h).tiff new file mode 100644 index 0000000000..5277083fa1 Binary files /dev/null and b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Tetragonal 4_mmm (D4h).tiff differ diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/TetragonalLowOps Tetragonal 4m (C4h).png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/TetragonalLowOps Tetragonal 4m (C4h).png deleted file mode 100644 index 8a240daf7d..0000000000 Binary files a/src/Plugins/OrientationAnalysis/data/IPF_Legend/TetragonalLowOps Tetragonal 4m (C4h).png and /dev/null differ diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/TetragonalOps Tetragonal 4mmm (D4h).png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/TetragonalOps Tetragonal 4mmm (D4h).png deleted file mode 100644 index 186a51285e..0000000000 Binary files a/src/Plugins/OrientationAnalysis/data/IPF_Legend/TetragonalOps Tetragonal 4mmm (D4h).png and /dev/null differ diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/Triclinic -1 (Ci).tiff b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Triclinic -1 (Ci).tiff new file mode 100644 index 0000000000..081d95b34b Binary files /dev/null and b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Triclinic -1 (Ci).tiff differ diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/TriclinicOps Triclinic -1 (Ci).png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/TriclinicOps Triclinic -1 (Ci).png deleted file mode 100644 index 31661affaa..0000000000 Binary files a/src/Plugins/OrientationAnalysis/data/IPF_Legend/TriclinicOps Triclinic -1 (Ci).png and /dev/null differ diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/Trigonal -3 (C3i).tiff b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Trigonal -3 (C3i).tiff new file mode 100644 index 0000000000..1a565c9f55 Binary files /dev/null and b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Trigonal -3 (C3i).tiff differ diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/Trigonal -3m (D3d).tiff b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Trigonal -3m (D3d).tiff new file mode 100644 index 0000000000..fe344c9136 Binary files /dev/null and b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Trigonal -3m (D3d).tiff differ diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/TrigonalLowOps Trigonal -3 (C3i).png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/TrigonalLowOps Trigonal -3 (C3i).png deleted file mode 100644 index 7ad12780f0..0000000000 Binary files a/src/Plugins/OrientationAnalysis/data/IPF_Legend/TrigonalLowOps Trigonal -3 (C3i).png and /dev/null differ diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/TrigonalOps Trigonal -3m (D3d).png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/TrigonalOps Trigonal -3m (D3d).png deleted file mode 100644 index f0b6e791e8..0000000000 Binary files a/src/Plugins/OrientationAnalysis/data/IPF_Legend/TrigonalOps Trigonal -3m (D3d).png and /dev/null differ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WritePoleFigure.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WritePoleFigure.cpp index 5f208639a7..38717569f0 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WritePoleFigure.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WritePoleFigure.cpp @@ -72,7 +72,7 @@ class ComputeIntensityStereographicProjection float* xyzPtr = m_XYZCoords->getPointer(0); for(size_t i = 0; i < numCoords; i++) { - if(xyzPtr[i * 3 + 2] < 0.0f) + if(xyzPtr[i * 3 + 2] < 0.0f) // If the unit sphere data is in the southern hemisphere { xyzPtr[i * 3 + 0] *= -1.0f; xyzPtr[i * 3 + 1] *= -1.0f; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.cpp index aeae9c61b2..f1f34f62ef 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.cpp @@ -96,10 +96,10 @@ Parameters WritePoleFigureFilter::parameters() const params.insert(std::make_unique(k_LambertSize_Key, "Lambert Image Size (Pixels)", "The height/width of the internal Lambert Square that is used for interpolation", 64)); params.insert(std::make_unique(k_NumColors_Key, "Number of Colors", "The number of colors to use for the Color Intensity pole figures", 32)); - params.insertSeparator(Parameters::Separator{"Input Cell Data"}); - params.insert(std::make_unique(k_CellEulerAnglesArrayPath_Key, "Cell Euler Angles", "Three angles defining the orientation of the Element in Bunge convention (Z-X-Z)", + params.insertSeparator(Parameters::Separator{"Input Orientation Data"}); + params.insert(std::make_unique(k_CellEulerAnglesArrayPath_Key, "Euler Angles", "Three angles defining the orientation of the Element in Bunge convention (Z-X-Z)", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{3}})); - params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Cell Phases", "Specifies to which Ensemble each cell belongs", DataPath{}, + params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Phases", "Specifies to which Ensemble each Euler angle belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Optional Data Mask"}); params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask Array", "Should the algorithm use a mask array to remove non-indexed points", false));