Merge branch 'develop'

OpenHydrology · May 1, 2015 · d622ee3 · d622ee3
2 parents 2b449db + e4a6d82
commit d622ee3
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/docs/source/comparison.rst b/docs/source/comparison.rst
@@ -0,0 +1,24 @@
+WINFAP-FEH comparison
+=====================
+
+The table below provides an overview and comparison of features included in OH Auto Statistical vs WINFAP-FEH.
+
+============================= =========================== =================
+Aspect                        OH Auto Statistical         WINFAP-FEH
+============================= =========================== =================
+Selection of best method      automatic                   manual
+Single site analyses          no (no longer a recommended yes
+                              method)
+Enhanced single site analyses yes                         yes
+Pooling group analyses        yes                         yes
+Donor and urban adjustment    automatic                   manual
+Multiple QMED donors          yes                         no
+Download of NRFA data         automatic                   no
+Separation of user/NRFA data  yes                         no
+Create reports                yes                         no
+Source code                   open                        closed
+Actively developed            yes                         no
+API available                 yes (Python 3.x)            no
+Price                         free                        £ 2,490 excl. VAT
+Support                       community                   6 months
+============================= =========================== =================
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -10,6 +10,7 @@ Contents:
 
    installation
    run
+   comparison
    science
 
 

diff --git a/installer/win/installer.nsi b/installer/win/installer.nsi
@@ -42,7 +42,7 @@
 !define MUI_WELCOMEPAGE_TEXT "Fully automated flood estimation for UK catchments using the latest revisions to the Flood Estimation Handbook Statistical Method.$\r$\n$\r$\nThis installer requires an internet connection."
 !define MUI_FINISHPAGE_LINK "${ORG_NAME} website"
 !define MUI_FINISHPAGE_LINK_LOCATION "${ORG_URL}"
-!define MUI_FINISHPAGE_SHOWREADME "http://docs.open-hydrology.org/projects/oh-auto-statistical/en/latest/"
+!define MUI_FINISHPAGE_SHOWREADME "http://docs.open-hydrology.org/projects/oh-auto-statistical/"
 !define MUI_FINISHPAGE_SHOWREADME_TEXT "Read the manual"
 !define MUI_COMPONENTSPAGE_NODESC
 !define MUI_WELCOMEFINISHPAGE_BITMAP "images\OH.portrait.bmp"
@@ -113,7 +113,7 @@ Section "${APP_NAME} packages" application_packages
   SectionGetFlags ${miniconda_installer} $0
   IntCmp $0 16 0 +3 +3
     DetailPrint "Update miniconda package manager"
-    ExecDos::exec /DETAILED '"${CONDA}" update conda' "" ""
+    ExecDos::exec /DETAILED '"${CONDA}" update -y conda' "" ""
 
   DetailPrint "Search in channel(s) -c ${CONDA_CHANNEL}"
   DetailPrint "Installing application packages (version ${VERSION}-${BUILD})"
@@ -176,7 +176,7 @@ Section "Start menu and context menu items"
   SetOutPath "$INSTDIR\icons"
   File "images\download.ico"
   SetOutPath "$SMPROGRAMS\${ORG_NAME}\${APP_NAME}"
-  CreateShortcut "Reload NRFA data.lnk" "$INSTDIR\ohvenv\Scripts\download_nrfa.exe" "" "$INSTDIR\icons\download.ico" 0
+  CreateShortcut "Download NRFA data.lnk" "$INSTDIR\ohvenv\Scripts\download_nrfa.exe" "" "$INSTDIR\icons\download.ico" 0
 
 SectionEnd