Remove EMTime functionality. Update Release notes for 6.5.163

Update codes to compile on Apple M1 ARM64 arch. Remove Qt Keywords signals/slots/emit as they clash with oneTBB API Signed-off-by: Michael Jackson <[email protected]>
BlueQuartzSoftware · Jul 18, 2022 · 84f9dd2 · 84f9dd2
1 parent 02a9aea
commit 84f9dd2
Show file tree

Hide file tree

Showing 449 changed files with 1,112 additions and 1,379 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -87,6 +87,7 @@ if(NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
     )
 endif()
 
+add_compile_definitions(QT_NO_KEYWORDS)
 
 #------------------------------------------------------------------------------
 # Find the Git Package for Versioning. It should be ok if Git is NOT found

diff --git a/Documentation/ReferenceManual/5_ReleaseNotes/ReleaseNotes_6_5_0.md b/Documentation/ReferenceManual/5_ReleaseNotes/ReleaseNotes_6_5_0.md
@@ -11,12 +11,14 @@ The developers of DREAM.3D maintain a pair of Google Groups for discussions on t
 [DREAM.3D Developers List](https://groups.google.com/forum/?hl=en#!forum/dream3d-developers)
 
 
-## Version 6.5.xxx ##
+## Version 6.5.163 ##
 
-### 6.5.xxx Fixed DREAM3D Issues ###
+### 6.5.163 Fixed DREAM3D Issues ###
 
 + Add sanity check to Generate Ensemble Statistics to ensure that when Calculate Crystallographic Statistics is TRUE only Cubic and Hexagonal phases are present in the data. #984
 + Fix issue in FindBoundingBoxFeatures where the XY coordinates were locked into the XY plane even if the '2D' was on another plane. #985
+* Fixed on issue where adding the Import Image Montage would crash DREAM.3D due to nullptr. (ITKImageProcessing Plugin fix)
+* fixed issue with linking on Ubuntu 20.04 and above involving rpaths
 
 ### SIMPL Changes ###
 

diff --git a/Documentation/ReferenceManual/6_Developer/WritingAFilter.md b/Documentation/ReferenceManual/6_Developer/WritingAFilter.md
@@ -91,10 +91,10 @@ Example **preflight()** function:
 void ExampleFilter::preflight()
 {
   setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
+  Q_EMIT preflightAboutToExecute();
+  Q_EMIT updateFilterParameters(this);
   dataCheck();
-  emit preflightExecuted();
+  Q_EMIT preflightExecuted();
   setInPreflight(false);
 }
   ```

diff --git a/Documentation/Tools/GenerateHTMLDocs.cpp b/Documentation/Tools/GenerateHTMLDocs.cpp
@@ -482,7 +482,7 @@ void ReplaceGrepSearchesRecursively(QDir currentDir)
 
   bool parentWritten = false;
   QFileInfoList itemList = currentDir.entryInfoList(filters);
-  foreach(QFileInfo itemInfo, itemList)
+  Q_FOREACH(QFileInfo itemInfo, itemList)
   {
     QString itemFilePath = itemInfo.absoluteFilePath();
 
@@ -520,7 +520,7 @@ void ReplaceGrepSearchesRecursively(QDir currentDir)
   QFileInfoList dirList = currentDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
   if(dirList.size() > 0)
   {
-    foreach(QFileInfo fi, dirList)
+    Q_FOREACH(QFileInfo fi, dirList)
     {
 
       ReplaceGrepSearchesRecursively(QDir(fi.absoluteFilePath())); // Recursive call

diff --git a/Resources/CPack/PackageProject.cmake b/Resources/CPack/PackageProject.cmake
@@ -78,7 +78,7 @@ set(CPACK_PACKAGE_EXECUTABLES
 set(UPLOAD_FILE_NAME "")
 
 if(APPLE)
-    set(CPACK_PACKAGE_FILE_NAME "DREAM3D-${DREAM3D_VERSION_SHORT}-OSX")
+    set(CPACK_PACKAGE_FILE_NAME "DREAM3D-${DREAM3D_VERSION_SHORT}-OSX-${CMAKE_HOST_SYSTEM_PROCESSOR}")
     # This ASSUMES we are creating a tar.gz package. If you change that below to
     # anything else then you need to update this.
     set(UPLOAD_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}.dmg)

diff --git a/Source/EbsdLib/CMakeLists.txt b/Source/EbsdLib/CMakeLists.txt
@@ -80,6 +80,7 @@ if(BUILD_SHARED_LIBS)
 	set(EbsdLib_BUILT_AS_DYNAMIC_LIB 1)
 endif(BUILD_SHARED_LIBS)
 
+add_compile_definitions(QT_NO_KEYWORDS)
 
 # Look for our Prerequisite Libraries
 if(NOT DEFINED DREAM3DProj_BINARY_DIR)

diff --git a/Source/EbsdLib/TSL/H5OIMReader.cpp b/Source/EbsdLib/TSL/H5OIMReader.cpp
@@ -450,7 +450,7 @@ int H5OIMReader::readHeader(hid_t parId)
   // m_Phases.clear();
   QVector<AngPhase::Pointer> phaseVector;
 
-  foreach(QString phaseGroupName, names)
+  Q_FOREACH(QString phaseGroupName, names)
   {
     hid_t pid = H5Gopen(phasesGid, phaseGroupName.toLatin1().data(), H5P_DEFAULT);
 

diff --git a/Source/OrientationLib/LaueOps/CubicLowOps.cpp b/Source/OrientationLib/LaueOps/CubicLowOps.cpp
@@ -39,7 +39,6 @@
 #include <tbb/parallel_for.h>
 #include <tbb/blocked_range.h>
 #include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
 #include <tbb/task_group.h>
 #include <tbb/task.h>
 #endif
@@ -785,8 +784,7 @@ void CubicLowOps::generateSphereCoordsFromEulers(FloatArrayType* eulers, FloatAr
   }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
+    bool doParallel = true;
 #endif
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
@@ -1102,8 +1100,7 @@ QVector<UInt8ArrayType::Pointer> CubicLowOps::generatePoleFigure(PoleFigureConfi
   DoubleArrayType::Pointer intensity011 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label1 + "_Intensity_Image");
   DoubleArrayType::Pointer intensity111 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label2 + "_Intensity_Image");
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
+    bool doParallel = true;
 
   if(doParallel)
   {

diff --git a/Source/OrientationLib/LaueOps/CubicOps.cpp b/Source/OrientationLib/LaueOps/CubicOps.cpp
@@ -39,7 +39,6 @@
 #include <tbb/parallel_for.h>
 #include <tbb/blocked_range.h>
 #include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
 #include <tbb/task_group.h>
 #include <tbb/task.h>
 #endif
@@ -1508,8 +1507,7 @@ void CubicOps::generateSphereCoordsFromEulers(FloatArrayType* eulers, FloatArray
   }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
+    bool doParallel = true;
 #endif
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
@@ -1831,8 +1829,7 @@ QVector<UInt8ArrayType::Pointer> CubicOps::generatePoleFigure(PoleFigureConfigur
   DoubleArrayType::Pointer intensity111 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label2 + "_Intensity_Image");
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
+    bool doParallel = true;
 
   if(doParallel)
   {

diff --git a/Source/OrientationLib/LaueOps/HexagonalLowOps.cpp b/Source/OrientationLib/LaueOps/HexagonalLowOps.cpp
@@ -39,7 +39,6 @@
 #include <tbb/parallel_for.h>
 #include <tbb/blocked_range.h>
 #include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
 #include <tbb/task_group.h>
 #include <tbb/task.h>
 #endif
@@ -1205,8 +1204,7 @@ void HexagonalLowOps::generateSphereCoordsFromEulers(FloatArrayType* eulers, Flo
   }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
+    bool doParallel = true;
 #endif
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
@@ -1391,8 +1389,7 @@ QVector<UInt8ArrayType::Pointer> HexagonalLowOps::generatePoleFigure(PoleFigureC
   DoubleArrayType::Pointer intensity011 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label1 + "_Intensity_Image");
   DoubleArrayType::Pointer intensity111 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label2 + "_Intensity_Image");
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
+    bool doParallel = true;
 
   if(doParallel)
   {

diff --git a/Source/OrientationLib/LaueOps/HexagonalOps.cpp b/Source/OrientationLib/LaueOps/HexagonalOps.cpp
@@ -39,7 +39,6 @@
 #include <tbb/parallel_for.h>
 #include <tbb/blocked_range.h>
 #include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
 #include <tbb/task_group.h>
 #include <tbb/task.h>
 #endif
@@ -1285,8 +1284,7 @@ void HexagonalOps::generateSphereCoordsFromEulers(FloatArrayType* eulers, FloatA
   }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
+    bool doParallel = true;
 #endif
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
@@ -1474,8 +1472,7 @@ QVector<UInt8ArrayType::Pointer> HexagonalOps::generatePoleFigure(PoleFigureConf
   DoubleArrayType::Pointer intensity011 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label1 + "_Intensity_Image");
   DoubleArrayType::Pointer intensity111 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label2 + "_Intensity_Image");
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
+    bool doParallel = true;
 
   if(doParallel)
   {

diff --git a/Source/OrientationLib/LaueOps/MonoclinicOps.cpp b/Source/OrientationLib/LaueOps/MonoclinicOps.cpp
@@ -39,7 +39,6 @@
 #include <tbb/parallel_for.h>
 #include <tbb/blocked_range.h>
 #include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
 #include <tbb/task_group.h>
 #include <tbb/task.h>
 #endif
@@ -593,8 +592,7 @@ void MonoclinicOps::generateSphereCoordsFromEulers(FloatArrayType* eulers, Float
   }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
+    bool doParallel = true;
 #endif
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
@@ -779,8 +777,7 @@ QVector<UInt8ArrayType::Pointer> MonoclinicOps::generatePoleFigure(PoleFigureCon
   DoubleArrayType::Pointer intensity011 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label1 + "_Intensity_Image");
   DoubleArrayType::Pointer intensity111 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label2 + "_Intensity_Image");
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
+    bool doParallel = true;
 
   if(doParallel)
   {

diff --git a/Source/OrientationLib/LaueOps/OrthoRhombicOps.cpp b/Source/OrientationLib/LaueOps/OrthoRhombicOps.cpp
@@ -40,7 +40,6 @@
 #include <tbb/parallel_for.h>
 #include <tbb/blocked_range.h>
 #include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
 #include <tbb/task_group.h>
 #include <tbb/task.h>
 #endif
@@ -611,8 +610,7 @@ void OrthoRhombicOps::generateSphereCoordsFromEulers(FloatArrayType* eulers, Flo
   }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
+    bool doParallel = true;
 #endif
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
@@ -799,8 +797,7 @@ QVector<UInt8ArrayType::Pointer> OrthoRhombicOps::generatePoleFigure(PoleFigureC
   DoubleArrayType::Pointer intensity100 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label1 + "_Intensity_Image");
   DoubleArrayType::Pointer intensity010 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label2 + "_Intensity_Image");
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
+    bool doParallel = true;
 
   if(doParallel)
   {

diff --git a/Source/OrientationLib/LaueOps/TetragonalLowOps.cpp b/Source/OrientationLib/LaueOps/TetragonalLowOps.cpp
@@ -40,7 +40,6 @@
 #include <tbb/parallel_for.h>
 #include <tbb/blocked_range.h>
 #include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
 #include <tbb/task_group.h>
 #include <tbb/task.h>
 #endif
@@ -604,8 +603,7 @@ void TetragonalLowOps::generateSphereCoordsFromEulers(FloatArrayType* eulers, Fl
   }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
+    bool doParallel = true;
 #endif
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
@@ -795,8 +793,7 @@ QVector<UInt8ArrayType::Pointer> TetragonalLowOps::generatePoleFigure(PoleFigure
   DoubleArrayType::Pointer intensity011 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label1 + "_Intensity_Image");
   DoubleArrayType::Pointer intensity111 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label2 + "_Intensity_Image");
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
+    bool doParallel = true;
 
   if(doParallel)
   {

diff --git a/Source/OrientationLib/LaueOps/TetragonalOps.cpp b/Source/OrientationLib/LaueOps/TetragonalOps.cpp
@@ -40,7 +40,6 @@
 #include <tbb/parallel_for.h>
 #include <tbb/blocked_range.h>
 #include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
 #include <tbb/task_group.h>
 #include <tbb/task.h>
 #endif
@@ -646,8 +645,7 @@ void TetragonalOps::generateSphereCoordsFromEulers(FloatArrayType* eulers, Float
   }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
+    bool doParallel = true;
 #endif
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
@@ -835,8 +833,7 @@ QVector<UInt8ArrayType::Pointer> TetragonalOps::generatePoleFigure(PoleFigureCon
   DoubleArrayType::Pointer intensity011 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label1 + "_Intensity_Image");
   DoubleArrayType::Pointer intensity111 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label2 + "_Intensity_Image");
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
+    bool doParallel = true;
 
   if(doParallel)
   {

diff --git a/Source/OrientationLib/LaueOps/TriclinicOps.cpp b/Source/OrientationLib/LaueOps/TriclinicOps.cpp
@@ -39,7 +39,6 @@
 #include <tbb/parallel_for.h>
 #include <tbb/blocked_range.h>
 #include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
 #include <tbb/task_group.h>
 #include <tbb/task.h>
 #endif
@@ -587,8 +586,7 @@ void TriclinicOps::generateSphereCoordsFromEulers(FloatArrayType* eulers, FloatA
   }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
+    bool doParallel = true;
 #endif
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
@@ -776,8 +774,7 @@ QVector<UInt8ArrayType::Pointer> TriclinicOps::generatePoleFigure(PoleFigureConf
   DoubleArrayType::Pointer intensity011 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label1 + "_Intensity_Image");
   DoubleArrayType::Pointer intensity111 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label2 + "_Intensity_Image");
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
+    bool doParallel = true;
 
   if(doParallel)
   {

diff --git a/Source/OrientationLib/LaueOps/TrigonalLowOps.cpp b/Source/OrientationLib/LaueOps/TrigonalLowOps.cpp
@@ -39,7 +39,6 @@
 #include <tbb/parallel_for.h>
 #include <tbb/blocked_range.h>
 #include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
 #include <tbb/task_group.h>
 #include <tbb/task.h>
 #endif
@@ -626,8 +625,7 @@ void TrigonalLowOps::generateSphereCoordsFromEulers(FloatArrayType* eulers, Floa
   }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
+    bool doParallel = true;
 #endif
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
@@ -813,8 +811,7 @@ QVector<UInt8ArrayType::Pointer> TrigonalLowOps::generatePoleFigure(PoleFigureCo
   DoubleArrayType::Pointer intensity011 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label1 + "_Intensity_Image");
   DoubleArrayType::Pointer intensity111 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label2 + "_Intensity_Image");
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
+    bool doParallel = true;
 
   if(doParallel)
   {

diff --git a/Source/OrientationLib/LaueOps/TrigonalOps.cpp b/Source/OrientationLib/LaueOps/TrigonalOps.cpp
@@ -39,7 +39,6 @@
 #include <tbb/parallel_for.h>
 #include <tbb/blocked_range.h>
 #include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
 #include <tbb/task_group.h>
 #include <tbb/task.h>
 #endif
@@ -650,8 +649,7 @@ void TrigonalOps::generateSphereCoordsFromEulers(FloatArrayType* eulers, FloatAr
   }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
+    bool doParallel = true;
 #endif
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
@@ -832,8 +830,7 @@ QVector<UInt8ArrayType::Pointer> TrigonalOps::generatePoleFigure(PoleFigureConfi
   DoubleArrayType::Pointer intensity011 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label1 + "_Intensity_Image");
   DoubleArrayType::Pointer intensity111 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label2 + "_Intensity_Image");
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
+    bool doParallel = true;
 
   if(doParallel)
   {
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,6 +87,7 @@ if(NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY) @@
         )
     endif()
+    add_compile_definitions(QT_NO_KEYWORDS)
     #------------------------------------------------------------------------------
     # Find the Git Package for Versioning. It should be ok if Git is NOT found
@@ Expand Down @@