Merge branch 'master' into python_1d_matrix

SCIInstitute · Oct 31, 2023 · 87d97a4 · 87d97a4
2 parents 32723e0 + 5736670
commit 87d97a4
Show file tree

Hide file tree

Showing 76 changed files with 3,152 additions and 319 deletions.
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
@@ -18,7 +18,7 @@ jobs:
 
  steps:
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
 
  - name: Prepare
  run: sudo apt-get update && sudo apt-get install mesa-common-dev libgl1-mesa-dev mesa-utils-extra libglapi-mesa ninja-build qt5-qmake qtbase5-dev libqt5opengl5-dev libqt5svg5-dev
@@ -40,7 +40,7 @@ jobs:
 
  steps:
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
 
  - name: Prepare
  run: sudo apt-get update && sudo apt-get install mesa-common-dev libgl1-mesa-dev mesa-utils-extra libglapi-mesa ninja-build qt5-qmake qtbase5-dev libqt5opengl5-dev libqt5svg5-dev
@@ -62,7 +62,7 @@ jobs:
 
  steps:
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
 
  - name: Prepare
  run: sudo apt-get update && sudo apt-get install mesa-common-dev libgl1-mesa-dev mesa-utils-extra libglapi-mesa ninja-build
@@ -84,7 +84,7 @@ jobs:
 
  steps:
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
 
  - name: Prepare
  run: sudo apt-get update && sudo apt-get install mesa-common-dev libgl1-mesa-dev mesa-utils-extra libglapi-mesa ninja-build qt5-qmake qtbase5-dev libqt5opengl5-dev libqt5svg5-dev
@@ -106,7 +106,7 @@ jobs:
 
  steps:
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
 
  - name: Prepare
  run: sudo apt-get update && sudo apt-get install mesa-common-dev libgl1-mesa-dev mesa-utils-extra libglapi-mesa ninja-build qt5-qmake qtbase5-dev libqt5opengl5-dev libqt5svg5-dev xorg-dev libglu1-mesa-dev

diff --git a/.github/workflows/check-doc-website.yml b/.github/workflows/check-doc-website.yml
@@ -15,7 +15,7 @@ jobs:
  runs-on: ubuntu-latest
 
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - name: Set up Ruby
  uses: ruby/setup-ruby@v1
  with:

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -12,7 +12,7 @@ jobs:
 
  steps:
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  with:
  fetch-depth: 0
 
@@ -47,7 +47,7 @@ jobs:
  ./repair_package.sh
 
  - name: Upload installer
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
  with:
  name: SCIRunMacInstaller
  path: bin/SCIRun/SCIRun-5.0.beta.*-Darwin.pkg
@@ -70,7 +70,7 @@ jobs:
 
  steps:
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  with:
  fetch-depth: 0
 
@@ -102,7 +102,7 @@ jobs:
  ./repair_package.sh
 
  - name: Upload installer
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
  with:
  name: SCIRunMacNPInstaller
  path: bin/SCIRun/SCIRun-5.0.beta.*-Darwin.pkg
@@ -113,7 +113,7 @@ jobs:
 
  steps:
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  with:
  fetch-depth: 0
 
@@ -148,7 +148,7 @@ jobs:
  ./repair_package.sh
 
  - name: Upload installer
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
  with:
  name: SCIRunMacOsprayInstaller
  path: bin/SCIRun/SCIRun-5.0.beta.*-Darwin.pkg
@@ -171,7 +171,7 @@ jobs:
 
  steps:
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
 
  - name: Prepare
  run: |

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -15,7 +15,7 @@ jobs:
  steps:
 
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
 
  - name: Configure
  working-directory: bin
@@ -34,13 +34,13 @@ jobs:
  shell: cmd
  run: cmake --build . --target RUN_TESTS --config Release
 
- windows-build-gui:
+ windows-build-gui-qt5:
  runs-on: windows-2019
 
  steps:
 
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  with:
  fetch-depth: 0
 
@@ -76,10 +76,58 @@ jobs:
  run: cmake --build . --config Release --target package
 
  - name: Upload installer
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
  continue-on-error: true
  with:
- name: SCIRunWindowsInstaller
+ name: SCIRunWindowsInstaller_qt5
+ path: bin/SCIRun/SCIRun-5.0.beta.*-win64.exe
+
+ windows-build-gui-qt6:
+ runs-on: windows-2019
+
+ steps:
+
+ - name: Checkout
+ uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+
+ - name: Install Qt
+ uses: jurplel/install-qt-action@v3
+ env:
+ ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
+ with:
+ version: 6.3.*
+ target: desktop
+ host: windows
+ arch: win64_msvc2019_64
+ setup-python: 'false'
+ install-deps: true
+
+ - name: Print out Qt directory
+ run: echo $Env:Qt6_Dir
+
+ - name: Configure
+ working-directory: bin
+ run: |
+ cmake ..\Superbuild -DCMAKE_BUILD_TYPE=Release -G"Visual Studio 16 2019" -Ax64 -DSCIRUN_QT_MIN_VERSION:STRING="6.3.1" -DQt_PATH:PATH="$env:Qt6_Dir" -DBUILD_WITH_PYTHON:BOOL=OFF
+
+ - name: Compile
+ working-directory: bin
+ shell: cmd
+ run: cmake --build . --config Release -j 3
+
+ - name: Package
+ working-directory: bin/SCIRun
+ shell: cmd
+ continue-on-error: true
+ run: cmake --build . --config Release --target package
+
+ - name: Upload installer
+ uses: actions/upload-artifact@v3
+ continue-on-error: true
+ with:
+ name: SCIRunWindowsInstaller_qt6
  path: bin/SCIRun/SCIRun-5.0.beta.*-win64.exe
 
  windows-build-gui-python:
@@ -88,7 +136,7 @@ jobs:
  steps:
 
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  with:
  fetch-depth: 0
 
@@ -121,7 +169,7 @@ jobs:
  run: cmake --build . --config Release --target package
 
  - name: Upload installer
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
  continue-on-error: true
  with:
  name: SCIRunWindowsPythonInstaller
@@ -144,7 +192,7 @@ jobs:
  steps:
 
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  with:
  fetch-depth: 0
 
@@ -177,7 +225,7 @@ jobs:
  run: cmake --build . --config Release --target package
 
  - name: Upload installer
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
  continue-on-error: true
  with:
  name: SCIRunWindowsOsprayInstaller
@@ -193,3 +241,22 @@ jobs:
  # title: "Development Build for Windows"
  # files: |
  # bin/SCIRun/SCIRun-5.0.beta.*-win64.exe
+
+ windows-better-build:
+
+ runs-on: ${{ matrix.os }}
+ strategy:
+ matrix:
+ os: [windows-2022, windows-2019]
+ qt: ["5.15.2", "6.3.1"]
+ hl: ["ON", "OFF"]
+ py: ["ON", "OFF"]
+ osp: ["ON", "OFF"]
+ tst: ["ON", "OFF"]
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+
+ - name: Print out config command
+ run: echo "cmake ..\Superbuild -DCMAKE_BUILD_TYPE=Release -DWITH_OSPRAY:BOOL=${{ matrix.osp }} -DQt_PATH:STRING=${{ matrix.qt }} -DBUILD_HEADLESS:BOOL=${{ matrix.hl }} -DBUILD_WITH_PYTHON:BOOL=${{ matrix.py }} -DBUILD_TESTING:BOOL=${{ matrix.tst }}"
diff --git a/README.md b/README.md
@@ -3,7 +3,6 @@
 ## SCIRun 5
 <!-- https://github.com/SCIInstitute/SCIRun -->
 
-[![Build Status](https://travis-ci.org/SCIInstitute/SCIRun.svg)](https://travis-ci.org/SCIInstitute/SCIRun)
 ![mac-build](https://github.com/SCIInstitute/SCIRun/workflows/mac-build/badge.svg)
 ![linux-build](https://github.com/SCIInstitute/SCIRun/workflows/linux-build/badge.svg)
 ![windows-build](https://github.com/SCIInstitute/SCIRun/workflows/windows-build/badge.svg)
@@ -53,7 +52,7 @@ For help, check out the discussion page: https://github.com/SCIInstitute/SCIRun/
 
  The MIT License
 
- Copyright (c) 2020 Scientific Computing and Imaging Institute,
+ Copyright (c) 2023 Scientific Computing and Imaging Institute,
  University of Utah.
 
 

diff --git a/appveyor.yml b/appveyor.yml
diff --git a/windowsBuild.bat → scripts/windowsBuild.bat b/windowsBuild.bat → scripts/windowsBuild.bat
diff --git a/src/Core/Algorithms/Base/AlgorithmBase.cc b/src/Core/Algorithms/Base/AlgorithmBase.cc
@@ -483,3 +483,10 @@ std::vector<bool> Core::Algorithms::toBoolVector(const Variable::List& list)
 {
  return toTypedVector<bool>(list, [](const Variable& v) { return v.toBool(); });
 }
+
+std::string SCIRun::Core::Algorithms::to_string(const Variable::Value& v)
+{
+ std::ostringstream o;
+ o << v;
+ return o.str();
+}
diff --git a/src/Core/Algorithms/Base/Variable.h b/src/Core/Algorithms/Base/Variable.h
@@ -92,6 +92,7 @@ namespace Algorithms {
  SCISHARE bool operator==(const Variable& lhs, const Variable& rhs);
  SCISHARE bool operator!=(const Variable& lhs, const Variable& rhs);
  SCISHARE std::ostream& operator<<(std::ostream& out, const Variable& var);
+ SCISHARE std::string to_string(const Variable::Value& v);
 }}}
 
 #endif
diff --git a/src/Core/Algorithms/Legacy/Fields/TransformMesh/ProjectPointsOntoMesh.cc b/src/Core/Algorithms/Legacy/Fields/TransformMesh/ProjectPointsOntoMesh.cc
@@ -60,12 +60,18 @@ bool ProjectPointsOntoMeshAlgo::runImpl(FieldHandle input, FieldHandle object, F
  return (false);
  }
 
- if (!object)
+ if (!object || !object->vmesh())
  {
  error("No mesh to project points onto.");
  return (false);
  }
 
+ if (object->vmesh()->is_empty())
+ {
+ error("Object mesh is empty--nothing to project points onto.");
+ return false;
+ }
+
  FieldInformation fi(input), fo(input), fobj(object);
 
  // Create the proper output type

diff --git a/src/Core/Algorithms/Math/Tests/CMakeLists.txt b/src/Core/Algorithms/Math/Tests/CMakeLists.txt
@@ -43,6 +43,7 @@ SET(Algorithms_Math_Tests_SRCS
  ComputeSVDtest.cc
  CollectMatricesAlgorithmTest.cc
  ComputeTensorUncertaintyTests.cc
+ StreamingReaderTests.cc
 )
 
 #SET(Engine_Network_Tests_HEADERS

diff --git a/src/Core/Algorithms/Math/Tests/ComputeTensorUncertaintyTests.cc b/src/Core/Algorithms/Math/Tests/ComputeTensorUncertaintyTests.cc
@@ -135,7 +135,8 @@ TEST(ComputeTensorUncertaintyTest, DISABLED_LinearInvariant)
  ASSERT_NEAR(eigs[i], eigs_expected[i], epsilon);
 }
 
-TEST(ComputeTensorUncertaintyTest, Covariance)
+//TODO: fix expected numbers
+TEST(ComputeTensorUncertaintyTest, DISABLED_Covariance)
 {
  const double unitHalf = 0.5 * std::sqrt(2);
  auto fh1 = tensorToField(Tensor(5*Vector(1,0,0), 3*Vector(0,1,0), Vector(0,0,1)));