BlueQuartzSoftware · joeykleingers · Nov 20, 2018 · Dec 4, 2018 · Dec 6, 2018 · Jan 2, 2019
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,7 +34,7 @@ cmake_minimum_required(VERSION 3.13.0)
 #------------------------------------------------------------------------------
 # Create the Top level Project
 #
-project(SIMPLProj VERSION 1.2.0.0)
+project(SIMPLProj VERSION 2.0.0.0)
 
 # ---------- Setup output Directories -------------------------
 if(NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
@@ -260,7 +260,8 @@ endif()
 set(SIMPL_USE_EIGEN "")
 Find_Package(Eigen3 REQUIRED)
 if(EIGEN3_FOUND)
-  message(STATUS "Eigen3: ${EIGEN3_VERSION_STRING}")
+  message(STATUS "Eigen3 Location: ${EIGEN3_ROOT_DIR}")
+  message(STATUS "Eigen3 Version: ${EIGEN3_VERSION_STRING}")
   set(SIMPL_USE_EIGEN "1" CACHE INTERNAL "")
 else()
   message(WARNING "The Eigen Library is required for some algorithms to execute. These algorithms will be disabled.")

diff --git a/Resources/UnitTestSupport.hpp b/Resources/UnitTestSupport.hpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* Redistributions of source code must retain the above copyright notice, this
-* list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright notice, this
-* list of conditions and the following disclaimer in the documentation and/or
-* other materials provided with the distribution.
-*
-* Neither the name of BlueQuartz Software, the US Air Force, nor the names of its
-* contributors may be used to endorse or promote products derived from this software
-* without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice, this
+ * list of conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.
+ *
+ * Neither the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * contributors may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -49,6 +49,8 @@
 #include <QtCore/QString>
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+
 namespace SIMPL
 {
 namespace unittest
@@ -63,7 +65,16 @@ static const char Passed[6] = {'P', 'A', 'S', 'S', 'E', 'D'};
 static const char Failed[6] = {'F', 'A', 'I', 'L', 'E', 'D'};
 static int SizeOfPassed = 6;
 static int SizeOfFailed = 6;
-}
+} // namespace unittest
+} // namespace SIMPL
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QTextStream& operator<<(QTextStream& out, const DataArrayPath& v)
+{
+  out << v.getDataContainerName() << "|" << v.getAttributeMatrixName() << "|" << v.getDataArrayName();
+  return out;
 }
 
 // -----------------------------------------------------------------------------
@@ -73,11 +84,11 @@ class TestException : public std::exception
 {
 public:
   /**
-  * @brief
-  * @param what
-  * @param file
-  * @param lineNumber
-  */
+   * @brief
+   * @param what
+   * @param file
+   * @param lineNumber
+   */
   TestException(const std::string& what, const std::string& filename, int lineNumber)
   : m_Message(what)
   , m_FileName(filename)
@@ -87,8 +98,8 @@ class TestException : public std::exception
   }
 
   /**
-  * @brief Copy Constructor
-  */
+   * @brief Copy Constructor
+   */
   TestException(const TestException& te)
   {
     m_Message = (&te)->getMessage();
@@ -272,10 +283,10 @@ inline int Sign(float* A)
 
 bool AlmostEqualUlpsFinal(float* A, float* B, int maxUlps)
 {
-// There are several optional checks that you can do, depending
-// on what behavior you want from your floating point comparisons.
-// These checks should not be necessary and they are included
-// mainly for completeness.
+  // There are several optional checks that you can do, depending
+  // on what behavior you want from your floating point comparisons.
+  // These checks should not be necessary and they are included
+  // mainly for completeness.
 
 #ifdef INFINITYCHECK
   // If A or B are infinity (positive or negative) then
@@ -567,4 +578,3 @@ template <typename T, typename K> void require_greater_than(T l, const QString&
     throw TestException(buf.toStdString(), file.toStdString(), line);
   }
 }
-
diff --git a/Source/H5Support/H5Utilities.h b/Source/H5Support/H5Utilities.h
@@ -36,12 +36,12 @@ namespace H5Support_NAMESPACE
   /**
    * @brief General Utilities for working with the HDF5 data files and API
    */
-  class H5Utilities
+  class H5Support_EXPORT H5Utilities
   {
 
     public:
 
-      virtual ~H5Utilities();
+      virtual ~H5Utilities() = default;
 
       enum CustomHDFDataTypes
       {
@@ -53,11 +53,11 @@ namespace H5Support_NAMESPACE
       };
 
       // -----------HDF5 File Operations
-      static H5Support_EXPORT hid_t openFile(const std::string& filename, bool readOnly = false);
+      static hid_t openFile(const std::string& filename, bool readOnly = false);
 
-      static H5Support_EXPORT hid_t createFile(const std::string& filename);
+      static hid_t createFile(const std::string& filename);
 
-      static H5Support_EXPORT herr_t closeFile(hid_t& fileId);
+      static herr_t closeFile(hid_t& fileId);
 
       // -------------- HDF Indentifier Methods ----------------------------
       /**
@@ -66,7 +66,7 @@ namespace H5Support_NAMESPACE
       * @param trim set to False to trim the path
       * @return  The path to the object relative to the objId
       */
-      static H5Support_EXPORT std::string getObjectPath(hid_t loc_id, bool trim = false);
+      static std::string getObjectPath(hid_t loc_id, bool trim = false);
 
       /**
       * @brief Returns the hdf object type
@@ -75,7 +75,7 @@ namespace H5Support_NAMESPACE
       * @param objType The type of the object
       * @return  Negative value on error
       */
-      static H5Support_EXPORT herr_t getObjectType(hid_t objId, const std::string& objName, int32_t* objType);
+      static herr_t getObjectType(hid_t objId, const std::string& objName, int32_t* objType);
 
       /**
       * @brief Retrieves the object name for a given index
@@ -84,38 +84,38 @@ namespace H5Support_NAMESPACE
       * @param name The variable to store the name
       * @return Negative value is error
       */
-      static H5Support_EXPORT herr_t objectNameAtIndex(hid_t fileId, int32_t idx, std::string& name);
+      static herr_t objectNameAtIndex(hid_t fileId, int32_t idx, std::string& name);
 
       /**
       * @brief Returns the path to an object's parent
       * @param objId The HDF5 id of the object
       * @param trim set to False to trim the path
       * @return  The path to the object relative to the objId
       */
-      static H5Support_EXPORT std::string getParentPath(hid_t objId);
+      static std::string getParentPath(hid_t objId);
 
       /**
       * @brief Returns the path to an object's parent
       * @param objectPath The HDF5 path to the object
       * @param trim set to False to trim the path
       * @return  The path to the object relative to the objId
       */
-      static H5Support_EXPORT std::string getParentPath(const std::string& objectPath);
+      static std::string getParentPath(const std::string& objectPath);
 
       /**
       * @brief Returns the object's name from object path
       * @param objectPath The HDF5 path to the object
       * @return  The object name
       */
-      static H5Support_EXPORT std::string getObjectNameFromPath(const std::string& objectPath);
+      static std::string getObjectNameFromPath(const std::string& objectPath);
 
       /**
       * @brief Returns if a given hdf5 object is a group
       * @param objId The hdf5 object that contains an object with name objName
       * @param objName The name of the object to check
       * @return True if the given hdf5 object id is a group
       */
-      static H5Support_EXPORT bool isGroup(hid_t nodeId, const std::string& objName);
+      static bool isGroup(hid_t nodeId, const std::string& objName);
 
 
       /**
@@ -124,23 +124,23 @@ namespace H5Support_NAMESPACE
       * @param objectPath The path of the object to open
       * @return The hdf5 id of the opened object. Negative value is error.
       */
-      static H5Support_EXPORT hid_t openHDF5Object(hid_t loc_id, const std::string& objName);
+      static hid_t openHDF5Object(hid_t loc_id, const std::string& objName);
 
       /**
       * @brief Closes the object id
       * @param locId The object id to close
       * @return Negative value is error.
       */
-      static H5Support_EXPORT herr_t closeHDF5Object(hid_t obj_id);
+      static herr_t closeHDF5Object(hid_t obj_id);
 
 
-      static H5Support_EXPORT std::string HDFClassTypeAsStr(hid_t class_type);
+      static std::string HDFClassTypeAsStr(hid_t class_type);
 
       /**
       * @brief prints the class type of the given class
       * @param classT The Class Type to print
       */
-      static H5Support_EXPORT void printHDFClassType(H5T_class_t class_type);
+      static void printHDFClassType(H5T_class_t class_type);
 
       // -------------- HDF Group Methods ----------------------------
       /**
@@ -150,7 +150,7 @@ namespace H5Support_NAMESPACE
       * @param names Variable to store the list
       * @return
       */
-      static H5Support_EXPORT herr_t getGroupObjects(hid_t loc_id, int32_t typeFilter, std::list<std::string>& names);
+      static herr_t getGroupObjects(hid_t loc_id, int32_t typeFilter, std::list<std::string>& names);
 
       /**
        * @brief Creates a HDF Group by checking if the group already exists. If the
@@ -160,7 +160,7 @@ namespace H5Support_NAMESPACE
        * @param group The name of the group to create. Note that this group name should
        * not be any sort of 'path'. It should be a single group.
        */
-      static H5Support_EXPORT hid_t createGroup(hid_t loc_id, const std::string& group);
+      static hid_t createGroup(hid_t loc_id, const std::string& group);
 
       /**
        * @brief Given a path relative to the Parent ID, this method will create all
@@ -169,7 +169,7 @@ namespace H5Support_NAMESPACE
        * @param parent The HDF unique id for the parent
        * @return Error Condition: Negative is error. Positive is success.
        */
-      static H5Support_EXPORT hid_t  createGroupsFromPath(const std::string& pathToCheck, hid_t parent);
+      static hid_t  createGroupsFromPath(const std::string& pathToCheck, hid_t parent);
 
       /**
        * @brief Given a path relative to the Parent ID, this method will create all
@@ -178,14 +178,14 @@ namespace H5Support_NAMESPACE
        * @param parent The HDF unique id for the parent
        * @return Error Condition: Negative is error. Positive is success.
        */
-      static H5Support_EXPORT hid_t createGroupsForDataset(const std::string& datasetPath, hid_t parent);
+      static hid_t createGroupsForDataset(const std::string& datasetPath, hid_t parent);
 
       /**
       * @brief Extracts the object name from a given path
       * @param path The path which to extract the object name
       * @return The name of the object
       */
-      static H5Support_EXPORT std::string extractObjectName(const std::string& path);
+      static std::string extractObjectName(const std::string& path);
 
       // -------------- HDF Attribute Methods ----------------------------
       /**
@@ -195,7 +195,7 @@ namespace H5Support_NAMESPACE
       * @param attr_name The attribute to look for (by name)
       * @return True if the attribute exists.
       */
-      static H5Support_EXPORT bool probeForAttribute(hid_t loc_id,
+      static bool probeForAttribute(hid_t loc_id,
                                                      const std::string& obj_name,
                                                      const std::string& attr_name);
 
@@ -206,7 +206,7 @@ namespace H5Support_NAMESPACE
       * @param names Variable to hold the list of attribute names
       * @return Negate value is error
       */
-      static H5Support_EXPORT herr_t getAllAttributeNames(hid_t obj_id, std::list<std::string>& results);
+      static herr_t getAllAttributeNames(hid_t obj_id, std::list<std::string>& results);
 
       /**
       * @brief Returns a list of all the attribute names
@@ -215,7 +215,7 @@ namespace H5Support_NAMESPACE
       * @param names Variable to hold the list of attribute names
       * @return Negative value is error
       */
-      static H5Support_EXPORT herr_t getAllAttributeNames(hid_t loc_id, const std::string& obj_name,
+      static herr_t getAllAttributeNames(hid_t loc_id, const std::string& obj_name,
                                                           std::list<std::string>& names);
 
 

diff --git a/Source/PipelineRunner/PipelineRunner.cpp b/Source/PipelineRunner/PipelineRunner.cpp
@@ -154,7 +154,7 @@ int main(int argc, char* argv[])
   }
   // Now actually execute the pipeline
   pipeline->execute();
-  err = pipeline->getErrorCondition();
+  err = pipeline->getErrorCode();
   if(err < 0)
   {
     std::cout << "Error Condition of Pipeline: " << err << std::endl;

diff --git a/Source/SIMPLib/CMakeLists.txt b/Source/SIMPLib/CMakeLists.txt
@@ -87,7 +87,7 @@ endMacro()
 
 #------------------------------------------------------------------------------
 # Set up the directories that are used for each Group
-set(SIMPL_Group_BASE_MODULES Common DataArrays DataContainers Geometry HDF5 Math StatsData Utilities ITK)
+set(SIMPL_Group_BASE_MODULES Common DataArrays DataContainers Geometry HDF5 Math Messages StatsData Utilities ITK)
 set(SIMPL_Group_FILTERS_MODULES Filtering FilterParameters VTKUtils)
 set(SIMPL_Group_PLUGIN_MODULES Plugin)
 set(SIMPL_Group_REST_MODULES REST)