Merge remote-tracking branch 'upstream/master'

Author: jessdtate

README.md

@@ -19,7 +19,7 @@ https://github.com/SCIInstitute/SCIRun
 
 ### Summary
 
-| Warning! |  SCIRun 5 is alpha software, you may use for real science but beware of instability.  |
+| Warning! |  SCIRun 5 is beta software, you may use for real science but beware of instability.  |
 |:--------:|:-------------------------------------------------------------------------------------:|
 
 ### Goals

src/Core/Python/Tests/PythonInterpreterTests.cc

@@ -133,10 +133,10 @@ class FieldConversionTests : public testing::Test
     return loadFieldFromFile(TestResources::rootDir() / "Fields/test_image_node.fld");
   }
 
-  //static FieldHandle CreatePointCloudScalar()
-  //{
-  //  return loadFieldFromFile(TestResources::rootDir() / "Fields/point_cloud/scalar/pts_scalar.fld");
-  //}
+  static FieldHandle CreateTriSurfFromCVRTI()
+  {
+    return loadFieldFromFile(TestResources::rootDir() / "Fields/CVRTI_cappedTorso/CappedTorso_192.fld");
+  }
 
   static std::vector<FieldHandle> fileExamples()
   {
@@ -332,6 +332,62 @@ TEST_F(FieldConversionTests, RoundTripTetVolNode)
   EXPECT_EQ("GenericField<TetVolMesh<TetLinearLgn<Point>>,TetLinearLgn<double>,vector<double>>", info.get_field_type_id());
 }
 
+// TODO: found a workaround for Brett's failing mesh (need to set data to all zeros)
+TEST_F(FieldConversionTests, DISABLED_RoundTripTriSurfCVRTI)
+{
+  auto expected = CreateTriSurfFromCVRTI();
+  {
+    FieldInformation info(expected);
+    EXPECT_TRUE(info.is_trisurf());
+    EXPECT_TRUE(info.is_double());
+    EXPECT_TRUE(info.is_scalar());
+    EXPECT_TRUE(info.is_linear());
+    EXPECT_EQ("TriSurfMesh<TriLinearLgn<Point>>", info.get_mesh_type_id());
+    EXPECT_EQ("TriSurfMesh", info.get_mesh_type());
+    EXPECT_EQ("GenericField<TriSurfMesh<TriLinearLgn<Point>>,TriLinearLgn<double>,vector<double>>", info.get_field_type_id());
+  }
+
+  auto pyField = convertFieldToPython(expected);
+  EXPECT_EQ(10, len(pyField.items()));
+  {
+    boost::python::extract<boost::python::dict> e(pyField);
+    auto pyMatlabDict = e();
+
+    auto length = len(pyMatlabDict);
+
+    auto keys = pyMatlabDict.keys();
+    auto values = pyMatlabDict.values();
+
+    for (int i = 0; i < length; ++i)
+    {
+      boost::python::extract<std::string> key_i(keys[i]);
+
+      boost::python::extract<std::string> value_i_string(values[i]);
+      boost::python::extract<boost::python::list> value_i_list(values[i]);
+      auto fieldName = key_i();
+      std::cout << "setting field " << fieldName << " " << (value_i_string.check() ? value_i_string() : "NOT A STRING") << std::endl;
+    }
+  }
+
+  FieldExtractor converter(pyField);
+
+  ASSERT_TRUE(converter.check());
+
+  auto actual = converter();
+  ASSERT_TRUE(actual != nullptr);
+  auto actualField = boost::dynamic_pointer_cast<Field>(actual);
+  ASSERT_TRUE(actualField != nullptr);
+
+  FieldInformation info(actualField);
+  EXPECT_TRUE(info.is_trisurf());
+  EXPECT_TRUE(info.is_double());
+  EXPECT_TRUE(info.is_scalar());
+  EXPECT_TRUE(info.is_linear());
+  EXPECT_EQ("TriSurfMesh<TriLinearLgn<Point>>", info.get_mesh_type_id());
+  EXPECT_EQ("TriSurfMesh", info.get_mesh_type());
+  EXPECT_EQ("GenericField<TriSurfMesh<TriLinearLgn<Point>>,TriLinearLgn<double>,vector<double>>", info.get_field_type_id());
+}
+
 TEST_F(FieldConversionTests, RoundTripTetVolCell)
 {
   auto expected = CreateTetMeshScalarOnElem();

src/Interface/Application/SCIRunMainWindow.cc

@@ -326,8 +326,8 @@ SCIRunMainWindow::SCIRunMainWindow() : shortcuts_(nullptr), returnCode_(0), quit
   //TODO: store in xml file, add to app resources
 	connect(actionForwardInverse_, SIGNAL(triggered()), this, SLOT(toolkitDownload()));
   actionForwardInverse_->setProperty(ToolkitIconURL, QString("http://www.sci.utah.edu/images/software/forward-inverse/forward-inverse-mod.png"));
-  actionForwardInverse_->setProperty(ToolkitURL, QString("http://sci.utah.edu/devbuilds/scirun5/toolkits/FwdInvToolkit_v1.zip"));
-  actionForwardInverse_->setProperty(ToolkitFilename, QString("FwdInvToolkit_v1.zip"));
+  actionForwardInverse_->setProperty(ToolkitURL, QString("http://sci.utah.edu/devbuilds/scirun5/toolkits/FwdInvToolkit_v1.2.zip"));
+  actionForwardInverse_->setProperty(ToolkitFilename, QString("FwdInvToolkit_v1.2.zip"));
   actionForwardInverse_->setIcon(QPixmap(":/general/Resources/download.png"));
 
 	connect(actionBrainStimulator_, SIGNAL(triggered()), this, SLOT(toolkitDownload()));
@@ -1940,7 +1940,11 @@ void FileDownloader::fileDownloaded(QNetworkReply* reply)
 void FileDownloader::downloadProgress(qint64 received, qint64 total)
 {
   if (statusBar_)
+	{
     statusBar_->showMessage(tr("File progress: %1 / %2").arg(received).arg(total), 1000);
+		if (received == total)
+			statusBar_->showMessage("File downloaded.", 1000);
+	}
 }
 
 void SCIRunMainWindow::toolkitDownload()
@@ -1983,7 +1987,7 @@ void ToolkitDownloader::showMessageBox()
 #else
   toolkitInfo.setText("Toolkit information");
 #endif
-  toolkitInfo.setInformativeText("Click OK to download the latest version of this toolkit.");
+  toolkitInfo.setInformativeText("Click OK to download the latest version of this toolkit:\n\n" + fileUrl_);
   toolkitInfo.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
   toolkitInfo.setIconPixmap(image);
   toolkitInfo.setDefaultButton(QMessageBox::Ok);
@@ -2012,4 +2016,5 @@ void ToolkitDownloader::saveToolkit()
   file.open(QIODevice::WriteOnly);
   file.write(zipDownloader_->downloadedData());
   file.close();
+	statusBar_->showMessage("Toolkit file saved.", 1000);
 }