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: e1eb022847 [formerly 60de2da63d] [formerly 9086b40a2f] [formerly e1eb022847 [formerly 60de2da63d] [formerly 9086b40a2f] [formerly cef8be2e64 [formerly 9086b40a2f [formerly bec1c58fdbea0aff7bfaace01d0bb0274f5c0643]]]]
Former-commit-id: cef8be2e64
Former-commit-id: be2b9604fa [formerly 691db16613] [formerly 976134b7009f1e0e7c2030149311de111c1ea507 [formerly 30eec037c3]]
Former-commit-id: 5f7ff8a09dace89fe8cac2e21e9fb2a1e2449880 [formerly dd36773776]
Former-commit-id: 51c0a0efed
This commit is contained in:
Richard Peter 2012-12-04 14:34:49 -06:00 • committed by Gerrit Code Review
commit 9817b58dac
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> </paramLevelMatches>
<imageStyle> <imageStyle>
<displayUnits>in</displayUnits> <displayUnits>in</displayUnits>
<range levelScale="LOG"> <range>
<minValue>0.0</minValue> <minValue>0.0</minValue>
<!-- <maxValue>16</maxValue>--> <maxValue>16</maxValue>
</range> </range>
<defaultColormap>Grid/gridded data</defaultColormap> <defaultColormap>Grid/gridded data</defaultColormap>
<!--
<colorbarLabeling> <colorbarLabeling>
<values>1 2 4 6 6.667 10 12 15</values> <increment>2</increment>
</colorbarLabeling> </colorbarLabeling>
-->
</imageStyle> </imageStyle>
</styleRule> </styleRule>
<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()) { for (GridDataRequest request = getNext(); request != null; request = getNext()) {
try { try {
request.gridData = resource.getData(request.time, request.pdos); 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(); resource.issueRefresh();
} catch (VizException e) { } catch (VizException e) {
synchronized (requests) { synchronized (requests) {