[metview] 01/01: New upstream release 4.8.7
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Sep 20 15:22:54 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag upstream/4.8.7
in repository metview.
commit fbbea28ab3e318d00099be52117c36b52b200344
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Fri Jun 30 07:26:33 2017 +0100
New upstream release 4.8.7
---
VERSION.cmake | 2 +-
VERSION.cmake => VERSION.cmake.orig | 8 +++++++-
scripts/set_mars_env | 6 +++++-
share/metview/app-defaults/Desktop.qss | 2 ++
share/metview/app-defaults/metview.qss | 2 ++
share/metview/etc/reportypes.def | 8 ++++++++
share/metview/etc/rt_by_obsgroup.chk | 8 ++++----
share/metview/etc/tigge.def | 2 ++
src/uPlot/uPlot.cc | 20 ++++++++++----------
9 files changed, 41 insertions(+), 17 deletions(-)
diff --git a/VERSION.cmake b/VERSION.cmake
index 71c3b93..29c8173 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1,5 +1,5 @@
set(${PROJECT_NAME}_MAJOR_VERSION_STR "4")
set(${PROJECT_NAME}_MINOR_VERSION_STR "8")
-set(${PROJECT_NAME}_REVISION_VERSION_STR "6")
+set(${PROJECT_NAME}_REVISION_VERSION_STR "7")
set(${PROJECT_NAME}_VERSION_STR "${${PROJECT_NAME}_MAJOR_VERSION_STR}.${${PROJECT_NAME}_MINOR_VERSION_STR}.${${PROJECT_NAME}_REVISION_VERSION_STR}")
diff --git a/VERSION.cmake b/VERSION.cmake.orig
similarity index 51%
copy from VERSION.cmake
copy to VERSION.cmake.orig
index 71c3b93..eb7faa8 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake.orig
@@ -1,5 +1,11 @@
+<<<<<<< HEAD
+set(${PROJECT_NAME}_MAJOR_VERSION_STR "5")
+set(${PROJECT_NAME}_MINOR_VERSION_STR "0")
+set(${PROJECT_NAME}_REVISION_VERSION_STR "0")
+=======
set(${PROJECT_NAME}_MAJOR_VERSION_STR "4")
set(${PROJECT_NAME}_MINOR_VERSION_STR "8")
-set(${PROJECT_NAME}_REVISION_VERSION_STR "6")
+set(${PROJECT_NAME}_REVISION_VERSION_STR "7")
+>>>>>>> hotfix/4.8.7
set(${PROJECT_NAME}_VERSION_STR "${${PROJECT_NAME}_MAJOR_VERSION_STR}.${${PROJECT_NAME}_MINOR_VERSION_STR}.${${PROJECT_NAME}_REVISION_VERSION_STR}")
diff --git a/scripts/set_mars_env b/scripts/set_mars_env
index 25ceb68..8a9a1d4 100755
--- a/scripts/set_mars_env
+++ b/scripts/set_mars_env
@@ -51,7 +51,11 @@ export STAT_PREFIX=metview
. $MARS_HOME/bin/marsstat.sh
#-- MARS home directory for user --
-. $MARS_HOME/bin/mars_user_home
+if [ -f $MARS_HOME/bin/mars_user_home ]
+then
+ . $MARS_HOME/bin/mars_user_home
+fi
+
#-- how frequent MARS sends warning e-mails --
export MARS_MAIL_FREQUENCY=${MARS_MAIL_FREQUENCY:=86400}
diff --git a/share/metview/app-defaults/Desktop.qss b/share/metview/app-defaults/Desktop.qss
index bd07306..69c5f1d 100644
--- a/share/metview/app-defaults/Desktop.qss
+++ b/share/metview/app-defaults/Desktop.qss
@@ -24,6 +24,8 @@ QWidget [editor="true"] > QToolBar {
padding: 1px;
}
+QToolTip { color: black; background-color: rgb(192,218,255); border: none; }
+
/*---------------------------
Drawer tabs
------------------------------*/
diff --git a/share/metview/app-defaults/metview.qss b/share/metview/app-defaults/metview.qss
index bf65345..872d334 100644
--- a/share/metview/app-defaults/metview.qss
+++ b/share/metview/app-defaults/metview.qss
@@ -13,6 +13,8 @@ QToolBar > QToolButton {
}
+QToolTip { color: black; background-color: rgb(192,218,255); border: none; }
+
QLineEdit:read-only {
background: #eeeeee;
color: #3a3a3a
diff --git a/share/metview/etc/reportypes.def b/share/metview/etc/reportypes.def
index 2d4374f..7c59f31 100755
--- a/share/metview/etc/reportypes.def
+++ b/share/metview/etc/reportypes.def
@@ -139,6 +139,7 @@ ODIN SMR MACC O3 ; 5075
SCISAT-1 ACE-FTS O3 ; 5076
ODIN OSIRIS O3 ; 5077
ODIN SMR O3 ; 5078
+Sentinel 5P TROPOMI O3 ; 5079
ENVISAT MERIS TCWV ; 6001
METOP-A GPSRO ; 7001
CHAMP GPSRO ; 7002
@@ -156,6 +157,7 @@ METOP-B GPSRO ; 7013
GRACE B GPSRO ; 7014
TanDEM-X GPSRO ; 7015
FY-3C GPSRO ; 7016
+Megha-Tropiques GPSRO ; 7017
METEOSAT 2 AMV ; 8001
METEOSAT 3 AMV ; 8002
METEOSAT 4 AMV ; 8003
@@ -415,6 +417,10 @@ METOP-A GOME-2 layer integrated mass density with averaging kernels and a priori
METOP-B IASI layer integrated mass density with averaging kernels and a priori profile ; 35011
METOP-B GOME-2 layer integrated mass density with averaging kernels ; 35012
METOP-B GOME-2 layer integrated mass density with averaging kernels and a priori profile ; 35013
+Sentinel 5P TROPOMI layer volumetric mixing ratio with averaging kernels and a priori profile ; 35014
+Sentinel 5P TROPOMI layer integrated mass density with averaging kernels and a priori profile ; 35015
+Sentinel 5P TROPOMI layer integrated mass density with averaging kernels ; 35016
+METOP-B IASI layer volumetric mixing ratio with averaging kernels and a priori profile ; 35017
NPP CRIS Radiances ; 36001
ENVISAT RALT WAVE ; 37001
JASON 1 RALT WAVE ; 37002
@@ -423,6 +429,8 @@ ERS 1 RALT WAVE ; 37004
ERS 2 RALT WAVE ; 37005
CRYOSAT 2 RALT WAVE ; 37006
SARAL RALT WAVE ; 37007
+JASON 3 RALT WAVE ; 37008
+Sentinel 3A RALT WAVE ; 37009
1h rain gauge accumulation ; 39001
3h rain gauge accumulation ; 39002
6h rain gauge accumulation ; 39003
diff --git a/share/metview/etc/rt_by_obsgroup.chk b/share/metview/etc/rt_by_obsgroup.chk
index c43ced9..31b5c53 100755
--- a/share/metview/etc/rt_by_obsgroup.chk
+++ b/share/metview/etc/rt_by_obsgroup.chk
@@ -14,13 +14,13 @@
%set REPORTYPE = 4002/4003/4004/4005/4006/4007/4008/4009/4010/4011/4012/4013/4014/4015/4016/4017/4018/4019/4020/4021/4022/4023
%if (TYPE = OFB %or TYPE = MFB %or TYPE = OAI) %and (OBSGROUP = RESAT ) %and %not REPORTYPE %then
- %set REPORTYPE = 5001/5002/5003/5004/5005/5006/5007/5008/5009/5010/5011/5012/5013/5014/5015/5016/5017/5018/5019/5020/5021/5022/5023/5024/5025/5026/5027/5028/5029/5030/5031/5032/5033/5034/5035/5036/5037/5038/5039/5040/5041/5042/5043/5044/5045/5046/5047/5048/5049/5050/5051/5052/5053/5054/5055/5056/5057/5058/5059/5060/5061/5062/5063/5064/5065/5066/5067/5068/5069/5070/5071/5072/5073/5074/5075/5076/5077/5078
+ %set REPORTYPE = 5001/5002/5003/5004/5005/5006/5007/5008/5009/5010/5011/5012/5013/5014/5015/5016/5017/5018/5019/5020/5021/5022/5023/5024/5025/5026/5027/5028/5029/5030/5031/5032/5033/5034/5035/5036/5037/5038/5039/5040/5041/5042/5043/5044/5045/5046/5047/5048/5049/5050/5051/5052/5053/5054/5055/5056/5057/5058/5059/5060/5061/5062/5063/5064/5065/5066/5067/5068/5069/5070/5071/5072/5073/5074/5075/5076/5077/5078/5079
%if (TYPE = OFB %or TYPE = MFB %or TYPE = OAI) %and (OBSGROUP = MERIS ) %and %not REPORTYPE %then
%set REPORTYPE = 6001
%if (TYPE = OFB %or TYPE = MFB %or TYPE = OAI) %and (OBSGROUP = GPSRO ) %and %not REPORTYPE %then
- %set REPORTYPE = 7001/7002/7003/7004/7005/7006/7007/7008/7009/7010/7011/7012/7013/7014/7015/7016
+ %set REPORTYPE = 7001/7002/7003/7004/7005/7006/7007/7008/7009/7010/7011/7012/7013/7014/7015/7016/7017
%if (TYPE = OFB %or TYPE = MFB %or TYPE = OAI) %and (OBSGROUP = SATOB ) %and %not REPORTYPE %then
%set REPORTYPE = 8001/8002/8003/8004/8005/8006/8007/8008/8009/8010/8011/8012/8013/8014/8015/8016/8017/8018/8019/8020/8021/8022/8023/8024/8025/8026/8027/8028/8029/8030/8031/8032/8033/8034/8035/8036/8037/8038/8039/8040/8041/8042/8043/8044/8045/8046/8047/8048/8049/8050/8051/8052/8053/8054/8055/8056
@@ -101,13 +101,13 @@
%set REPORTYPE = 34001
%if (TYPE = OFB %or TYPE = MFB %or TYPE = OAI) %and (OBSGROUP = RESAT_AK ) %and %not REPORTYPE %then
- %set REPORTYPE = 35001/35002/35003/35004/35005/35006/35007/35008/35009/35010/35011/35012/35013
+ %set REPORTYPE = 35001/35002/35003/35004/35005/35006/35007/35008/35009/35010/35011/35012/35013/35014/35015/35016/35017
%if (TYPE = OFB %or TYPE = MFB %or TYPE = OAI) %and (OBSGROUP = CRIS ) %and %not REPORTYPE %then
%set REPORTYPE = 36001
%if (TYPE = OFB %or TYPE = MFB %or TYPE = OAI) %and (OBSGROUP = WAVE_IP ) %and %not REPORTYPE %then
- %set REPORTYPE = 37001/37002/37003/37004/37005/37006/37007
+ %set REPORTYPE = 37001/37002/37003/37004/37005/37006/37007/37008/37009
%if (TYPE = OFB %or TYPE = MFB %or TYPE = OAI) %and (OBSGROUP = RAINGG ) %and %not REPORTYPE %then
%set REPORTYPE = 39001/39002/39003/39004/39005
diff --git a/share/metview/etc/tigge.def b/share/metview/etc/tigge.def
index 44592d2..cf2ad7d 100755
--- a/share/metview/etc/tigge.def
+++ b/share/metview/etc/tigge.def
@@ -136,7 +136,9 @@ WIND GUST AT 10 METRES SINCE PREVIOUS POST-PROCESSING ; 10FG ; 49
SURFACE AIR MAXIMUM TEMPERATURE SINCE PREVIOUS POST-PROCESSING ; MX2T ; 201
SURFACE AIR MINIMUM TEMPERATURE SINCE PREVIOUS POST-PROCESSING ; MN2T ; 202
LIQUID NON-FROZEN VOLUMETRIC SOIL WATER ; LIQVSM ; 260210
+VOLUMETRIC TRANSPIRATION STRESS ONSET ; VOLTSO ; 260211
VOLUMETRIC SOIL WATER ; VSW ; 260199
+VOLUMETRIC WILTING POINT ; VWILTM ; 260200
SOIL HEAT FLUX ; SOHF ; 260364
SOIL DEPTH ; SOD ; 260367
SOIL TEMPERATURE ; SOT ; 260360
diff --git a/src/uPlot/uPlot.cc b/src/uPlot/uPlot.cc
index 2c0508e..fc2dc90 100644
--- a/src/uPlot/uPlot.cc
+++ b/src/uPlot/uPlot.cc
@@ -475,7 +475,7 @@ void uPlot::setupViewActions()
action->setIcon(icon4);
action->setText(tr("&Highlight active scene"));
action->setCheckable(true);
- action->setChecked(true); //!!!
+ action->setChecked(false); //!!!
actionHighlightScene_=action;
connect(actionControlPanel_,SIGNAL(toggled(bool)),
@@ -637,12 +637,9 @@ void uPlot::setupAnimationActions()
action->setIcon(icon4);
action->setText(tr("&Animate all scenes"));
action->setCheckable(true);
- action->setChecked(false);
+ action->setChecked(true);
actionAnimatedScenes_=action;
- connect(actionAnimatedScenes_, SIGNAL(toggled(bool)),
- this, SLOT(slotAnimatedScenes(bool)));
-
//
actionPlay_->setEnabled(false);
actionStop_->setEnabled(false);
@@ -651,6 +648,9 @@ void uPlot::setupAnimationActions()
actionPrevious_->setEnabled(false);
actionLast_->setEnabled(false);
+ connect(actionAnimatedScenes_, SIGNAL(toggled(bool)),
+ this, SLOT(slotAnimatedScenes(bool)));
+
MvQMainWindow::MenuType menuType=MvQMainWindow::AnimationMenu;
menuItems_[menuType].push_back(new MvQMenuItem(actionPlay_));
@@ -844,13 +844,13 @@ void uPlot::newRequestForDriversEnd()
if(plotScene_->sceneItems().count() <=1)
{
animatedScenes_.clear();
- }
+ }
else
{
- actionAnimatedScenes_->setEnabled(true);
+ actionAnimatedScenes_->setEnabled(true);
slotAnimatedScenes(actionAnimatedScenes_->isChecked());
}
-
+
//Frames - no rendering!!
//At this point the current step should be correctly set for the active scene!!
stepWidget_->reset(activeScene_);
@@ -1309,7 +1309,7 @@ void uPlot::readSettings()
if(settings.value("highlightScene").isNull())
{
- actionHighlightScene_->setChecked(true);
+ actionHighlightScene_->setChecked(false);
}
else
{
@@ -1318,7 +1318,7 @@ void uPlot::readSettings()
if(settings.value("animatedScenes").isNull())
{
- actionAnimatedScenes_->setChecked(false);
+ actionAnimatedScenes_->setChecked(true);
}
else
{
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/metview.git
More information about the debian-science-commits
mailing list