Skip to content

Commit 0bf4805

Browse files
dcwhitedcwhite
authored
Merge pull request #2419 from SCIInstitute/py-undo
Spring/fall testing lunch work
2 parents ddce18e + e20c721 commit 0bf4805

File tree

75 files changed

+3151
-318
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+3151
-318
lines changed

‎.github/workflows/ccpp.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v2
21+
uses: actions/checkout@v3
2222

2323
- name: Prepare
2424
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:
4040

4141
steps:
4242
- name: Checkout
43-
uses: actions/checkout@v2
43+
uses: actions/checkout@v3
4444

4545
- name: Prepare
4646
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:
6262

6363
steps:
6464
- name: Checkout
65-
uses: actions/checkout@v2
65+
uses: actions/checkout@v3
6666

6767
- name: Prepare
6868
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:
8484

8585
steps:
8686
- name: Checkout
87-
uses: actions/checkout@v2
87+
uses: actions/checkout@v3
8888

8989
- name: Prepare
9090
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:
106106

107107
steps:
108108
- name: Checkout
109-
uses: actions/checkout@v2
109+
uses: actions/checkout@v3
110110

111111
- name: Prepare
112112
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

‎.github/workflows/check-doc-website.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v3
1919
- name: Set up Ruby
2020
uses: ruby/setup-ruby@v1
2121
with:

‎.github/workflows/mac.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v3
1616
with:
1717
fetch-depth: 0
1818

@@ -47,7 +47,7 @@ jobs:
4747
./repair_package.sh
4848
4949
- name: Upload installer
50-
uses: actions/upload-artifact@v2
50+
uses: actions/upload-artifact@v3
5151
with:
5252
name: SCIRunMacInstaller
5353
path: bin/SCIRun/SCIRun-5.0.beta.*-Darwin.pkg
@@ -70,7 +70,7 @@ jobs:
7070

7171
steps:
7272
- name: Checkout
73-
uses: actions/checkout@v2
73+
uses: actions/checkout@v3
7474
with:
7575
fetch-depth: 0
7676

@@ -102,7 +102,7 @@ jobs:
102102
./repair_package.sh
103103
104104
- name: Upload installer
105-
uses: actions/upload-artifact@v2
105+
uses: actions/upload-artifact@v3
106106
with:
107107
name: SCIRunMacNPInstaller
108108
path: bin/SCIRun/SCIRun-5.0.beta.*-Darwin.pkg
@@ -113,7 +113,7 @@ jobs:
113113

114114
steps:
115115
- name: Checkout
116-
uses: actions/checkout@v2
116+
uses: actions/checkout@v3
117117
with:
118118
fetch-depth: 0
119119

@@ -148,7 +148,7 @@ jobs:
148148
./repair_package.sh
149149
150150
- name: Upload installer
151-
uses: actions/upload-artifact@v2
151+
uses: actions/upload-artifact@v3
152152
with:
153153
name: SCIRunMacOsprayInstaller
154154
path: bin/SCIRun/SCIRun-5.0.beta.*-Darwin.pkg
@@ -171,7 +171,7 @@ jobs:
171171

172172
steps:
173173
- name: Checkout
174-
uses: actions/checkout@v2
174+
uses: actions/checkout@v3
175175

176176
- name: Prepare
177177
run: |

‎.github/workflows/windows.yml‎

Lines changed: 76 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616

1717
- name: Checkout
18-
uses: actions/checkout@v2
18+
uses: actions/checkout@v3
1919

2020
- name: Configure
2121
working-directory: bin
@@ -34,13 +34,13 @@ jobs:
3434
shell: cmd
3535
run: cmake --build . --target RUN_TESTS --config Release
3636

37-
windows-build-gui:
37+
windows-build-gui-qt5:
3838
runs-on: windows-2019
3939

4040
steps:
4141

4242
- name: Checkout
43-
uses: actions/checkout@v2
43+
uses: actions/checkout@v3
4444
with:
4545
fetch-depth: 0
4646

@@ -76,10 +76,58 @@ jobs:
7676
run: cmake --build . --config Release --target package
7777

7878
- name: Upload installer
79-
uses: actions/upload-artifact@v2
79+
uses: actions/upload-artifact@v3
8080
continue-on-error: true
8181
with:
82-
name: SCIRunWindowsInstaller
82+
name: SCIRunWindowsInstaller_qt5
83+
path: bin/SCIRun/SCIRun-5.0.beta.*-win64.exe
84+
85+
windows-build-gui-qt6:
86+
runs-on: windows-2019
87+
88+
steps:
89+
90+
- name: Checkout
91+
uses: actions/checkout@v3
92+
with:
93+
fetch-depth: 0
94+
95+
- name: Install Qt
96+
uses: jurplel/install-qt-action@v3
97+
env:
98+
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
99+
with:
100+
version: 6.3.*
101+
target: desktop
102+
host: windows
103+
arch: win64_msvc2019_64
104+
setup-python: 'false'
105+
install-deps: true
106+
107+
- name: Print out Qt directory
108+
run: echo $Env:Qt6_Dir
109+
110+
- name: Configure
111+
working-directory: bin
112+
run: |
113+
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
114+
115+
- name: Compile
116+
working-directory: bin
117+
shell: cmd
118+
run: cmake --build . --config Release -j 3
119+
120+
- name: Package
121+
working-directory: bin/SCIRun
122+
shell: cmd
123+
continue-on-error: true
124+
run: cmake --build . --config Release --target package
125+
126+
- name: Upload installer
127+
uses: actions/upload-artifact@v3
128+
continue-on-error: true
129+
with:
130+
name: SCIRunWindowsInstaller_qt6
83131
path: bin/SCIRun/SCIRun-5.0.beta.*-win64.exe
84132

85133
windows-build-gui-python:
@@ -88,7 +136,7 @@ jobs:
88136
steps:
89137

90138
- name: Checkout
91-
uses: actions/checkout@v2
139+
uses: actions/checkout@v3
92140
with:
93141
fetch-depth: 0
94142

@@ -121,7 +169,7 @@ jobs:
121169
run: cmake --build . --config Release --target package
122170

123171
- name: Upload installer
124-
uses: actions/upload-artifact@v2
172+
uses: actions/upload-artifact@v3
125173
continue-on-error: true
126174
with:
127175
name: SCIRunWindowsPythonInstaller
@@ -144,7 +192,7 @@ jobs:
144192
steps:
145193

146194
- name: Checkout
147-
uses: actions/checkout@v2
195+
uses: actions/checkout@v3
148196
with:
149197
fetch-depth: 0
150198

@@ -177,7 +225,7 @@ jobs:
177225
run: cmake --build . --config Release --target package
178226

179227
- name: Upload installer
180-
uses: actions/upload-artifact@v2
228+
uses: actions/upload-artifact@v3
181229
continue-on-error: true
182230
with:
183231
name: SCIRunWindowsOsprayInstaller
@@ -193,3 +241,22 @@ jobs:
193241
# title: "Development Build for Windows"
194242
# files: |
195243
# bin/SCIRun/SCIRun-5.0.beta.*-win64.exe
244+
245+
windows-better-build:
246+
247+
runs-on: ${{ matrix.os }}
248+
strategy:
249+
matrix:
250+
os: [windows-2022, windows-2019]
251+
qt: ["5.15.2", "6.3.1"]
252+
hl: ["ON", "OFF"]
253+
py: ["ON", "OFF"]
254+
osp: ["ON", "OFF"]
255+
tst: ["ON", "OFF"]
256+
257+
steps:
258+
- name: Checkout
259+
uses: actions/checkout@v3
260+
261+
- name: Print out config command
262+
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 }}"

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
## SCIRun 5
44
<!-- https://github.com/SCIInstitute/SCIRun -->
55

6-
[![Build Status](https://travis-ci.org/SCIInstitute/SCIRun.svg)](https://travis-ci.org/SCIInstitute/SCIRun)
76
![mac-build](https://github.com/SCIInstitute/SCIRun/workflows/mac-build/badge.svg)
87
![linux-build](https://github.com/SCIInstitute/SCIRun/workflows/linux-build/badge.svg)
98
![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/
5352

5453
The MIT License
5554

56-
Copyright (c) 2020 Scientific Computing and Imaging Institute,
55+
Copyright (c) 2023 Scientific Computing and Imaging Institute,
5756
University of Utah.
5857

5958

‎appveyor.yml‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎windowsBuild.bat‎ renamed to ‎scripts/windowsBuild.bat‎

File renamed without changes.

‎src/Core/Algorithms/Base/AlgorithmBase.cc‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,3 +483,10 @@ std::vector<bool> Core::Algorithms::toBoolVector(const Variable::List& list)
483483
{
484484
return toTypedVector<bool>(list, [](const Variable& v) { return v.toBool(); });
485485
}
486+
487+
std::string SCIRun::Core::Algorithms::to_string(const Variable::Value& v)
488+
{
489+
std::ostringstream o;
490+
o << v;
491+
return o.str();
492+
}

‎src/Core/Algorithms/Base/Variable.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ namespace Algorithms {
9292
SCISHARE bool operator==(const Variable& lhs, const Variable& rhs);
9393
SCISHARE bool operator!=(const Variable& lhs, const Variable& rhs);
9494
SCISHARE std::ostream& operator<<(std::ostream& out, const Variable& var);
95+
SCISHARE std::string to_string(const Variable::Value& v);
9596
}}}
9697

9798
#endif

‎src/Core/Algorithms/Legacy/Fields/TransformMesh/ProjectPointsOntoMesh.cc‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,18 @@ bool ProjectPointsOntoMeshAlgo::runImpl(FieldHandle input, FieldHandle object, F
6060
return (false);
6161
}
6262

63-
if (!object)
63+
if (!object || !object->vmesh())
6464
{
6565
error("No mesh to project points onto.");
6666
return (false);
6767
}
6868

69+
if (object->vmesh()->is_empty())
70+
{
71+
error("Object mesh is empty--nothing to project points onto.");
72+
return false;
73+
}
74+
6975
FieldInformation fi(input), fo(input), fobj(object);
7076

7177
// Create the proper output type

0 commit comments

Comments
 (0)