Merge master.

Author: ayla

.travis.yml

@@ -1,3 +1,4 @@
+sudo: required
 language:
 - cpp
 
@@ -34,9 +35,7 @@ install:
 # hopefully make OS X builds a bit faster
 script:
   - cd bin
-  - cmake -DDOWNLOAD_TOOLKITS:BOOL=OFF -DRUN_BASIC_REGRESSION_TESTS:BOOL=OFF ../Superbuild
-  - make -j4
-  - cmake -DDOWNLOAD_TOOLKITS:BOOL=OFF -DRUN_BASIC_REGRESSION_TESTS:BOOL=OFF ../Superbuild # factory config needs 2 cmakes ?!?
+  - cmake -DDOWNLOAD_TOOLKITS:BOOL=OFF -DRUN_BASIC_REGRESSION_TESTS:BOOL=OFF -DBUILD_TESTING:BOOL=OFF ../Superbuild
   - make -j4
 #  make SCIRunTestData_external
 #  && make test

Superbuild/Superbuild.cmake

@@ -71,9 +71,8 @@ OPTION(BUILD_TESTING "Build with tests." ON)
 OPTION(BUILD_WITH_PYTHON "Build with python support." ON)
 
 ###########################################
-# Configure python
-OPTION(WITH_TETGEN "Build Tetgen." ON)
-MARK_AS_ADVANCED(WITH_TETGEN)
+# Configure tetgen
+OPTION(WITH_TETGEN "Build Tetgen." OFF)
 
 ###########################################
 # Configure Windows executable to run with

Superbuild/TetgenExternal.cmake

@@ -26,7 +26,7 @@
 
 SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
 ExternalProject_Add(Tetgen_external
-  URL "http://www.tetgen.org/1.5/src/tetgen1.5.0.tar.gz"
+  URL "http://www.tetgen.org/1.5/src/tetgen1.5.1-beta1.tar.gz"
   PATCH_COMMAND ""
   INSTALL_COMMAND ""
   CMAKE_CACHE_ARGS

build.sh

@@ -63,6 +63,7 @@ printhelp() {
     echo -e "--verbose\t\tTurn on verbose build"
 #    echo -e "--set-osx-version-min\tTarget a minimum Mac OS X version (currently ${OSX_TARGET_VERSION}, ${OSX_TARGET_ARCH}) [OS X only]"
 #    echo -e "--xcode-build\t\tConfigure and build Xcode project against ALL_BUILD target [OS X only]"
+    echo -e "--with-tetgen\t\tBuild SCIRun with Tetgen library"
     echo -e "--cmake=<path to cmake>\t\tUse given CMake"
     echo -e "--cmake-args=<cmake args>\t\tUse given CMake args"
     echo -e "--documentation\t\tEnable building documentation (requires LaTeX)"
@@ -169,7 +170,7 @@ find_cmake() {
 
 # handle both types of OS X generators
 configure_scirun_osx() {
-    local build_opts=$1
+    local build_opts=$@
 
     if [[ $setosxmin -eq 1 ]]; then
         build_opts="${build_opts} -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_TARGET_VERSION} -DCMAKE_OSX_SYSROOT:PATH=${OSX_TARGET_VERSION_SDK} -DCMAKE_OSX_ARCHITECTURES:STRING=${OSX_TARGET_ARCH}"
@@ -184,7 +185,7 @@ configure_scirun_osx() {
 
 # generic Unix makefile build
 configure_scirun_make() {
-    local build_opts=$1
+    local build_opts=$@
 
     build_opts="${build_opts} -DCMAKE_BUILD_TYPE:STRING=${buildtype} -DCMAKE_VERBOSE_MAKEFILE:BOOL=${verbosebuild}"
 
@@ -198,7 +199,7 @@ configure_scirun() {
     fi
     try cd $builddir
 
-    local COMMON_BUILD_OPTS="-DBUILD_DOCUMENTATION:BOOL=$documentation"
+    local COMMON_BUILD_OPTS="-DWITH_TETGEN:BOOL=$tetgenbuild -DBUILD_DOCUMENTATION:BOOL=$documentation"
 
     if [[ $osx -eq 1 ]]; then
         configure_scirun_osx $COMMON_BUILD_OPTS
@@ -268,6 +269,8 @@ verbosebuild="OFF"
 builddir="$DIR/bin"
 xcodebuild=0
 documentation="OFF"
+# currently off by default
+tetgenbuild="OFF"
 
 echo "Parsing arguments..."
 while [[ $1 != "" ]]; do
@@ -308,6 +311,8 @@ while [[ $1 != "" ]]; do
             else
               echo "WARNING: Only OS X supports the --xcode-build flag."
             fi;;
+        --with-tetgen)
+            tetgenbuild="ON";;
         --documentation)
             documentation="ON";;
         -j*)

src/CMake/Modules/MacOSXBundleInfo.plist.in

@@ -32,6 +32,8 @@
 	<true/>
 	<key>NSHumanReadableCopyright</key>
 	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
+        <key>NSHighResolutionCapable</key>
+        <true/>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>

src/CMakeLists.txt

@@ -353,8 +353,7 @@ MESSAGE(STATUS "Configuring CPMs")
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 # CPM Setup.
-#set(CPM_DIR "${CMAKE_CURRENT_BINARY_DIR}/Externals/cpm-packages" CACHE TYPE STRING)
-set(CPM_DIR "${CMAKE_CURRENT_BINARY_DIR}/cpm-packages" CACHE TYPE STRING)
+set(CPM_DIR "${CMAKE_CURRENT_BINARY_DIR}/cpm" CACHE TYPE STRING)
 find_package(Git)
 if(NOT GIT_FOUND)
   message(FATAL_ERROR "CPM requires Git.")
@@ -424,7 +423,7 @@ CPM_AddModule("es_general"
 # ++ MODULE: Entity System Rendering.
 CPM_AddModule("es_render"
   GIT_REPOSITORY "https://github.com/CIBC-Internal/cpm-es-render"
-  GIT_TAG "origin/AddFBO"
+  GIT_TAG "origin/FontTextures"
   USE_EXISTING_VER TRUE)
 
 # ++ MODULE: Acorn
@@ -453,6 +452,7 @@ MESSAGE(STATUS "Done configuring CPMs")
 # Copy Spire-SCIRun specific assets and shaders
 
 set(OUTPUT_SHADER_DIR ${CMAKE_CURRENT_BINARY_DIR}/Shaders)
+set(OUTPUT_FONT_DIR ${CMAKE_CURRENT_BINARY_DIR}/Fonts)
 set(OUTPUT_ASSET_DIR ${CMAKE_CURRENT_BINARY_DIR}/Assets)
 
 function (CopyShaders src_shader_dir dest_shader_dir)
@@ -465,6 +465,16 @@ function (CopyShaders src_shader_dir dest_shader_dir)
   endif()
 endfunction()
 
+function (CopyFonts src_font_dir dest_font_dir)
+  if (NOT dest_font_dir STREQUAL "")
+    file(COPY ${src_font_dir}/ DESTINATION ${dest_font_dir}
+      FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+      DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+                            GROUP_READ GROUP_EXECUTE
+                            WORLD_READ WORLD_EXECUTE)
+  endif()
+endfunction()
+
 function (CopyAssets src_asset_dir dest_asset_dir)
   if (NOT dest_asset_dir STREQUAL "")
     file(COPY ${src_asset_dir}/ DESTINATION ${dest_asset_dir}
@@ -481,6 +491,12 @@ else()
   message(WARNING "Not copying shader files. OUTPUT_SHADER_DIR variable not found.")
 endif()
 
+if (DEFINED OUTPUT_FONT_DIR)
+  CopyFonts(${CMAKE_CURRENT_SOURCE_DIR}/Interface/Modules/Render/ES/fonts ${OUTPUT_FONT_DIR})
+else()
+  message(WARNING "Not copying font files. OUTPUT_FONT_DIR variable not found.")
+endif()
+
 if (DEFINED OUTPUT_ASSET_DIR)
   CopyAssets(${CMAKE_CURRENT_SOURCE_DIR}/Interface/Modules/Render/ES/assets ${OUTPUT_ASSET_DIR})
 else()

src/Core/Algorithms/Base/AlgorithmBase.cc

@@ -73,7 +73,7 @@ namespace
 
 Variable::Variable(const Name& name, const Value& value) : name_(name)
 {
-  setValue(value);
+  Variable::setValue(value);
 }
 
 void Variable::setValue(const Value& val)
@@ -134,13 +134,6 @@ double AlgorithmParameter::toDouble() const
   return v ? *v : toInt();
 }
 
-std::vector<double> AlgorithmParameter::toDoubleVector() const
-{
-  return {};
-//  const std::vector<double>* v = boost::get<std::vector<double>>(&value_);
-//  return v ? *v : std::vector<double>();
-}
-
 std::string AlgorithmParameter::toString() const
 {
   const std::string* v = boost::get<std::string>(&value_);
@@ -334,14 +327,14 @@ DatatypeHandle& AlgorithmData::operator[](const Name& name)
   return vec[0];
 }
 
-void AlgorithmParameterList::add_option(const AlgorithmParameterName& key, const std::string& defval, const std::string& options)
+void AlgorithmParameterList::addOption(const AlgorithmParameterName& key, const std::string& defval, const std::string& options)
 {
   std::set<std::string> opts;
   boost::split(opts, options, boost::is_any_of("|"));
   parameters_[key] = AlgorithmParameter(key, AlgoOption(defval, opts));
 }
 
-bool AlgorithmParameterList::set_option(const AlgorithmParameterName& key, const std::string& value)
+bool AlgorithmParameterList::setOption(const AlgorithmParameterName& key, const std::string& value)
 {
   auto paramIt = parameters_.find(key);
 
@@ -363,7 +356,7 @@ bool AlgorithmParameterList::keyNotFoundPolicy(const AlgorithmParameterName& key
   BOOST_THROW_EXCEPTION(AlgorithmParameterNotFound() << Core::ErrorMessage("Algorithm has no parameter/option with name " + key.name_));
 }
 
-bool AlgorithmParameterList::get_option(const AlgorithmParameterName& key, std::string& value) const
+bool AlgorithmParameterList::getOption(const AlgorithmParameterName& key, std::string& value) const
 {
   auto paramIt = parameters_.find(key);
 
@@ -374,17 +367,17 @@ bool AlgorithmParameterList::get_option(const AlgorithmParameterName& key, std::
   return true;
 }
 
-std::string AlgorithmParameterList::get_option(const AlgorithmParameterName& key) const
+std::string AlgorithmParameterList::getOption(const AlgorithmParameterName& key) const
 {
   std::string value;
-  get_option(key, value);
+  getOption(key, value);
   return value;
 }
 
-bool AlgorithmParameterList::check_option(const AlgorithmParameterName& key, const std::string& value) const
+bool AlgorithmParameterList::checkOption(const AlgorithmParameterName& key, const std::string& value) const
 {
   std::string currentValue;
-  get_option(key, currentValue);
+  getOption(key, currentValue);
   return boost::iequals(value, currentValue);
 }
 

src/Core/Algorithms/Base/AlgorithmBase.h

@@ -44,7 +44,6 @@ namespace Algorithms {
   {
   public:
     virtual ~AlgorithmBase();
-    AlgorithmOutput run(const AlgorithmInput& input) const { return run_generic(input); }
   protected:
     void dumpAlgoState() const;
   };

src/Core/Algorithms/Base/AlgorithmData.h

@@ -97,8 +97,8 @@ namespace Algorithms {
     VariableHandle additionalAlgoOutput_;
   };
 
-  typedef boost::shared_ptr<AlgorithmInput> AlgorithmInputHandle;
-  typedef boost::shared_ptr<AlgorithmOutput> AlgorithmOutputHandle;
+  typedef Datatypes::SharedPointer<AlgorithmInput> AlgorithmInputHandle;
+  typedef Datatypes::SharedPointer<AlgorithmOutput> AlgorithmOutputHandle;
 
 }}}
 

src/Core/Algorithms/Base/AlgorithmFwd.h

@@ -29,18 +29,18 @@
 #ifndef ALGORITHMS_BASE_ALGORITHMFWD_H
 #define ALGORITHMS_BASE_ALGORITHMFWD_H
 
-#include <boost/shared_ptr.hpp>
+#include <Core/Datatypes/DatatypeFwd.h>
 #include <Core/Algorithms/Base/share.h>
 
 namespace SCIRun {
 namespace Core {
 namespace Algorithms {
 
   class AlgorithmBase;
-  typedef boost::shared_ptr<AlgorithmBase> AlgorithmHandle;
+  typedef Datatypes::SharedPointer<AlgorithmBase> AlgorithmHandle;
 
   class AlgorithmFactory;
-  typedef boost::shared_ptr<AlgorithmFactory> AlgorithmFactoryHandle;
+  typedef Datatypes::SharedPointer<AlgorithmFactory> AlgorithmFactoryHandle;
 
 }}}