Merge pull request #6 from LI-COR/version-6.2.2

Version 6.2.2
LI-COR-Environmental · Jul 8, 2019 · 5b4f49e · 5b4f49e
2 parents 3b19683 + bde10cc
commit 5b4f49e
Show file tree

Hide file tree

Showing 243 changed files with 1,452 additions and 847 deletions.
diff --git a/ACKNOWLEDGEMENTS b/ACKNOWLEDGEMENTS
@@ -62,17 +62,16 @@ this free software.
 - University of Chicago: m_levenberg_marquardt from the MINPACK package
 - netlib.org: FFT routines from the SLATEC Common Mathematical Library
 - The Qt Company: Qt framework
-- Boost
+- Boost C++ Libraries
 - Trenton Schulz (former Trolltech AS): Fader widget
 - Morgan Leborgne: QProgressIndicator widget
 - Witold Wysota: Debug helper class
 - Sergey A. Tachenov: QuaZIP
-- Mark Summerfield: classes from the book 'Advanced Qt Programming'
+- Mark Summerfield: helper classes from the book 'Advanced Qt Programming'
 
 ## Tools
 
 - GFortran compiler
 - MinGW compiler and GDB debugger
 - Clang compiler
 - The Qt Company: Qt Creator IDE
-- Code::Blocks IDE
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,11 +1,22 @@
+6.2.2 (2018-05-11)
+
+    Engine
+    - Add: support for Young 81000V, 81000RE, 81000VRE sonic anemometers.
+
+    GUI
+    - Add: support for Young 81000V, 81000RE, 81000VRE sonic anemometers.
+    - Add: references to the Tovi platform.
+    - Fix: Raw File Settings persistency.
+    - Fix: local help not showing.
+
 6.2.1 (2017-10-09)
 
     Engine
     - Add: support for new LI-7500DS instruments.
 
     GUI
     - Add: support for new LI-7500DS instruments.
-    - Fix magnetic declination retrieval from NOAA.
+    - Fix: magnetic declination retrieval from NOAA.
 
 6.2.0 (2016-08-23)
 

diff --git a/README.md b/README.md
@@ -65,7 +65,7 @@ To compile the Engine use [gfortran](https://gcc.gnu.org/wiki/GFortran)
 
 To compile the GUI:
 
-1. install the [Qt framework](http://qt-project.org/)
+1. install the [Qt framework](https://www.qt.io/developers/)
 2. install [git](http://git-scm.com/)
 3. build the Qt `eddypro.pro` project file using custom build scripts available
    under `source/scripts/build` or using QtCreator

diff --git a/css/eddypro-lin.qss b/css/eddypro-lin.qss
@@ -870,6 +870,82 @@ QLabel[applogoSmallLabel="true"]:hover {
     min-height: 70px;
 }
 
+
+ClickLabel[toviLabel="true"] {
+    image: url(:/icons/tovi-ad-normal);
+    min-width: 578px;
+    min-height: 165px;
+}
+
+ClickLabel[toviLabel="true"]:hover {
+    image: url(:/icons/tovi-ad-hover);
+    min-width: 578px;
+    min-height: 165px;
+}
+
+ClickLabel[toviLabel="true"]:pressed {
+    image: url(:/icons/tovi-ad-pressed);
+    min-width: 578px;
+    min-height: 165px;
+}
+
+ClickLabel[toviWideLabel="true"] {
+    image: url(:/icons/tovi-wide-ad-normal);
+    min-width: 513px;
+    min-height: 97px;
+}
+
+ClickLabel[toviWideLabel="true"]:hover {
+    image: url(:/icons/tovi-wide-ad-hover);
+    min-width: 513px;
+    min-height: 97px;
+}
+
+ClickLabel[toviWideLabel="true"]:pressed {
+    image: url(:/icons/tovi-wide-ad-pressed);
+    min-width: 513px;
+    min-height: 97px;
+}
+
+ClickLabel[toviThinLabel="true"] {
+    image: url(:/icons/tovi-thin-ad-normal);
+    min-width: 305px;
+    min-height: 108px;
+    margin-left: -15px;
+    padding-left: 0px;
+}
+
+ClickLabel[toviThinLabel="true"]:hover {
+    image: url(:/icons/tovi-thin-ad-hover);
+    min-width: 305px;
+    min-height: 108px;
+}
+
+ClickLabel[toviThinLabel="true"]:pressed {
+    image: url(:/icons/tovi-thin-ad-pressed);
+    min-width: 305px;
+    min-height: 108px;
+}
+
+QPushButton#toviLogoImg {
+    background-color: transparent;
+    border: none;
+    image: url(:/icons/tovi-icon-normal);
+    min-width: 35px;
+    max-width: 35px;
+    min-height: 30px;
+    max-height: 30px;
+    margin-left: 5px;
+}
+
+QPushButton#toviLogoImg:hover {
+    image: url(:/icons/tovi-icon-hover);
+}
+
+QPushButton#toviLogoImg:pressed {
+    image: url(:/icons/tovi-icon-pressed);
+}
+
 QLabel[feedbackLabel="true"] {
     image: url(:/icons/feedback-button);
     min-width: 168px;
@@ -1001,6 +1077,11 @@ QLabel[groupLabel="true"] {
     margin-bottom: 5px;
 }
 
+QLabel[toviAds="true"] {
+    font-size: 14px;
+    font-style: italic;
+}
+
 /*QLabel[groupLabel="true"] {
     color: #007FBD;
     font-size: 12px;

diff --git a/css/eddypro-mac.qss b/css/eddypro-mac.qss
@@ -334,6 +334,10 @@ QComboBox::drop-down {
     border-bottom-right-radius: 3px;
 }
 
+/* QComboBox::drop-down::item {
+    min-width: 50px;
+} */
+
 QComboBox::down-arrow {
     image: url(:/icons/combo-normal);
 }
@@ -354,6 +358,32 @@ QComboBox::down-arrow:off {
     image: url(:/icons/combo-disabled);
 }
 
+/* dropdown popup list */
+QComboBox QListView {
+    background-color: #eee;
+    border: 1px solid gray;
+    border-radius: 3px;
+    padding: 1px 3px;
+    min-width: 7em;
+}
+
+QComboBox::item:alternate {
+    background: white;
+}
+
+QComboBox::item:selected {
+    border: 1px solid transparent;
+    color: white;
+    background: #318ef4;
+}
+
+QComboBox::indicator {
+    background-color: transparent;
+    selection-background-color: transparent;
+    color: transparent;
+    selection-color: transparent;
+}
+
 MainWindow {
     background-color: white;
 }
@@ -870,6 +900,81 @@ QLabel[applogoSmallLabel="true"]:hover {
     min-height: 70px;
 }
 
+ClickLabel[toviLabel="true"] {
+    image: url(:/icons/tovi-ad-normal);
+    min-width: 578px;
+    min-height: 165px;
+}
+
+ClickLabel[toviLabel="true"]:hover {
+    image: url(:/icons/tovi-ad-hover);
+    min-width: 578px;
+    min-height: 165px;
+}
+
+ClickLabel[toviLabel="true"]:pressed {
+    image: url(:/icons/tovi-ad-pressed);
+    min-width: 578px;
+    min-height: 165px;
+}
+
+ClickLabel[toviWideLabel="true"] {
+    image: url(:/icons/tovi-wide-ad-normal);
+    min-width: 513px;
+    min-height: 97px;
+}
+
+ClickLabel[toviWideLabel="true"]:hover {
+    image: url(:/icons/tovi-wide-ad-hover);
+    min-width: 513px;
+    min-height: 97px;
+}
+
+ClickLabel[toviWideLabel="true"]:pressed {
+    image: url(:/icons/tovi-wide-ad-pressed);
+    min-width: 513px;
+    min-height: 97px;
+}
+
+ClickLabel[toviThinLabel="true"] {
+    image: url(:/icons/tovi-thin-ad-normal);
+    min-width: 305px;
+    min-height: 108px;
+    margin-left: -15px;
+    padding-left: 0px;
+}
+
+ClickLabel[toviThinLabel="true"]:hover {
+    image: url(:/icons/tovi-thin-ad-hover);
+    min-width: 305px;
+    min-height: 108px;
+}
+
+ClickLabel[toviThinLabel="true"]:pressed {
+    image: url(:/icons/tovi-thin-ad-pressed);
+    min-width: 305px;
+    min-height: 108px;
+}
+
+QPushButton#toviLogoImg {
+    background-color: transparent;
+    border: none;
+    image: url(:/icons/tovi-icon-normal);
+    min-width: 35px;
+    max-width: 35px;
+    min-height: 30px;
+    max-height: 30px;
+    margin-left: 5px;
+}
+
+QPushButton#toviLogoImg:hover {
+    image: url(:/icons/tovi-icon-hover);
+}
+
+QPushButton#toviLogoImg:pressed {
+    image: url(:/icons/tovi-icon-pressed);
+}
+
 QLabel[feedbackLabel="true"] {
     image: url(:/icons/feedback-button);
     min-width: 168px;
@@ -1001,6 +1106,11 @@ QLabel[groupLabel="true"] {
     margin-bottom: 5px;
 }
 
+QLabel[toviAds="true"] {
+    font-size: 14px;
+    font-style: italic;
+}
+
 /*QLabel[groupLabel="true"] {
     color: #007FBD;
     font-size: 12px;

diff --git a/css/eddypro-win.qss b/css/eddypro-win.qss
@@ -870,6 +870,82 @@ QLabel[applogoSmallLabel="true"]:hover {
     min-height: 70px;
 }
 
+
+ClickLabel[toviLabel="true"] {
+    image: url(:/icons/tovi-ad-normal);
+    min-width: 578px;
+    min-height: 165px;
+}
+
+ClickLabel[toviLabel="true"]:hover {
+    image: url(:/icons/tovi-ad-hover);
+    min-width: 578px;
+    min-height: 165px;
+}
+
+ClickLabel[toviLabel="true"]:pressed {
+    image: url(:/icons/tovi-ad-pressed);
+    min-width: 578px;
+    min-height: 165px;
+}
+
+ClickLabel[toviWideLabel="true"] {
+    image: url(:/icons/tovi-wide-ad-normal);
+    min-width: 513px;
+    min-height: 97px;
+}
+
+ClickLabel[toviWideLabel="true"]:hover {
+    image: url(:/icons/tovi-wide-ad-hover);
+    min-width: 513px;
+    min-height: 97px;
+}
+
+ClickLabel[toviWideLabel="true"]:pressed {
+    image: url(:/icons/tovi-wide-ad-pressed);
+    min-width: 513px;
+    min-height: 97px;
+}
+
+ClickLabel[toviThinLabel="true"] {
+    image: url(:/icons/tovi-thin-ad-normal);
+    min-width: 305px;
+    min-height: 108px;
+    margin-left: -15px;
+    padding-left: 0px;
+}
+
+ClickLabel[toviThinLabel="true"]:hover {
+    image: url(:/icons/tovi-thin-ad-hover);
+    min-width: 305px;
+    min-height: 108px;
+}
+
+ClickLabel[toviThinLabel="true"]:pressed {
+    image: url(:/icons/tovi-thin-ad-pressed);
+    min-width: 305px;
+    min-height: 108px;
+}
+
+QPushButton#toviLogoImg {
+    background-color: transparent;
+    border: none;
+    image: url(:/icons/tovi-icon-normal);
+    min-width: 35px;
+    max-width: 35px;
+    min-height: 30px;
+    max-height: 30px;
+    margin-left: 5px;
+}
+
+QPushButton#toviLogoImg:hover {
+    image: url(:/icons/tovi-icon-hover);
+}
+
+QPushButton#toviLogoImg:pressed {
+    image: url(:/icons/tovi-icon-pressed);
+}
+
 QLabel[feedbackLabel="true"] {
     image: url(:/icons/feedback-button);
     min-width: 168px;
@@ -1001,6 +1077,11 @@ QLabel[groupLabel="true"] {
     margin-bottom: 5px;
 }
 
+QLabel[toviAds="true"] {
+    font-size: 12px;
+    font-style: italic;
+}
+
 /*QLabel[groupLabel="true"] {
     color: #007FBD;
     font-size: 12px;

diff --git a/docs/EddyPro_Manual_12025.pdf b/docs/EddyPro_Manual_12025.pdf
diff --git a/eddypro_lin.pro b/eddypro_lin.pro
@@ -5,7 +5,7 @@ TEMPLATE = app
 # EddyPro version
 VER_MAJ = 6
 VER_MIN = 2
-VER_PAT = 1
+VER_PAT = 2
 VERSION = $$sprintf("%1.%2.%3",$$VER_MAJ,$$VER_MIN,$$VER_PAT)
 
 # Qt version and path