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

ASM #14575 - Fixed issue with exiting CAVE, without closing DailyQC, throwing errors.

Browse source 
Change-Id: I897a00e84ce30e81896cd2d1559d8c39cd74b701

Former-commit-id: 1bd7175c022f8c29a1a19474cfc8b6b3688ee024
This commit is contained in:
steve.naples 2015-03-10 18:27:55 +00:00 • committed by Steve Naples
parent 53b54a1073
commit 8e974829b3
5 changed files with 36 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java
View file

@ -77,6 +77,7 @@ import com.raytheon.viz.mpe.util.WriteQPFGrids;
* Sep 19, 2011 10955 rferrel Use RunProcess
* Nov 06, 2012 15481 wkwock Fix save 6 hours precipitation files
* May 02, 2013 15956 wkwock Fix incorrect contents in precip_LLL_grid_yyyymmdd.nc file
* Mar 10, 2015 14575 snaples Added status check to make sure that we close everything before exiting.
*
* </pre>
*
@ -497,9 +498,9 @@ public class SaveLevel2Data {
// logMessage("\nSTATUS: 2) type value in type/source in level2 file is ##%s##\n",type);
save_isom = dqc.isom;
MPEDisplayManager mpd = MPEDisplayManager.getCurrent();
// MPEDisplayManager mpd = MPEDisplayManager.getCurrent();
if ((mpd.isQpf() == true || mpd.isMaxmin() == true || mpd.isZflag() == true)
if ((DailyQcUtils.qpf_flag == true || DailyQcUtils.maxmin_flag == true || DailyQcUtils.z_flag == true)
&& dqc.pcpn_day == 0
&& (dqc.curHr18_00 == 1
|| dqc.curHr00_06 == 1 || dqc.curHr06_12 == 1)) {
@ -514,7 +515,7 @@ public class SaveLevel2Data {
* 06-12z
*/
if (mpd.isQpf() == true) {
if (DailyQcUtils.qpf_flag == true) {
if (dqc.curHr18_00 == 1) {
dqc.pdata[dqc.pcpn_day].used[1] = 0;
dqc.pdata[dqc.pcpn_day].used[2] = 0;
@ -530,7 +531,7 @@ public class SaveLevel2Data {
}
}
else if (mpd.isZflag() == true) {
else if (DailyQcUtils.z_flag == true) {
if (dqc.curHr18_00 == 1) {
dqc.zdata[dqc.pcpn_day].used[1] = 0;
dqc.zdata[dqc.pcpn_day].used[2] = 0;
@ -547,7 +548,7 @@ public class SaveLevel2Data {
}
else if (mpd.isMaxmin() == true) {
else if (DailyQcUtils.maxmin_flag == true) {
if (dqc.curHr18_00 == 1) {
dqc.tdata[dqc.pcpn_day].used[1] = 0;
dqc.tdata[dqc.pcpn_day].used[2] = 0;
@ -2422,11 +2423,12 @@ public class SaveLevel2Data {
int pcpn_day = dqc.pcpn_day;
if (MPEDisplayManager.getCurrent().isQpf() == true
|| MPEDisplayManager.getCurrent().isZflag() == true
|| MPEDisplayManager.getCurrent().isMaxmin() == true) {
if (DailyQcUtils.qpf_flag == true
|| DailyQcUtils.z_flag == true
|| DailyQcUtils.maxmin_flag == true)
{
if (MPEDisplayManager.getCurrent().isQpf() == true) {
if (DailyQcUtils.qpf_flag == true) {
QcPrecipOptionsDialog.dataSet.clear();
QcPrecipOptionsDialog.dataSet
.addAll(QcPrecipOptionsDialog.dataType);
@ -2439,13 +2441,13 @@ public class SaveLevel2Data {
}
else if (MPEDisplayManager.getCurrent().isZflag() == true) {
else if (DailyQcUtils.z_flag == true) {
QcFreezeOptionsDialog.dataSet.clear();
QcFreezeOptionsDialog.dataSet
.addAll(QcPrecipOptionsDialog.dataType);
time_pos = 100 + pcp_flag;
} else if (MPEDisplayManager.getCurrent().isMaxmin() == true) {
} else if (DailyQcUtils.maxmin_flag == true) {
QcTempOptionsDialog.dataSet.clear();
QcTempOptionsDialog.dataSet
.addAll(QcPrecipOptionsDialog.dataType);
@ -2496,7 +2498,7 @@ public class SaveLevel2Data {
k = 5;
}
if (MPEDisplayManager.getCurrent().isQpf() == true
if (DailyQcUtils.qpf_flag == true
&& QcPrecipOptionsDialog.isOpen == true) {
QcPrecipOptionsDialog.selectDataSetVal(k);
}

5
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcFreezeOptionsDialog.java
View file

@ -65,6 +65,7 @@ import com.raytheon.viz.ui.perspectives.VizPerspectiveListener;
* ------------ ---------- ----------- --------------------------
* Jul, 7 2009 snaples Initial creation
* Sep 11, 2013 #2353 lvenable Fixed cursor memory leak.
* Mar 10, 2015 14575 snaples Added addtional status flag.
*
* </pre>
*
@ -277,6 +278,7 @@ public class QcFreezeOptionsDialog extends AbstractMPEDialog {
shell.open();
displayMgr.setZflag(true);
DailyQcUtils.z_flag = true;
isOpen = true;
isfinished = false;
ddq = DrawDQCStations.getInstance();
@ -285,12 +287,14 @@ public class QcFreezeOptionsDialog extends AbstractMPEDialog {
while (!shell.isDisposed()) {
if (dqc_good == 0) {
displayMgr.setZflag(false);
DailyQcUtils.z_flag = false;
isOpen = false;
ddq.destroy();
shell.dispose();
}
if (isOpen == false) {
displayMgr.setZflag(false);
DailyQcUtils.z_flag = false;
ddq.destroy();
shell.dispose();
}
@ -300,6 +304,7 @@ public class QcFreezeOptionsDialog extends AbstractMPEDialog {
}
ddq.destroy();
displayMgr.setZflag(false);
DailyQcUtils.z_flag = false;
isfinished = true;
isOpen = false;
font.dispose();

5
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
View file

@ -65,6 +65,7 @@ import com.raytheon.viz.mpe.util.DailyQcUtils;
* Mar 7, 2013 15657 lbousaidi fixed DQC slider and added listener to the Keys
* when pressed.
* Sep 11, 2013 #2353 lvenable Fixed cursor memory leak.
* Mar 10, 2015 14575 snaples Added additional status flag.
* </pre>
*
* @author snaples
@ -277,6 +278,7 @@ public class QcPrecipOptionsDialog extends AbstractMPEDialog {
shell.open();
displayMgr.setQpf(true);
DailyQcUtils.qpf_flag = true;
isOpen = true;
isfinished = false;
ddq = DrawDQCStations.getInstance();
@ -285,12 +287,14 @@ public class QcPrecipOptionsDialog extends AbstractMPEDialog {
while (!shell.isDisposed()) {
if (dqc_good == 0) {
displayMgr.setQpf(false);
DailyQcUtils.qpf_flag = false;
isOpen = false;
ddq.destroy();
shell.dispose();
}
if (isOpen == false) {
displayMgr.setQpf(false);
DailyQcUtils.qpf_flag = false;
ddq.destroy();
shell.dispose();
}
@ -300,6 +304,7 @@ public class QcPrecipOptionsDialog extends AbstractMPEDialog {
}
ddq.destroy();
displayMgr.setQpf(false);
DailyQcUtils.qpf_flag = false;
isfinished = true;
isOpen = false;
font.dispose();

5
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcTempOptionsDialog.java
View file

@ -62,6 +62,7 @@ import com.raytheon.viz.mpe.util.DailyQcUtils;
* ------------ ---------- ----------- --------------------------
* Nov 12, 2008 snaples Initial creation
* Sep 11, 2013 #2353 lvenable Fixed cursor memory leak.
* Mar 10, 2015 14575 snaples Added status flag.
*
* </pre>
*
@ -264,6 +265,7 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
shell.open();
displayMgr.setMaxmin(true);
DailyQcUtils.maxmin_flag = true;
isOpen = true;
isfinished = false;
ddq = DrawDQCStations.getInstance();
@ -272,12 +274,14 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
while (!shell.isDisposed()) {
if (dqc_good == 0) {
displayMgr.setMaxmin(false);
DailyQcUtils.maxmin_flag = false;
isOpen = false;
ddq.destroy();
shell.dispose();
}
if (isOpen == false) {
displayMgr.setMaxmin(false);
DailyQcUtils.maxmin_flag = false;
ddq.destroy();
shell.dispose();
}
@ -287,6 +291,7 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
}
ddq.destroy();
displayMgr.setMaxmin(false);
DailyQcUtils.maxmin_flag = false;
isfinished = true;
isOpen = false;
font.dispose();

7
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
View file

@ -63,6 +63,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* Sep 11, 2013 #2353 lvenable Fixed cursor memory leaks and Scanner resource leak.
* Nov 24, 2014 16911 xwei The day of Hydrologic Date is set to the next day
* if hour is greater than 18Z.
* Mar 10, 2015 14575 snaples Added additional status flags.
*
* </pre>
*
@ -493,6 +494,12 @@ public class DailyQcUtils {
public static int grids_flag = -1;
public static int map_flag = -1;
public static boolean qpf_flag = false;
public static boolean maxmin_flag = false;
public static boolean z_flag = false;
static int curHrMinSec = -1;