Merge branch 'v6.1.0/devel' into devel

Author: emiola

CHANGELOG

@@ -1,3 +1,36 @@
+6.1.0 (2015-12-14)
+
+    Engine
+    - Add: support for new LI-7500RS and LI-7200RS instruments.
+    - Refine: introduced a mechanism to allow user to ask EddyPro to select
+      the most appropriate AoA correction method, based on sonic anemometer
+      model and serial number. User can also force a selection, or de-select
+      the correction completely.
+    - Fix: FLUXNET biomet output file now contains biomet results also when
+      fast EC data are not available (similar to standard biomet output
+      file). Also fixed initialization, so that if biomet data is not
+      available, FLUXNET biomet output file reports -9999.
+    - Fix: detection of EndIndex in the list of binned spectra files when a
+      subperiod is selected, which coincides with the period covered by
+      available spectra files. The bug caused EddyPro not to create ensemble
+      averaged spectra/cospectra, nor to perform the spectral assessment.
+    - Fix: SplitCount function, that caused biomet files not to be properly
+      read (and engine to crash) when only one biomet variable is present in
+      the external biomet files, besides the timestamp(s).
+
+    GUI
+    - Add: support for new LI-7500RS and LI-7200RS instruments.
+    - Refine: add automatic selection for the AoA correction method.
+    - Refine: set the default AoA correction method to automatic selection.
+    - Add: embedded software version (firmware) field in the anemometer
+      description table in the metadata editor.
+    - Refine: enable embedded software version (firmware) field for any
+      gas analyzer and change it to a free text form.
+    - Refine: allow project file opening with double-click on Mac.
+    - Fix: spectral file assessment load button not working properly.
+    - Fix: essential file path not properly preserved during a run on Windows.
+    - Refine: set default advanced output settings to typical.
+
 6.1.0 (2015-09-30)
 
     Engine
@@ -139,7 +172,6 @@
       SmartFlux update too.
     - Refinement: review policies for start/end dates settings.
 
-
 5.2.1 (2015-01-29)
 
     Engine
@@ -316,7 +348,7 @@
 
 5.0.0 (2013-12-09)
 For a complete list of new features see:
-http://www.licor.com/env/help/eddypro6/Content/Whats_New.html
+http://www.licor.com/env/help/eddypro/topics_eddypro/Whats_New.html
 
     Introduced support to the package creation for SMARTFlux systems.
 
@@ -697,4 +729,3 @@ http://www.licor.com/env/help/eddypro6/Content/Whats_New.html
 
 2.0.0 (2011-04-05)
     - First public release of EddyPro (Express version only).
-

README.md

@@ -253,10 +253,10 @@ use of the EddyPro wordmark and logo.
 More information is available at:
 
   - http://www.licor.com/eddypro
-  - http://www.licor.com/env/help/eddypro6/Content/EddyPro_Home.html
+  - http://www.licor.com/env/help/eddypro/topics_eddypro/EddyPro_Home.html
 
 Be sure to check out the
-'[What's new](http://www.licor.com/env/help/eddypro6/Content/Whats_New.html)'
+'[What's new](http://www.licor.com/env/help/eddypro/topics_eddypro/Whats_New.html)'
 page, which will list any known problems or limitations of the current and
 past versions.
 

docs/EddyPro6_Getting_Started.pdf

@@ -90,6 +90,8 @@ CONFIG(debug, debug|release) {
         QMAKE_CXXFLAGS_WARN_ON += -Wno-global-constructors # static objects
         QMAKE_CXXFLAGS_WARN_ON += -Wno-exit-time-destructors # static objects
         QMAKE_CXXFLAGS_WARN_ON += -Wno-documentation -Wno-documentation-unknown-command -Wno-documentation-deprecated-sync
+
+        QMAKE_PRE_LINK += && $$_PRO_FILE_PWD_/scripts/build/mac-update-translations.sh$$escape_expand(\\n\\t)
     }
 } else {
     TARGET = eddypro

docs/EddyPro6_User_Guide.pdf docs/EddyPro_Manual_12025.pdfdocs/EddyPro6_User_Guide.pdf renamed to docs/EddyPro_Manual_12025.pdf

@@ -15,7 +15,7 @@ CONFIG(debug, debug|release) {
         QMAKE_PRE_LINK += $$_PRO_FILE_PWD_/scripts/build/mac-pre-link.sh debug
         QMAKE_POST_LINK += $$_PRO_FILE_PWD_/scripts/build/mac-post-link.sh debug
     }
-    unix {
+    linux {
         # quazip
         LIBS += -L$$OUT_PWD/../libs/build-quazip-0.7.1-qt-5.5.1-gcc-5.2.0-x86/quazip -lquazip_debug
 
@@ -38,7 +38,7 @@ CONFIG(debug, debug|release) {
         QMAKE_PRE_LINK += $$_PRO_FILE_PWD_/scripts/build/mac-pre-link.sh release
         QMAKE_POST_LINK += $$_PRO_FILE_PWD_/scripts/build/mac-post-link.sh release
     }
-    unix {
+    linux {
         # quazip
         LIBS += -L$$OUT_PWD/../libs/build-quazip-0.7.1-qt-5.5.1-gcc-5.2.0-x86_64 -lquazip
 

docs/EddyPro_QuickStart_12756.pdf

@@ -21,7 +21,7 @@
     <key>NSHumanReadableCopyright</key>
     <string>Copyright (c) 2011-2015, LI-COR Biosciences Inc.</string>
     <key>CFBundleShortVersionString</key>
-    <string>6.0.0</string>
+    <string>6.1.0</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleName</key>

eddypro_mac.pro

@@ -21,7 +21,7 @@
     <key>NSHumanReadableCopyright</key>
     <string>Copyright (c) 2011-2015, LI-COR Biosciences Inc.</string>
     <key>CFBundleShortVersionString</key>
-    <string>6.0.0</string>
+    <string>6.1.0</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleName</key>

libs.pri

@@ -22,7 +22,7 @@ win32 {
     RESOURCES += $$_PRO_FILE_PWD_/eddypro_win.qrc
 }
 
-unix {
+linux {
     RESOURCES += $$_PRO_FILE_PWD_/eddypro_lin.qrc
 }