From 40c3cb9749d57898c47f81d871605958f56cd80d Mon Sep 17 00:00:00 2001 From: "Zhidong.Hao" Date: Tue, 22 Dec 2015 14:29:14 -0500 Subject: [PATCH] ASM #18342 AvnFPS: Climatology chart calculation is incorrect as compared to A1 Change-Id: I19568e71de43f3eeec8412431e437ea01b76d7bc Former-commit-id: 35d85e0599f73b5da4c4cc287fa7d25493ef5cab --- .../viz/aviation/climatology/CigVisDistributionDlg.java | 3 ++- .../localization/aviation/python/cvdata.py | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/CigVisDistributionDlg.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/CigVisDistributionDlg.java index 33dce173a9..804dfa4c22 100644 --- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/CigVisDistributionDlg.java +++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/CigVisDistributionDlg.java @@ -89,6 +89,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog; * 10/15/2012 1229 rferrel Changes for non-blocking HelpUsageDlg. * 16 Aug 2013 #2256 lvenable Fixed image and cursor memory leaks. * 19Mar2014 #2925 lvenable Added dispose checks for runAsync. + * 12/22/2015 18342 zhao Modified code for 'jnt' in objReceived() * * * @@ -886,7 +887,7 @@ public class CigVisDistributionDlg extends CaveSWTDialog implements int flightCat = (Integer) list.get(3); float cig = (Float) list.get(4); float vis = (Float) list.get(5); - float jnt = Math.min(cig, vis); + float jnt = (Float) list.get(6); data.set(month, hour, windDir, flightCat, vis, cig, jnt); } else { diff --git a/cave/com.raytheon.viz.avnconfig/localization/aviation/python/cvdata.py b/cave/com.raytheon.viz.avnconfig/localization/aviation/python/cvdata.py index fe17a95776..ebff178a46 100644 --- a/cave/com.raytheon.viz.avnconfig/localization/aviation/python/cvdata.py +++ b/cave/com.raytheon.viz.avnconfig/localization/aviation/python/cvdata.py @@ -43,6 +43,10 @@ # Generates ceiling/visibility distribution by month, hour and wind direction # George Trojan, SAIC/MDL, December 2005 # last update: 03/14/06 +# Date Ticket# Engineer Description +# ------------ ---------- ----------- ----------------------------------- +# Dec 22, 2015 18342 zhao Modified _process() to also pass 'jnt_count' + import logging, os, time, cPickle import Avn, ClimLib @@ -174,7 +178,7 @@ def get_data(table, queue): for windDir in range(num_wind_dir): for flightCat in range(num_cat+1): sendObj = [month, hour, windDir, flightCat, float(cig_count[month][hour][windDir][flightCat]), - float(vis_count[month][hour][windDir][flightCat])]#, float(jnt_count[month][hour][windDir][flightCat])] + float(vis_count[month][hour][windDir][flightCat]), float(jnt_count[month][hour][windDir][flightCat])] #print "sendObj", sendObj queue.put(sendObj) queue.put("done")