xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

13.5.2-9 baseline

Browse source 
Former-commit-id: f36cf09d21 [formerly fdbef0e663 [formerly a28a2d3041] [formerly f36cf09d21 [formerly 948fc5e8cbbb6fa563e871417e455638fcbe154f]]]
Former-commit-id: fdbef0e663 [formerly a28a2d3041]
Former-commit-id: fdbef0e663
Former-commit-id: 0093ce47a8
This commit is contained in:
Steve Harris 2013-10-10 10:55:20 -04:00
parent 8b2f1998d2
commit fc2935cdb6
15 changed files with 60 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cave/build/static/common/cave/etc/bundles/StationPlot.xml
View file

@ -52,7 +52,7 @@
<resourceData xsi:type="plotResourceData" plotSource="METAR Plot"
plotModelFile="stdObsDesign.svg" spiFile="basemaps/MTR.spi"
isUpdatingOnMetadataOnly="true" retrieveData="false"
isRequeryNecessaryOnTimeMatch="true" pixelSizeHint="45">
isRequeryNecessaryOnTimeMatch="true" isTopOfTheHour="true" pixelSizeHint="45">
<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
<metadataMap>
<mapping key="reportType">

9
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
View file

@ -46,6 +46,7 @@
# Cleaned up some constants
# Jun 21, 2013 14983 ryu Fixed encodeEditArea() to evaluate query
# when necessary
# Oct 07, 2013 2424 randerso remove use of pytz
#
########################################################################
import types, string, time, sys
@ -1479,14 +1480,14 @@ class SmartScript(BaseTool.BaseTool):
This should be used instead of time.localtime()
'''
from pytz import timezone
import dateutil.tz
if tz is None:
tzname = self.__dataMgr.getClient().getSiteTimeZone()
tz = timezone(tzname)
tz = dateutil.tz.gettz(tzname)
utczone = timezone('UTC')
gmdt = utczone.localize(self._gmtime(date))
utczone = dateutil.tz.gettz('UTC')
gmdt = self._gmtime(date).replace(tzinfo=utczone)
tzdt = gmdt.astimezone(tz)
return tzdt

2
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CCP.xml
View file

@ -22,7 +22,7 @@
<Method name="Alias">
<Field abbreviation="CCOV"/>
</Method>
<Method models="HPCGuide HPCGuide-2.5km" displayName="Total Cloud Cover" name="Multiply">
<Method models="HPCGuide" displayName="Total Cloud Cover" name="Multiply">
<Field abbreviation="TCC"/>
<ConstantField value="100.0"/>
</Method>

2
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/P.xml
View file

@ -77,7 +77,7 @@
<Method models="HPCGuide GWW233 SeaIce RTGSST RTGSSTHR NICICE AK-NICICE
HPCGuide GFSGuide LAMPTstorm TPCWindProb OPCWave180
OPCWave181 OPCWave182 RTMA WNAWAVE238 AKWAVE239
HPCqpfNDFD HPCGuide-2.5km" name="NoDerivation" />
HPCqpfNDFD" name="NoDerivation" />
<Method models="mesoEta212" levels="2FHAG" name="Import">
<Field level="Surface" model="mesoEta215" abbreviation="P"/>
</Method>

2
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/wx.xml
View file

@ -29,7 +29,7 @@
<Field abbreviation="snowTyp" />
<ConstantField value="8" />
</Method>
<Method name="Mapping" models="HPCGuide HPCGuide-2.5km AK-HPCGuide" levels="Surface">
<Method name="Mapping" models="HPCGuide AK-HPCGuide" levels="Surface">
<Field level="Surface" abbreviation="wxType" />
<ConstantField value="1" />
<ConstantField value="168" />

27
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java
View file

@ -349,19 +349,7 @@ public class PlotResource2 extends
plots.put(normTime, list);
}
list.add(info);
// Sort this data in "backwards" so that the most recent observation
// for a particular station display correctly
Collections.sort(list, new Comparator<PlotInfo>() {
@Override
public int compare(PlotInfo o1, PlotInfo o2) {
return o1.dataTime.compareTo(o2.dataTime);
}
});
Collections.reverse(list);
}
}
@ -373,6 +361,19 @@ public class PlotResource2 extends
DataTime time = entry.getKey();
List<PlotInfo> info = entry.getValue();
FrameInformation frameInfo = frameMap.get(time);
// Sort this data in "backwards" so that the most recent observation
// for a particular station display correctly
if (info.size() > 1) {
Collections.sort(info, new Comparator<PlotInfo>() {
@Override
public int compare(PlotInfo o1, PlotInfo o2) {
return o2.dataTime.compareTo(o1.dataTime);
}
});
}
if (frameInfo != null) {
Map<String, Station> stationMap = frameInfo.stationMap;
for (PlotInfo plot : info) {

38
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/AWIPSHeaderBlockDlg.java
View file

@ -96,7 +96,8 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* 07/26/2012 15171 rferrel Disable editor's send and clear AFOS PIL fields when
* invalid product Id and user want to edit it anyway.
* 09/20/2012 1196 rferrel Changing dialogs being called to not block.
* 11/26/2012 14526 mgamazaychikov Added traverse listener for RETURN key
* 11/26/2012 14526 mgamazaychikov Added traverse listener for RETURN key
* 10/07/2012 16664 mgamazaychikov Added padProdDesignatorText method
* </pre>
*
* @author lvenable
@ -411,21 +412,7 @@ public class AWIPSHeaderBlockDlg extends CaveSWTDialog implements
@Override
public void focusLost(FocusEvent e) {
StringBuilder sb = new StringBuilder(prodDesignatorTF.getText()
.trim());
if (sb.length() > 0) {
// Pad field with trailing spaces.
while (sb.length() < 3) {
sb.append(' ');
}
// Only trigger the modification listener when there is a
// real change.
String value = sb.toString();
if (!value.equals(prodDesignatorTF.getText())) {
prodDesignatorTF.setText(value);
}
}
padProdDesignatorText(prodDesignatorTF.getText());
}
@Override
@ -462,7 +449,23 @@ public class AWIPSHeaderBlockDlg extends CaveSWTDialog implements
}
}
/**
protected void padProdDesignatorText(String prodDesignatorText) {
StringBuilder sb = new StringBuilder(prodDesignatorText.trim());
if (sb.length() > 0) {
// Pad field with trailing spaces.
while (sb.length() < 3) {
sb.append(' ');
}
// Only trigger the modification listener when there is a
// real change.
String value = sb.toString();
if (!value.equals(prodDesignatorText)) {
prodDesignatorTF.setText(value);
}
}
}
/**
* Create the addressee control fields.
*/
private void createAddresseeFields() {
@ -1041,6 +1044,7 @@ public class AWIPSHeaderBlockDlg extends CaveSWTDialog implements
@Override
public void keyTraversed(TraverseEvent event) {
if (event.detail == SWT.TRAVERSE_RETURN) {
padProdDesignatorText(prodDesignatorTF.getText());
enterBtnPressed();
}
}

1
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
View file

@ -80,7 +80,6 @@
<vbSource key="HI-RTMA" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="HPCqpfNDFD" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="HPCGuide" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="HPCGuide-2.5km" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="HPCqpf" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="HPE" category="SfcGrid" views="PLANVIEW TIMESERIES" />
<vbSource key="MPE-Local" category="SfcGrid" views="PLANVIEW TIMESERIES" />

11
edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
View file

@ -33,17 +33,12 @@
# Date Ticket# Engineer Description
# ------------ ---------- ----------- --------------------------
# 01/17/13 dgilling Initial Creation.
# 10/09/13 16614 njensen Fixed reloadModules()
#
#
#
import os
import MasterInterface
import RollBackImporter
rollbackImporter = RollBackImporter.RollBackImporter()
class RollbackMasterInterface(MasterInterface.MasterInterface):
@ -75,8 +70,6 @@ class RollbackMasterInterface(MasterInterface.MasterInterface):
def reloadModules(self):
for script in self.scripts:
super(RollbackMasterInterface, self).removeModule(script)
rollbackImporter.rollback()
self.importModules()
super(RollbackMasterInterface, self).reloadModule(script)

16
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
View file

@ -19,6 +19,15 @@
##
# NOTE: THIS FILE SHOULD NOT BE USER-MODIFIED. INSTEAD REFER TO THE
# LOCAL CONFIG DOCUMENTATION ON HOW TO OVERRIDE SETTINGS IN THIS FILE.
#
# Baseline GFE server configuration
#
# SOFTWARE HISTORY
#
# Date Ticket# Engineer Description
# ------------ ---------- ----------- --------------------------
# 10/03/13 2424 randerso Change localTC to use dateutil instead of pytz
# to get correct offsets for Alaska
#----------------------------------------------------------------------------
# USEFUL DEFINES
@ -859,9 +868,10 @@ Persistent = (0, 0, 0) # special time constraint
# seconds local time, e.g., 6*HOUR would indicate 6am.
def localTC(start,repeat,duration,dst):
timezone = SITES[GFESUITE_SITEID][3]
import pytz
tz = pytz.timezone(timezone)
delta = tz.utcoffset(0) - tz.dst(0);
import dateutil.tz, datetime
tz = dateutil.tz.gettz(timezone)
dt = datetime.datetime.utcnow()
delta = tz.utcoffset(dt) + tz.dst(dt)
offset = delta.days*86400 + delta.seconds
start = start - offset
if dst == 1:

5
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml
View file

@ -791,11 +791,6 @@
<datasetId>HPCGuide</datasetId>
<dt>6</dt>
</info>
<info>
<title>HPCGuide-2.5km</title>
<datasetId>HPCGuide-2.5km</datasetId>
<dt>6</dt>
</info>
<info>
<title>HPCGuide-AK</title>
<datasetId>HPCGuide-AK</datasetId>

6
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
View file

@ -383,12 +383,6 @@
<versionsToKeep>2</versionsToKeep>
<modTimeToWait>00-00:15:00</modTimeToWait>
</rule>
<!-- Purge rule for the HPCGuide (HPCGuide 2.5km) model -->
<rule>
<keyValue>HPCGuide-2.5km</keyValue>
<versionsToKeep>2</versionsToKeep>
<modTimeToWait>00-00:15:00</modTimeToWait>
</rule>
<!-- Purge rule for the GFSGuide (GFSGuide) model -->
<rule>
<keyValue>GFSGuide</keyValue>

9
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
View file

@ -2885,15 +2885,6 @@
</process>
</model>
<model>
<name>HPCGuide-2.5km</name>
<center>7</center>
<subcenter>5</subcenter>
<process>
<id>183</id>
</process>
</model>
<model>
<name>HPCGuide-AK</name>
<center>7</center>

2
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/7/5/4.2.0.1.table
View file

@ -1,6 +1,6 @@
# Product Discipline 0: Meteorological products, Parameter Category 1: Moisture
#192-254 Reserved for local use
192:192:Weather::wxType
192:192:Categorical Rain::CRAIN
193:193:Categorical Freezing Rain::CFRZR
194:194:Categorical Ice Pellets::CICEP
195:195:Categorical Snow::CSNOW

6
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
View file

@ -383,12 +383,6 @@
<versionsToKeep>2</versionsToKeep>
<modTimeToWait>00-00:15:00</modTimeToWait>
</rule>
<!-- Purge rule for the HPCGuide (HPCGuide 2.5km) model -->
<rule>
<keyValue>HPCGuide-2.5km</keyValue>
<versionsToKeep>2</versionsToKeep>
<modTimeToWait>00-00:15:00</modTimeToWait>
</rule>
<!-- Purge rule for the GFSGuide (GFSGuide) model -->
<rule>
<keyValue>GFSGuide</keyValue>