Merge remote-tracking branch 'upstream/master' into show_field_tabs

# Conflicts:
#	src/Modules/Visualization/ShowFieldGlyphs.cc

Author: tpat

.travis.yml

@@ -17,18 +17,6 @@ matrix:
       sudo: required
       compiler: clang
       env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF
-    - os: osx
-      osx_image: xcode7.2
-      env: PYTHON_VERSION=3.4.3 OSPRAY_BUILD=OFF
-    - os: osx
-      osx_image: xcode8.3
-      env: PYTHON_VERSION=3.4.3 OSPRAY_BUILD=OFF
-    - os: osx
-      osx_image: xcode9.3
-      env: PYTHON_VERSION=3.4.3 OSPRAY_BUILD=OFF
-    - os: osx
-      osx_image: xcode10.1
-      env: PYTHON_VERSION=3.4.3 OSPRAY_BUILD=OFF
     - os: osx
       osx_image: xcode7.2
       env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF
@@ -44,12 +32,6 @@ matrix:
     - os: osx
       osx_image: xcode7.2
       env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF
-    - os: osx
-      osx_image: xcode8.3
-      env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF
-    - os: osx
-      osx_image: xcode9.3
-      env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF
     - os: osx
       osx_image: xcode10.1
       env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF

src/CMakeLists.txt

@@ -207,6 +207,18 @@ IF(BUILD_TESTING)
   ADD_DEFINITIONS(-DTEST_RESOURCE_ROOT_DIR="${SCIRUN_TEST_RESOURCE_DIR}" -DBUILD_TESTING)
 ENDIF()
 
+#########################################################################
+# Configure Spdlog
+set (cxxfeaturelist ${CMAKE_CXX_COMPILE_FEATURES})
+
+list (FIND cxxfeaturelist "cxx_thread_local" _index)
+if (${_index} GREATER -1)
+  message("Found cxx_thread_local")
+else()
+  message(WARNING "Did NOT find cxx_thread_local--turning off feature of spdlog")
+  add_definitions(-DDISABLE_SPDLOG_TLS=1)
+endif()
+
 #########################################################################
 # External projects
 

src/Core/Algorithms/Math/ResizeMatrixAlgo.cc

@@ -27,7 +27,6 @@ DEALINGS IN THE SOFTWARE.
 
 
 #include <Core/Algorithms/Math/ResizeMatrixAlgo.h>
-#include<Core/Datatypes/Matrix.h>
 #include <Core/Datatypes/DenseMatrix.h>
 #include <Core/Datatypes/MatrixTypeConversions.h>
 #include <Core/Algorithms/Base/AlgorithmVariableNames.h>
@@ -51,7 +50,6 @@ ResizeMatrixAlgo::ResizeMatrixAlgo()
   addParameter(Parameters::NoOfRows, 1);
   addParameter(Parameters::NoOfColumns, 1);
   addOption(Parameters::Major,"Row","Row|Column");
-
 }
 
 AlgorithmOutput ResizeMatrixAlgo::run(const AlgorithmInput& input) const
@@ -64,7 +62,7 @@ AlgorithmOutput ResizeMatrixAlgo::run(const AlgorithmInput& input) const
   std::string major=getOption(Parameters::Major);
   DenseMatrixHandle dense=castMatrix::toDense(inputMatrix);
   DenseMatrixHandle denseMat(new DenseMatrix(*dense));
-  
+
   if(major=="Column")
   {
     denseMat->transposeInPlace();
@@ -73,9 +71,9 @@ AlgorithmOutput ResizeMatrixAlgo::run(const AlgorithmInput& input) const
 
   Map<MatrixXd> result(denseMat->data(),columns,rows);
   DenseMatrixHandle outputArray(new DenseMatrix(result.matrix()));
-  
+
   outputArray->transposeInPlace();
-  
+
   if(denseMat->rows()*denseMat->cols() != rows*columns)
   {
     warning("Input size does not match the size of the Output Matrix, Matrix will be padded with zeros or cropped up.");
@@ -86,10 +84,10 @@ AlgorithmOutput ResizeMatrixAlgo::run(const AlgorithmInput& input) const
       resultMatrix[i]=0;
     }
   }
-  
+
   if(major=="Column")
     outputArray->transposeInPlace();
-  
+
   AlgorithmOutput output;
   output[Variables::OutputMatrix]=outputArray;
   return output;

src/Core/Algorithms/Math/ResizeMatrixAlgo.h

@@ -28,40 +28,27 @@
 #ifndef CORE_ALGORITHMS_MATH_ResizeMatrixALGO_H
 #define CORE_ALGORITHMS_MATH_ResizeMatrixALGO_H
 
-#include<Core/Datatypes/Matrix.h>
-#include<Core/Datatypes/DenseMatrix.h>
-#include<Core/Datatypes/DenseColumnMatrix.h>
-#include <Dataflow/Network/Module.h>
-#include <Eigen/Dense>
-
-#include<string>
-#include<sstream>
-#include<vector>
-#include<algorithm>
-
-#include<Core/Algorithms/Base/AlgorithmVariableNames.h>
 #include<Core/Algorithms/Base/AlgorithmBase.h>
 #include<Core/Algorithms/Math/share.h>
 
-namespace SCIRun{
-    namespace Core{
-        namespace Algorithms{
-            namespace Math{
-                
-                ALGORITHM_PARAMETER_DECL(NoOfRows);
-                ALGORITHM_PARAMETER_DECL(NoOfColumns);
-                ALGORITHM_PARAMETER_DECL(Major);
-                
-                
-                class SCISHARE ResizeMatrixAlgo : public AlgorithmBase
-                {
-                public:
-                  ResizeMatrixAlgo();
-                    
-                  AlgorithmOutput run(const AlgorithmInput& input) const;
-                    
-                    
-                };
+namespace SCIRun
+{
+    namespace Core
+    {
+        namespace Algorithms
+        {
+            namespace Math
+            {
+              ALGORITHM_PARAMETER_DECL(NoOfRows);
+              ALGORITHM_PARAMETER_DECL(NoOfColumns);
+              ALGORITHM_PARAMETER_DECL(Major);
+
+              class SCISHARE ResizeMatrixAlgo : public AlgorithmBase
+              {
+              public:
+                ResizeMatrixAlgo();
+                AlgorithmOutput run(const AlgorithmInput& input) const;
+              };
             }
         }
     }

src/Core/Datatypes/Color.cc

@@ -91,3 +91,9 @@ std::ostream& SCIRun::Core::Datatypes::operator<<(std::ostream& out, const Color
   out << "Color(" << color.r() << "," << color.g() << "," << color.b() << ")";
   return out;
 }
+
+bool ViewSceneFeedback::matchesWithModuleId(const std::string& modId) const
+{
+  auto toMatch = GeometryObject::delimiter + modId + GeometryObject::delimiter;
+  return selectionName.find(toMatch) != std::string::npos;
+}

src/Core/Datatypes/Color.h

@@ -84,6 +84,8 @@ namespace Datatypes {
     Geometry::Transform transform;
     std::string selectionName;
     std::tuple<int,int> windowSize;
+
+    bool matchesWithModuleId(const std::string& modId) const;
   };
 
   struct SCISHARE MeshComponentSelectionFeedback : ModuleFeedback

src/Core/Datatypes/Legacy/Color/Color.cc

@@ -35,7 +35,13 @@
 #ifndef Q_MOC_RUN
 #include <Core/Utils/Singleton.h>
 #include <boost/filesystem/path.hpp>
+
+// older Mac compiler does not support thread-local storage
+#if defined(__APPLE__) && defined(DISABLE_SPDLOG_TLS)
+#define SPDLOG_NO_TLS
+#endif
 #include <spdlog/spdlog.h>
+
 #endif
 #include <Core/Logging/share.h>
 

src/Core/Datatypes/Legacy/Color/Color.h

@@ -53,13 +53,7 @@
 #include <Core/Python/PythonInterpreter.h>
 
 #include <Dataflow/Engine/Python/SCIRunPythonModule.h>
-
-
-//#ifdef _MSC_VER
-//#pragma warning( pop )
-//#endif
-
-//#include <Interface/PythonTestGui/Python/ToPythonConverters.h>
+#include <Core/Logging/Log.h>
 
 using namespace SCIRun::Core;
 
@@ -506,6 +500,7 @@ void PythonInterpreter::print_banner()
 
 bool PythonInterpreter::run_string( const std::string& command )
 {
+  LOG_DEBUG("Python::run_string( {} )", command);
 	{
 		PythonInterpreterPrivate::lock_type lock( this->private_->get_mutex() );
 		if ( !this->private_->initialized_ )
@@ -582,6 +577,7 @@ bool PythonInterpreter::run_string( const std::string& command )
 
 void PythonInterpreter::run_script( const std::string& script )
 {
+  LOG_DEBUG("Python::run_script( {} )", script);
 	{
 		PythonInterpreterPrivate::lock_type lock( this->private_->get_mutex() );
 		if ( !this->private_->initialized_ )
@@ -627,6 +623,7 @@ void PythonInterpreter::run_script( const std::string& script )
 
 bool PythonInterpreter::run_file( const std::string& file_name )
 {
+  LOG_DEBUG("Python::run_file( {} )", file_name);
 	{
 		PythonInterpreterPrivate::lock_type lock( this->private_->get_mutex() );
 		if ( !this->private_->initialized_ )