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

Merge "Issue #1387 updated style rules for RFC-FFG products, fixed never ending Requesting Gridded Data when RFC-FFG is loaded" into development

Browse source 
Former-commit-id: 9086b40a2f [formerly 9086b40a2f [formerly bec1c58fdbea0aff7bfaace01d0bb0274f5c0643]]
Former-commit-id: cef8be2e64
Former-commit-id: 30eec037c3
This commit is contained in:
Richard Peter 2012-12-04 14:34:49 -06:00 • committed by Gerrit Code Review
commit dd36773776
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
View file

@ -4519,16 +4519,14 @@
</paramLevelMatches>
<imageStyle>
<displayUnits>in</displayUnits>
<range levelScale="LOG">
<range>
<minValue>0.0</minValue>
<!-- <maxValue>16</maxValue>-->
<maxValue>16</maxValue>
</range>
<defaultColormap>Grid/gridded data</defaultColormap>
<!--
<colorbarLabeling>
<values>1 2 4 6 6.667 10 12 15</values>
<increment>2</increment>
</colorbarLabeling>
-->
</imageStyle>
</styleRule>
<styleRule>

7
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GridDataRequestJob.java
View file

@ -91,6 +91,13 @@ class GridDataRequestJob extends Job {
for (GridDataRequest request = getNext(); request != null; request = getNext()) {
try {
request.gridData = resource.getData(request.time, request.pdos);
if (request.gridData == null) {
// need to remove unfulfillable requests to avoid infinite
// loop.
synchronized (requests) {
requests.remove(request);
}
}
resource.issueRefresh();
} catch (VizException e) {
synchronized (requests) {