Merge branch 'master' into gui_V2

Author: dcwhite

.travis.yml

@@ -32,7 +32,12 @@ install:
 # TODO: could move script to separate file
 # Not running unit tests at the moment, so turn off testing, which will
 # hopefully make OS X builds a bit faster
-script: cd bin && cmake -DBUILD_TESTING:BOOL=OFF -DDOWNLOAD_TOOLKITS:BOOL=OFF ../src && make -j8
+script:
+  cd bin
+  && cmake -DDOWNLOAD_TOOLKITS:BOOL=OFF -DRUN_BASIC_REGRESSION_TESTS:BOOL=OFF ../src
+  && make -j8
+  && make SCIRunTestData_external
+#  && make test
 
 notifications:
   slack: sciinstitute:lZnpQQXNd4Io5iGDPQDpJmI1

src/Core/Application/Application.cc

@@ -219,11 +219,6 @@ bool Application::get_user_directory( boost::filesystem::path& user_dir, bool co
   return applicationHelper.get_user_directory(user_dir, config_path);
 }
 
-bool Application::get_user_desktop_directory( boost::filesystem::path& user_desktop_dir ) const
-{
-  return applicationHelper.get_user_desktop_directory(user_desktop_dir);
-}
-
 bool Application::get_config_directory( boost::filesystem::path& config_dir ) const
 {
   return applicationHelper.get_config_directory(config_dir);

src/Core/Application/Application.h

@@ -76,7 +76,6 @@ class SCISHARE Application : boost::noncopyable //: public EventHandler, public
   boost::filesystem::path logDirectory() const { return configDirectory(); }
   bool get_user_directory( boost::filesystem::path& user_dir, bool config_path) const;
   bool get_config_directory( boost::filesystem::path& config_dir ) const;
-  bool get_user_desktop_directory( boost::filesystem::path& user_desktop_dir ) const;
   bool get_user_name( std::string& user_name ) const;
 
   std::string commandHelpString() const;

src/Core/Application/Preferences/Preferences.cc

@@ -130,12 +130,8 @@ void Preferences::initialize_states()
 	{
 	  user_path = boost::filesystem::current_path();
 	}
-	boost::filesystem::path desktop_path;
-	Core::Application::Instance()->get_user_desktop_directory( desktop_path );
-
 	//General Preferences
 	this->add_state( "project_path", this->project_path_state_, user_path.string() );
-	this->add_state( "export_path", this->export_path_state_, desktop_path.string() );
 
 	this->add_state( "full_screen_on_startup", this->full_screen_on_startup_state_, false );
 	this->add_state( "auto_save", this->auto_save_state_, true );

src/Core/Application/Tests/ApplicationTests.cc

@@ -87,12 +87,4 @@ TEST(ApplicationTest, GetUserName)
   std::cout << user << std::endl;
 }
 
-TEST(ApplicationTest, GetUserDesktopDirectory)
-{
-  Application& app = Application::Instance();
-  boost::filesystem::path desktop;
-  ASSERT_TRUE(app.get_user_desktop_directory(desktop));
-  std::cout << desktop << std::endl;
-}
-
 #endif

src/Core/Datatypes/Tests/EigenDenseMatrixTests.cc

@@ -89,8 +89,9 @@ TEST(EigenDenseMatrixTest, CanCopyConstruct)
 TEST(EigenDenseMatrixTest, CanAssign)
 {
   DenseMatrix m(matrixNonSquare());
-  
+
   DenseMatrix m2(3,4);
+  m2.setZero();
   EXPECT_NE(m, m2);
   m2 = m;
   EXPECT_EQ(m, m2);

src/Core/Logging/Log.cc

@@ -419,50 +419,6 @@ bool ApplicationHelper::get_user_directory( boost::filesystem::path& user_dir, b
 #endif
 }
 
-
-bool ApplicationHelper::get_user_desktop_directory( boost::filesystem::path& user_desktop_dir )
-{
-#ifdef _WIN32
-  TCHAR dir[MAX_PATH];
-
-  // Try to create the local application directory
-  // If it already exists return the name of the directory.
-
-  if ( SUCCEEDED( SHGetFolderPath( 0, CSIDL_DESKTOPDIRECTORY, 0, 0, dir ) ) )
-  {
-    user_desktop_dir = boost::filesystem::path( dir );
-    return true;
-  }
-  else
-  {
-    std::cerr << "Could not get user desktop directory.";
-    return false;
-  }
-
-
-#else
-
-  if ( getenv( "HOME" ) )
-  {
-    user_desktop_dir = boost::filesystem::path( getenv( "HOME" ) ) / "Desktop" / "";
-
-    if (! boost::filesystem::exists( user_desktop_dir ) )
-    {
-      std::cerr << "Could not get user desktop directory.";
-      return false;
-    }
-
-
-    return true;
-  }
-  else
-  {
-    std::cerr << "Could not get user desktop directory.";
-    return false;
-  }
-#endif
-}
-
 bool ApplicationHelper::get_config_directory( boost::filesystem::path& config_dir )
 {
   boost::filesystem::path user_dir;

src/Modules/Fields/Tests/ExtractSimpleIsoSurfaceTest.cc

@@ -54,40 +54,40 @@ class ExtractSimpleIsosurfaceModuleTests : public ModuleTest
 
 FieldHandle LoadInTriangles()
 {
-   return loadFieldFromFile(TestResources::rootDir() / "Fields/ExtractSimpleIsosurface/test_isosimsuf_tri.fld");
+   return loadFieldFromFile(TestResources::rootDir() / "Fields/extractsimpleisosurface/test_isosimsuf_tri.fld");
 }
 
 FieldHandle LoadInTetrahedrals()
 {
-   return loadFieldFromFile(TestResources::rootDir() / "Fields/ExtractSimpleIsosurface/test_isosimsuf_tet.fld");
+   return loadFieldFromFile(TestResources::rootDir() / "Fields/extractsimpleisosurface/test_isosimsuf_tet.fld");
 }
 
 FieldHandle LoadInLatVol()
 {
-   return loadFieldFromFile(TestResources::rootDir() / "Fields/ExtractSimpleIsosurface/test_isosimsuf_latvol.fld");
+   return loadFieldFromFile(TestResources::rootDir() / "Fields/extractsimpleisosurface/test_isosimsuf_latvol.fld");
 }
 
 
 TEST_F(ExtractSimpleIsosurfaceModuleTests, ExtractSimpleIsosurfaceTriangleNoThrow_Example1)
 {
   auto test = makeModule("ExtractSimpleIsosurface");
-  FieldHandle f=LoadInTriangles(); 
+  FieldHandle f=LoadInTriangles();
   stubPortNWithThisData(test, 0, f);
   EXPECT_NO_THROW(test->execute());
 }
 
 TEST_F(ExtractSimpleIsosurfaceModuleTests, ExtractSimpleIsosurfaceTriangleNoThrow_Example2)
 {
   auto test = makeModule("ExtractSimpleIsosurface");
-  FieldHandle f=LoadInTetrahedrals(); 
+  FieldHandle f=LoadInTetrahedrals();
   stubPortNWithThisData(test, 0, f);
   EXPECT_NO_THROW(test->execute());
 }
 
 TEST_F(ExtractSimpleIsosurfaceModuleTests, ExtractSimpleIsosurfaceTriangleNoThrow_Example3)
 {
   auto test = makeModule("ExtractSimpleIsosurface");
-  FieldHandle f=LoadInLatVol(); 
+  FieldHandle f=LoadInLatVol();
   stubPortNWithThisData(test, 0, f);
   EXPECT_NO_THROW(test->execute());
 }

src/Modules/Legacy/Inverse/Tests/TikhonovFunctionalTest.cc

@@ -126,7 +126,7 @@ TEST_F(TikhonovFunctionalTest, loadIDFwdMatrixANDRandData)
 
 // ID non-square fwd matrix + RAND measured data  (underdetermined)
 // TODO: FAILS TEST: fails test when it shouldn't. The sizes of forward matrix and data are the same
-TEST_F(TikhonovFunctionalTest, loadIDNonSquareFwdMatrixANDRandData)
+TEST_F(TikhonovFunctionalTest, DISABLED_loadIDNonSquareFwdMatrixANDRandData)
 {
   // create inputs
   auto tikAlgImp = makeModule("SolveInverseProblemWithTikhonov");
@@ -172,7 +172,7 @@ TEST_F(TikhonovFunctionalTest, loadIDSquareFwdMatrixANDRandDataDiffSizes)
 
 // ID non-square fwd matrix + RAND measured data  - different sizes
 // TODO: FAILS TEST: does not fail test when it shouldn't. The sizes of forward matrix and data are the different (note that this is only for size(fwd,2) < size(data,1) )!
-TEST_F(TikhonovFunctionalTest, loadIDNonSquareFwdMatrixANDRandDataDiffSizes)
+TEST_F(TikhonovFunctionalTest, DISABLED_loadIDNonSquareFwdMatrixANDRandDataDiffSizes)
 {
   // create inputs
   auto tikAlgImp = makeModule("SolveInverseProblemWithTikhonov");
@@ -184,4 +184,4 @@ TEST_F(TikhonovFunctionalTest, loadIDNonSquareFwdMatrixANDRandDataDiffSizes)
   stubPortNWithThisData(tikAlgImp, 2, measuredData);
   // check result
   EXPECT_THROW(tikAlgImp->execute(), SCIRun::Core::DimensionMismatch);
-}
+}