diff --git a/R2D.pri b/R2D.pri index 3ded5f4e..bb0dcb94 100644 --- a/R2D.pri +++ b/R2D.pri @@ -166,7 +166,6 @@ SOURCES += $$PWD/Events/UI/EarthquakeRuptureForecast.cpp \ $$PWD/GraphicElements/PlainRectangle.cpp \ $$PWD/GraphicElements/GridNode.cpp \ $$PWD/GraphicElements/GIS_Selection.cpp \ - $$PWD/GraphicElements/GIS_SelectionTool.cpp \ $$PWD/RunWidget.cpp \ $$PWD/WorkflowAppR2D.cpp \ @@ -291,7 +290,6 @@ HEADERS += $$PWD/Events/UI/EarthquakeRuptureForecast.h \ $$PWD/GraphicElements/RectangleGrid.h \ $$PWD/GraphicElements/PlainRectangle.h \ $$PWD/GraphicElements/GIS_Selection.h \ - $$PWD/GraphicElements/GIS_SelectionTool.h \ $$PWD/WorkflowAppR2D.h \ $$PWD/RunWidget.h \ diff --git a/main.cpp b/main.cpp index 99027c20..728d6baa 100644 --- a/main.cpp +++ b/main.cpp @@ -190,7 +190,7 @@ int main(int argc, char *argv[]) w.setAbout(aboutTitle, aboutSource); - QString version("Version 2.1.0"); + QString version("Version 3.0.0"); w.setVersion(version); QString citeText("\n1)Frank McKenna, Stevan Gavrilovic, Adam Zsarnoczay, Kuanshi Zhong, Wael Elhaddad, & Pedro Arduino. (2022). NHERI-SimCenter/R2DTool: Version 2.1.0 (v2.1.0). Zenodo. https://doi.org/10.5281/zenodo.6404528 \n\n2) Gregory G. Deierlein, Frank McKenna, Adam Zsarnóczay, Tracy Kijewski-Correa, Ahsan Kareem, Wael Elhaddad, Laura Lowes, Matt J. Schoettler, and Sanjay Govindjee (2020) A Cloud-Enabled Application Framework for Simulating Regional-Scale Impacts of Natural Hazards on the Built Environment. Frontiers in the Built Environment. 6:558706. doi: 10.3389/fbuil.2020.558706"); diff --git a/makeDMG.sh b/makeDMG.sh index 24498c7c..b1cd705d 100755 --- a/makeDMG.sh +++ b/makeDMG.sh @@ -82,16 +82,15 @@ macdeployqt $appFile mkdir $pathApp/Contents/MacOS/Examples mkdir $pathApp/Contents/MacOS/Databases -cp ../../R2DExamples/Examples.json $pathApp/Contents/MacOS/Examples cp -fR $pathToBackendApps/applications $pathApp/Contents/MacOS cp -fR $pathToBackendApps/applications/performRegionalEventSimulation/regionalWindField/database/historical_storm/* $pathApp/Contents/MacOS/Databases mkdir $pathApp/Contents/MacOS/applications/opensees mkdir $pathApp/Contents/MacOS/applications/dakota mkdir $pathApp/Contents/MacOS/Examples mkdir $pathApp/Contents/MacOS/Databases +cp ../../R2DExamples/Examples.json $pathApp/Contents/MacOS/Examples cp -fr $pathToOpenSees/* $pathApp/Contents/MacOS/applications/opensees cp -fr $pathToDakota/* $pathApp/Contents/MacOS/applications/dakota -cp -fr $pathApp/../../Examples/Examples.json $pathApp/Contents/MacOS/Examples cp -fr $pathApp/../../Databases/* $pathApp/Contents/MacOS/Databases mkdir $pathApp/Contents/MacOS/share @@ -103,6 +102,8 @@ cp -fR $pathApp/../../../qgisplugin/mac/qgis-deps-0.9/stage/lib/* $pathApp/Conte cp -fR $pathApp/../../../qgisplugin/mac/Install/share/* $pathApp/Contents/MacOS/share cp -fR $pathApp/../../../qgisplugin/mac/Install/qgis/* $pathApp/Contents/MacOS/lib/qgis +install_name_tool -change @loader_path/libz.1.2.11.dylib @rpath/libz.1.2.11.dylib ./R2D.app/Contents/MacOS/R2D + # remove unwanted stuff declare -a notWantedApp=("createSAM/mdofBuildingModel/" @@ -117,8 +118,10 @@ declare -a notWantedApp=("createSAM/mdofBuildingModel/" "createEVENT/stochasticGroundMotion" "createEVENT/windTunnelExperiment" "createEDP/standardWindEDP" - "createEDP/standardEarthquakeEDP" "createEDP/userEDP" + "createEDP/userEDP" + "createEDP/userEDP_R" + "createEDP/standardEarthquakeEDP_R" ) for app in "${notWantedApp[@]}"