Merge branch 'v6.1.0/devel' into devel

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.
 

eddypro_mac.pro

@@ -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

libs.pri

@@ -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
 

mac_files/plist/debug/Info.plist

@@ -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>

mac_files/plist/release/Info.plist

@@ -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>

platform.pri

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

resources.pri

@@ -15,7 +15,7 @@ macx {
 }
 
 # linux
-unix {
+linux {
     ICON = $$_PRO_FILE_PWD_/lin_files/app.png
 }
 

src/advancedsettingspage.cpp

@@ -43,16 +43,11 @@
 #include "smartfluxbar.h"
 #include "widget_utils.h"
 
-const QString AdvancedSettingsPage::PAGE_TITLE_0 =
-        QObject::tr("Processing Options");
-const QString AdvancedSettingsPage::PAGE_TITLE_1 =
-        QObject::tr("Statistical Analysis");
-const QString AdvancedSettingsPage::PAGE_TITLE_2 =
-        QObject::tr("Output Files");
-const QString AdvancedSettingsPage::PAGE_TITLE_3 =
-        QObject::tr("Computation Options");
-const QString AdvancedSettingsPage::PAGE_TITLE_4 =
-        QObject::tr("Spectral Analysis and Corrections");
+const QString AdvancedSettingsPage::PAGE_TITLE_0 = QObject::tr("Processing Options");
+const QString AdvancedSettingsPage::PAGE_TITLE_1 = QObject::tr("Statistical Analysis");
+const QString AdvancedSettingsPage::PAGE_TITLE_2 = QObject::tr("Output Files");
+const QString AdvancedSettingsPage::PAGE_TITLE_3 = QObject::tr("Computation Options");
+const QString AdvancedSettingsPage::PAGE_TITLE_4 = QObject::tr("Spectral Analysis and Corrections");
 
 AdvancedSettingsPage::AdvancedSettingsPage(QWidget* parent,
                                            DlProject* dlProject,

src/advoutputoptions.cpp

@@ -954,7 +954,7 @@ void AdvOutputOptions::reset()
     bool oldmod = ecProject_->modified();
     ecProject_->blockSignals(true);
 
-    selectTypical();
+    selectMin();
     setVarsAvailable(false);
     outVarsAllCheckBox->setEnabled(false);
     outVarsAllCheckBox->setChecked(false);
@@ -1476,27 +1476,22 @@ void AdvOutputOptions::createQuestionMark()
 
 void AdvOutputOptions::onlineHelpTrigger_1()
 {
-    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro6/Content/Output_Files_Overview.html")));
+    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro/topics_eddypro/Output_Files_Overview.html")));
 }
 
 void AdvOutputOptions::onlineHelpTrigger_2()
 {
-    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro6/Content/Output_Files.html")));
-}
-
-void AdvOutputOptions::onlineHelpTrigger_3()
-{
-    WidgetUtils::showHelp(QUrl(QStringLiteral("http://")));
+    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro/topics_eddypro/Output_Files.html")));
 }
 
 void AdvOutputOptions::onlineHelpTrigger_4()
 {
-    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro6/Content/Output_Files_Full_Output.html")));
+    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro/topics_eddypro/Output_Files_Full_Output.html")));
 }
 
 void AdvOutputOptions::onlineHelpTrigger_5()
 {
-    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro6/Content/Calculating_Spectra_Cospectra_and_Ogives.html")));
+    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro/topics_eddypro/Calculating_Spectra_Cospectra_and_Ogives.html")));
 }
 
 void AdvOutputOptions::onlineHelpTrigger_6()
@@ -1511,12 +1506,12 @@ void AdvOutputOptions::onlineHelpTrigger_7()
 
 void AdvOutputOptions::onlineHelpTrigger_8()
 {
-    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro6/Content/Output_Files_The_Stats_Folder.html")));
+    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro/topics_eddypro/Output_Files_The_Stats_Folder.html")));
 }
 
 void AdvOutputOptions::onlineHelpTrigger_9()
 {
-    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro6/Content/Output_Files.html")));
+    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro/topics_eddypro/Output_Files.html")));
 }
 
 void AdvOutputOptions::onClickerrorFormatLabel()

src/advoutputoptions.h

@@ -96,7 +96,6 @@ private slots:
 
     void onlineHelpTrigger_1();
     void onlineHelpTrigger_2();
-    void onlineHelpTrigger_3();
     void onlineHelpTrigger_4();
     void onlineHelpTrigger_5();
     void onlineHelpTrigger_6();

src/advprocessingoptions.cpp

@@ -142,23 +142,23 @@ AdvProcessingOptions::AdvProcessingOptions(QWidget *parent,
     aoaCheckBox = new RichTextCheckBox;
     aoaCheckBox->setToolTip(tr("<b>Angle-of-attack correction:</b> Applies only to vertical mount Gill sonic anemometers with the same geometry of the R3 (e.g., R2, WindMaster, WindMaster Pro). This correction is meant to compensate the effects of flow distortion induced by the anemometer frame on the turbulent flow field. We recommend applying this correction whenever an R3-shaped anemometer was used."));
     aoaCheckBox->setText(tr("Angle-of-attack correction for wind components (Gill's only)"));
-    aoaCheckBox->setQuestionMark(QStringLiteral("http://www.licor.com/env/help/eddypro6/Content/Angle_of_Attack_Correction.html"));
+    aoaCheckBox->setQuestionMark(QStringLiteral("http://www.licor.com/env/help/eddypro/topics_eddypro/Angle_of_Attack_Correction.html"));
 
     aoaMethLabel = new ClickLabel(tr("Method :"));
     aoaMethLabel->setEnabled(false);
     aoaMethCombo = new QComboBox;
     aoaMethCombo->addItem(tr("Select automatically"), -1);
     aoaMethCombo->addItem(tr("Field calibration (Nakai and Shimoyama, 2012)"), 1);
     aoaMethCombo->addItem(tr("Wind tunnel calibration (Nakai et al., 2006)"), 2);
-    aoaMethCombo->setItemData(0, tr("<b>Select automatically:</b> Select this option to apply..."), Qt::ToolTipRole);
+    aoaMethCombo->setItemData(0, tr("<b>Select automatically:</b> Select this option to allow EddyPro to choose the most appropriate angle of attack correction method based on the anemometer model and - in the case of the WindMaster<sup>%1</sup> or WindMaster Pro - its firmware version.").arg(Defs::TRADEMARK_SYMBOL), Qt::ToolTipRole);
     aoaMethCombo->setItemData(1, tr("<b>Field calibration:</b> Select this option to apply the angle-of-attack correction according to the method described in the referenced paper, which makes use of a field calibration instead of the wind tunnel calibration."), Qt::ToolTipRole);
     aoaMethCombo->setItemData(2, tr("<b>Wind tunnel calibration:</b> Select this option to apply the angle-of-attack correction according to the method described in the referenced paper, which makes use of a wind tunnel calibration instead of the field calibration."), Qt::ToolTipRole);
     aoaMethCombo->setEnabled(false);
 
     rotCheckBox = new RichTextCheckBox;
     rotCheckBox->setToolTip(tr("<b>Axis rotation for tilt correction:</b> Select the appropriate method for compensating anemometer tilt with respect to local streamlines. Uncheck the box to <i>not perform</i> any rotation (not recommnended). If your site has a complex or sloping topography, a planar-fit method is advisable. Click on the <b><i>Planar Fit Settings...</i></b> to configure the procedure."));
     rotCheckBox->setText(tr("Axis rotations for tilt correction"));
-    rotCheckBox->setQuestionMark(QStringLiteral("http://www.licor.com/env/help/eddypro6/Content/Anemometer_Tilt_Correction.html"));
+    rotCheckBox->setQuestionMark(QStringLiteral("http://www.licor.com/env/help/eddypro/topics_eddypro/Anemometer_Tilt_Correction.html"));
 
     rotMethLabel = new ClickLabel(tr("Rotation method :"));
     rotMethCombo = new QComboBox;
@@ -208,7 +208,7 @@ AdvProcessingOptions::AdvProcessingOptions(QWidget *parent,
     timeLagCheckBox = new RichTextCheckBox;
     timeLagCheckBox->setToolTip(tr("<b>Time lags compensation:</b> Select the method to compensate time lags between anemometric measurements and any other high frequency measurements included in the raw files. Time lags arise due mainly to sensors physical distances and to the passage of air into sampling lines. Uncheck this box to instruct EddyPro not to compensate time lags (not recommended)."));
     timeLagCheckBox->setText(tr("Time lags compensation"));
-    timeLagCheckBox->setQuestionMark(QStringLiteral("http://www.licor.com/env/help/eddypro6/Content/Time_Lag_Detect_Correct.html"));
+    timeLagCheckBox->setQuestionMark(QStringLiteral("http://www.licor.com/env/help/eddypro/topics_eddypro/Time_Lag_Detect_Correct.html"));
 
     timeLagMethodLabel = new ClickLabel(tr("Time lag detection method :"));
     timeLagMethodCombo = new QComboBox;
@@ -229,7 +229,7 @@ AdvProcessingOptions::AdvProcessingOptions(QWidget *parent,
     qcCheckBox = new RichTextCheckBox;
     qcCheckBox->setToolTip(tr("<b>Quality check:</b> Select the quality flagging policy. Flux quality flags are obtained from the combination of two partial flags that result from the application of the steady-state and the developed turbulence tests. Select the flag combination policy."));
     qcCheckBox->setText(tr("Quality check"));
-    qcCheckBox->setQuestionMark(QStringLiteral("http://www.licor.com/env/help/eddypro6/Content/Flux_Quality_Flags.html"));
+    qcCheckBox->setQuestionMark(QStringLiteral("http://www.licor.com/env/help/eddypro/topics_eddypro/Flux_Quality_Flags.html"));
 
     qcLabel = new ClickLabel(tr("Flagging policy :"));
     qcMethodCombo = new QComboBox;
@@ -244,7 +244,7 @@ AdvProcessingOptions::AdvProcessingOptions(QWidget *parent,
     fpCheckBox = new RichTextCheckBox;
     fpCheckBox->setToolTip(tr("<b>Footprint estimation:</b> Select whether to calculate flux footprint estimations and which method should be used. Flux crosswind-integrated footprints are provided as distances from the tower contributing for 10%, 30%, 50%, 70% and 90% to measured fluxes. Also, the location of the peak contribution is given."));
     fpCheckBox->setText(tr("Footprint estimation"));
-    fpCheckBox->setQuestionMark(QStringLiteral("http://www.licor.com/env/help/eddypro6/Content/Estimating_Flux_Footprint.html"));
+    fpCheckBox->setQuestionMark(QStringLiteral("http://www.licor.com/env/help/eddypro/topics_eddypro/Estimating_Flux_Footprint.html"));
 
     fpLabel = new ClickLabel(tr("Footprint method :"));
     fpMethodCombo = new QComboBox;
@@ -259,13 +259,13 @@ AdvProcessingOptions::AdvProcessingOptions(QWidget *parent,
     wplCheckBox = new RichTextCheckBox;
     wplCheckBox->setToolTip(tr("<b>Compensate density fluctuations:</b> This is the so-called WPL correction (Webb et al., 1980). Choose whether to apply the compensation of density fluctuations to raw gas concentrations available as molar densities or mole fractions (moles gas per mole of wet air). The correction does not apply if raw concentrations are available as mixing ratios (mole gas per mole dry air)."));
     wplCheckBox->setText(tr("Compensate density fluctuations (WPL terms)"));
-    wplCheckBox->setQuestionMark(QStringLiteral("http://www.licor.com/env/help/eddypro6/Content/Converting_to_Mixing_Ratio.html"));
+    wplCheckBox->setQuestionMark(QStringLiteral("http://www.licor.com/env/help/eddypro/topics_eddypro/Converting_to_Mixing_Ratio.html"));
 
     // burba correction
     burbaCorrCheckBox = new RichTextCheckBox;
     burbaCorrCheckBox->setToolTip(tr("<b>Add instrument sensible heat components, only for LI-7500:</b> Only applies to the LI-7500. It takes into account air density fluctuations due to temperature fluctuations induced by heat exchange processes at the instrument surfaces, as from Burba et al. (2008)."));
     burbaCorrCheckBox->setText(tr("Add instrument sensible heat components, only for LI-7500 "));
-    burbaCorrCheckBox->setQuestionMark(QStringLiteral("http://www.licor.com/env/help/eddypro6/Content/Calculating_Off-season_Uptake_Correction.html"));
+    burbaCorrCheckBox->setQuestionMark(QStringLiteral("http://www.licor.com/env/help/eddypro/topics_eddypro/Calculating_Off-season_Uptake_Correction.html"));
 
     burbaTypeLabel = new ClickLabel;
     burbaTypeLabel->setText(tr("Surface temperature estimation :"));
@@ -1584,17 +1584,17 @@ void AdvProcessingOptions::createQuestionMark()
 
 void AdvProcessingOptions::onlineHelpTrigger_1()
 {
-    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro6/Content/Wind_Speed_Offsets.html")));
+    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro/topics_eddypro/Wind_Speed_Offsets.html")));
 }
 
 void AdvProcessingOptions::onlineHelpTrigger_4()
 {
-    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro6/Content/Calculate_Turbulent_Flux.html")));
+    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro/topics_eddypro/Calculate_Turbulent_Flux.html")));
 }
 
 void AdvProcessingOptions::onlineHelpTrigger_11()
 {
-    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro6/Content/Raw_Processing_Options.html")));
+    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro/topics_eddypro/Raw_Processing_Options.html")));
 }
 
 void AdvProcessingOptions::updateTooltip(int i)

src/advspectraloptions.cpp

@@ -1955,32 +1955,32 @@ void AdvSpectralOptions::createQuestionMarks()
 
 void AdvSpectralOptions::onlineHelpTrigger_11()
 {
-    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro6/Content/Ensemble_Averages.html")));
+    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro/topics_eddypro/Ensemble_Averages.html")));
 }
 
 void AdvSpectralOptions::onlineHelpTrigger_1()
 {
-    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro6/Content/Calculating_Spectral_Correction_Factors.html")));
+    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro/topics_eddypro/Calculating_Spectral_Correction_Factors.html")));
 }
 
 void AdvSpectralOptions::onlineHelpTrigger_2()
 {
-    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro6/Content/High-pass_Filtering.html")));
+    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro/topics_eddypro/High-pass_Filtering.html")));
 }
 
 void AdvSpectralOptions::onlineHelpTrigger_3()
 {
-    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro6/Content/Low-pass_Filtering.html")));
+    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro/topics_eddypro/Low-pass_Filtering.html")));
 }
 
 void AdvSpectralOptions::onlineHelpTrigger_4()
 {
-    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro6/Content/Spectral_Corrections.html")));
+    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro/topics_eddypro/Spectral_Corrections.html")));
 }
 
 void AdvSpectralOptions::onlineHelpTrigger_5()
 {
-    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro6/Content/Calculating_Spectra_Cospectra_and_Ogives.html")));
+    WidgetUtils::showHelp(QUrl(QStringLiteral("http://www.licor.com/env/help/eddypro/topics_eddypro/Calculating_Spectra_Cospectra_and_Ogives.html")));
 }
 
 void AdvSpectralOptions::updateTooltip(int i)