Merge branch 'main' into pre-production

nix
Pierre Alexandre Tremblay 1 year ago
commit a8e211f882

@ -32,7 +32,7 @@ jobs:
apppwd: ${{ secrets.APPSTORECONNECTPWD }} apppwd: ${{ secrets.APPSTORECONNECTPWD }}
appusr: ${{ secrets.APPSTORECONNECTUSERNAME }} appusr: ${{ secrets.APPSTORECONNECTUSERNAME }}
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v4.3.6
with: with:
name: macbuild name: macbuild
path: install/FluCoMa-SC-Mac-nightly.dmg path: install/FluCoMa-SC-Mac-nightly.dmg
@ -53,7 +53,7 @@ jobs:
run: 7z a FluCoMa-SC-Windows-nightly.zip FluidCorpusManipulation run: 7z a FluCoMa-SC-Windows-nightly.zip FluidCorpusManipulation
working-directory: install working-directory: install
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v4.3.6
with: with:
name: winbuild name: winbuild
path: install/FluCoMa-SC-Windows-nightly.zip path: install/FluCoMa-SC-Windows-nightly.zip
@ -71,7 +71,7 @@ jobs:
- name: compress archive - name: compress archive
run: tar -zcvf FluCoMa-SC-Linux-nightly.tar.gz FluidCorpusManipulation run: tar -zcvf FluCoMa-SC-Linux-nightly.tar.gz FluidCorpusManipulation
working-directory: install working-directory: install
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v4.3.6
with: with:
name: linuxbuild name: linuxbuild
path: install/FluCoMa-SC-Linux-nightly.tar.gz path: install/FluCoMa-SC-Linux-nightly.tar.gz
@ -81,15 +81,15 @@ jobs:
needs: [macbuild, winbuild, linuxbuild] needs: [macbuild, winbuild, linuxbuild]
steps: steps:
- uses: actions/download-artifact@v2 - uses: actions/download-artifact@v4.1.7
with: with:
name: macbuild name: macbuild
- uses: actions/download-artifact@v2 - uses: actions/download-artifact@v4.1.7
with: with:
name: winbuild name: winbuild
- uses: actions/download-artifact@v2 - uses: actions/download-artifact@v4.1.7
with: with:
name: linuxbuild name: linuxbuild

@ -26,7 +26,7 @@ jobs:
apppwd: ${{ secrets.APPSTORECONNECTPWD }} apppwd: ${{ secrets.APPSTORECONNECTPWD }}
appusr: ${{ secrets.APPSTORECONNECTUSERNAME }} appusr: ${{ secrets.APPSTORECONNECTUSERNAME }}
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v4.3.6
with: with:
name: macbuild name: macbuild
path: install/FluCoMa-SC-Mac.dmg path: install/FluCoMa-SC-Mac.dmg
@ -47,7 +47,7 @@ jobs:
run: 7z a FluCoMa-SC-Windows.zip FluidCorpusManipulation run: 7z a FluCoMa-SC-Windows.zip FluidCorpusManipulation
working-directory: install working-directory: install
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v4.3.6
with: with:
name: winbuild name: winbuild
path: install/FluCoMa-SC-Windows.zip path: install/FluCoMa-SC-Windows.zip
@ -67,7 +67,7 @@ jobs:
run: tar -zcvf FluCoMa-SC-Linux.tar.gz FluidCorpusManipulation run: tar -zcvf FluCoMa-SC-Linux.tar.gz FluidCorpusManipulation
working-directory: install working-directory: install
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v4.3.6
with: with:
name: linuxbuild name: linuxbuild
path: install/FluCoMa-SC-Linux.tar.gz path: install/FluCoMa-SC-Linux.tar.gz
@ -81,15 +81,15 @@ jobs:
needs: [macbuild, winbuild, linuxbuild] needs: [macbuild, winbuild, linuxbuild]
steps: steps:
- uses: actions/download-artifact@v2 - uses: actions/download-artifact@v4.1.7
with: with:
name: macbuild name: macbuild
- uses: actions/download-artifact@v2 - uses: actions/download-artifact@v4.1.7
with: with:
name: winbuild name: winbuild
- uses: actions/download-artifact@v2 - uses: actions/download-artifact@v4.1.7
with: with:
name: linuxbuild name: linuxbuild

@ -27,7 +27,7 @@ set(FLUID_PATH "" CACHE PATH "Optional path to the Fluid Decomposition repo")
if (APPLE) if (APPLE)
set(CMAKE_XCODE_GENERATE_SCHEME ON) set(CMAKE_XCODE_GENERATE_SCHEME ON)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8" CACHE STRING "") set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "")
#A consequence of targetting 10.8. Needs to be set globally from 10.15 onwards in order for the test program to compile successfully during configure #A consequence of targetting 10.8. Needs to be set globally from 10.15 onwards in order for the test program to compile successfully during configure
string(APPEND CMAKE_CXX_FLAGS " -stdlib=libc++") string(APPEND CMAKE_CXX_FLAGS " -stdlib=libc++")
endif() endif()

@ -55,13 +55,13 @@ FluidDataSetQuery : FluidDataObject {
this.prSendMsg(this.clearMsg); this.prSendMsg(this.clearMsg);
} }
limitMsg{|rows| limitMsg{|points|
^this.prMakeMsg(\limit,id,rows); ^this.prMakeMsg(\limit,id,points);
} }
limit{|rows, action| limit{|points, action|
actions[\limit] = [nil,action]; actions[\limit] = [nil,action];
this.prSendMsg(this.limitMsg(rows)); this.prSendMsg(this.limitMsg(points));
} }
transformMsg{|sourceDataSet, destDataSet| transformMsg{|sourceDataSet, destDataSet|

Loading…
Cancel
Save