From 0ac88acf058b8e1c8a8a51dbc9f43d6338f71229 Mon Sep 17 00:00:00 2001 From: "Shawn.Hooper" Date: Fri, 30 Jan 2015 10:10:54 -0500 Subject: [PATCH 1/3] ASM #17100 - Revert "VLab Issue #4563 - AWIPS2_DR_17371 Changes made in MPE editor not available in D-2D; fixes #4563" This reverts commit bf5bb1bacf1543e518ff5c5cdb847c8424f70739 [formerly 5189ae1c3ce12320045c431d9552036ea9272cef]. Change-Id: Ie8d46f14aab90286a5562e6b79cd7dfabceb33c0 Former-commit-id: 0ed82706fda1158292e6f789cceea378f5879e37 --- .../utility/edex_static/base/grib/models/gribModels_RFC-9.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RFC-9.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RFC-9.xml index 26a2e937c2..9186a97899 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RFC-9.xml +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RFC-9.xml @@ -23,7 +23,7 @@ - MPE-Local + MPE-Mosaic
9
0 304 @@ -50,7 +50,6 @@ - From c292ad2b0857cf6b15db5524f338c599a738da07 Mon Sep 17 00:00:00 2001 From: "steve.naples" Date: Thu, 5 Feb 2015 20:21:33 +0000 Subject: [PATCH 2/3] ASM #17101 MPE: Bad data not being written to file. Change-Id: Id1524abf8ae7379f5d8aac31b4d9cfff0469a577 Former-commit-id: fe3d6ffc320ea338d755c6fb19aa4f00c74c4283 --- .../com/raytheon/viz/mpe/ui/actions/GroupEditCalls.java | 9 +++------ .../src/com/raytheon/viz/mpe/util/BadValues.java | 6 +++--- .../src/com/raytheon/viz/mpe/util/GetBadSnotel.java | 4 ++-- .../com/raytheon/viz/mpe/util/ReadPrecipStationList.java | 3 +-- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/GroupEditCalls.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/GroupEditCalls.java index 530293fbb4..a9d0229ebc 100644 --- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/GroupEditCalls.java +++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/GroupEditCalls.java @@ -43,6 +43,7 @@ import com.raytheon.viz.mpe.util.ReadTemperatureStationList; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Mar 31, 2009 snaples Initial creation + * Feb 5, 2015 17101 snaples Updated max_stations to use size of dqc.precip_stations. * * * @@ -72,13 +73,9 @@ public class GroupEditCalls { int pcpn_time = dqc.pcpn_time; - ReadPrecipStationList rp = new ReadPrecipStationList(); + int max_stations = dqc.precip_stations.size(); - ReadTemperatureStationList rt = new ReadTemperatureStationList(); - - int max_stations = rp.getNumPstations(); - - int max_tstations = rt.getNumTstations(); + int max_tstations = dqc.temperature_stations.size(); public void apply_group() diff --git a/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/BadValues.java b/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/BadValues.java index 382178e1ff..986316baab 100644 --- a/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/BadValues.java +++ b/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/BadValues.java @@ -41,6 +41,7 @@ import com.raytheon.viz.mpe.util.DailyQcUtils.Station; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Mar 9, 2009 snaples Initial creation + * Feb 5, 2015 17101 snaples Fixed issue with writing zero length bad values file. * * * @@ -51,8 +52,7 @@ import com.raytheon.viz.mpe.util.DailyQcUtils.Station; public class BadValues { BufferedReader in = null; DailyQcUtils dqc = DailyQcUtils.getInstance(); - ReadPrecipStationList rp = new ReadPrecipStationList(); - private int max_stations = rp.getNumPstations(); + private int max_stations = dqc.precip_stations.size(); public void read_bad_values(String precd, int m) { @@ -194,7 +194,7 @@ public class BadValues { // ier=sprintf(ibuf,"%s %s %d %f\n",bad_values[i].hb5,bad_values[i].parm, // bad_values[i].quart,bad_values[i].fvalue); - ibuf = String.format("%s %s %d %f", bad_values[i].hb5, + ibuf = String.format("%s %s %d %4.2f", bad_values[i].hb5, bad_values[i].parm, bad_values[i].quart, bad_values[i].fvalue); out.write(ibuf); diff --git a/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/GetBadSnotel.java b/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/GetBadSnotel.java index ebc695574d..ebc3af1584 100644 --- a/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/GetBadSnotel.java +++ b/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/GetBadSnotel.java @@ -41,6 +41,7 @@ import com.raytheon.viz.mpe.util.DailyQcUtils.Station; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Mar 11, 2009 snaples Initial creation + * Feb 5, 2015 17101 snaples Updated max_stations to use size of dqc.precip_stations. * * * @@ -68,8 +69,7 @@ public class GetBadSnotel { /* Retrieve the number of days to QC data for. */ num_qc_days = dqc.qcDays; - ReadPrecipStationList pl = new ReadPrecipStationList(); - int max_stations = pl.getNumPstations(); + int max_stations = dqc.precip_stations.size(); // Pdata[] pdata = DailyQcUtils.pdata; for (j = 0; j < num_qc_days; j++) { diff --git a/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/ReadPrecipStationList.java b/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/ReadPrecipStationList.java index e20445a4f8..5fe2cc096f 100644 --- a/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/ReadPrecipStationList.java +++ b/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/ReadPrecipStationList.java @@ -73,8 +73,7 @@ public class ReadPrecipStationList { e.printStackTrace(); } - ReadPrecipStationList.max_pstations = dqc.precip_stations - .size(); + max_pstations = dqc.precip_stations.size(); return dqc.precip_stations; From 48dcae90644401fe8eab8663a9599f62b481f009 Mon Sep 17 00:00:00 2001 From: "Rici.Yu" Date: Thu, 5 Feb 2015 15:22:49 -0500 Subject: [PATCH 3/3] ASM #16942 - GFE: VTEC Active Tables not getting purged Change-Id: Ib71d667d8f59ab1fa3c669653d2bc8636bd7901c Former-commit-id: 6fbdb136e3968e197c38907a20ba898d9532e39e --- .../com/raytheon/uf/edex/activetable/ActiveTable.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java b/edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java index 6a92c24049..459ca8251b 100644 --- a/edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java +++ b/edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java @@ -91,6 +91,11 @@ import com.raytheon.uf.edex.database.query.DatabaseQuery; * Jun 17, 2014 3296 randerso Cached PythonScript. Moved active table * backup and purging to a separate thread. * Added performance logging + * Feb 05, 2015 16942 ryu Fix update of records for sites other than + * the home site and its neighbors. + * Pass issuance site id to getActiveTable() + * in updateActiveTable() so records will + * be updated correctly. * * * @@ -285,11 +290,13 @@ public class ActiveTable { mode = ActiveTableMode.OPERATIONAL; } + String issueSiteId = newRecords.get(0).getOfficeid(); + IPerformanceStatusHandler perfStat = PerformanceStatus .getHandler("ActiveTable"); ITimer timer = TimeUtil.getTimer(); timer.start(); - List activeTable = getActiveTable(siteId, mode); + List activeTable = getActiveTable(issueSiteId, mode); timer.stop(); perfStat.logDuration("getActiveTable", timer.getElapsedTime());