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

ASM #18599 MPE: - Fixed issue where Daily QC Temperature clears grid when editing points.

Browse source 
Change-Id: I8d08d2b8a3c0ff511000969e4311cbbdb627ab85

Former-commit-id: 06e03a88dca4eede28bb3203a28a659f4d9256d0
This commit is contained in:
steve.naples 2016-02-23 19:03:44 +00:00
parent d2c142b7bf
commit e0d65642f4
3 changed files with 53 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/GroupEditCalls.java
View file

@ -45,6 +45,7 @@ import com.raytheon.viz.mpe.util.QCTStations;
* Jun 25, 2015 17397 snaples Removed send_expose in apply_group method to prevent screen from blanking.
* Jan 07, 2015 5235 bkowal Do not clear the QC grid after applying a temperature group update.
* Eliminated all warnings.
* Feb 22, 2016 18599 snaples Removed unused class declaration.
*
* </pre>
*
@ -60,8 +61,6 @@ public class GroupEditCalls {
int pcpn_day = DailyQcUtils.pcpn_day;
OtherPrecipOptions opo = new OtherPrecipOptions();
int pcpn_time_step = MPEDisplayManager.pcpn_time_step;
int pcp_flag = DailyQcUtils.pcp_flag;

3
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/EditTempStationsDialog.java
View file

@ -70,6 +70,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* Apr 13, 2009 snaples Initial creation
* Dec 08, 2015 5179 bkowal Ensure the grid remains displayed when this dialog
* is closed. Eliminate warnings and e print stack trace.
* Feb 22, 2016 18599 snaples Removed send_expose call in changeCustomFile.
*
* </pre>
*
@ -948,8 +949,6 @@ public class EditTempStationsDialog extends AbstractMPEDialog {
bv.restore_bad_tvalues(pcpn_day, DailyQcUtils.temperature_stations,
max_stations);
OtherPrecipOptions op = new OtherPrecipOptions();
op.send_expose();
return;
}

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

@ -63,6 +63,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.
* Feb 22, 2016 18599 snaples Fixed static calls to DailyQCUtils.
*
* </pre>
*
@ -157,33 +158,33 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
private int getOpts() {
int ik = 0;
if (dqc.points_flag == 1
&& dqc.pcp_in_use[time_pos] == -1) {
if (DailyQcUtils.points_flag == 1
&& DailyQcUtils.pcp_in_use[time_pos] == -1) {
ik = 0;
} else if (dqc.points_flag == 1
&& dqc.grids_flag == -1 && dqc.map_flag == -1
&& dqc.contour_flag == -1) {
} else if (DailyQcUtils.points_flag == 1
&& DailyQcUtils.grids_flag == -1 && DailyQcUtils.map_flag == -1
&& DailyQcUtils.contour_flag == -1) {
ik = 0;
} else if (dqc.points_flag == -1
&& dqc.grids_flag == 1 && dqc.map_flag == -1) {
} else if (DailyQcUtils.points_flag == -1
&& DailyQcUtils.grids_flag == 1 && DailyQcUtils.map_flag == -1) {
ik = 1;
} else if (dqc.points_flag == -1
&& dqc.grids_flag == -1 && dqc.map_flag == 1) {
} else if (DailyQcUtils.points_flag == -1
&& DailyQcUtils.grids_flag == -1 && DailyQcUtils.map_flag == 1) {
ik = 2;
} else if (dqc.points_flag == 1
&& dqc.grids_flag == 1 && dqc.map_flag == -1) {
} else if (DailyQcUtils.points_flag == 1
&& DailyQcUtils.grids_flag == 1 && DailyQcUtils.map_flag == -1) {
ik = 3;
} else if (dqc.points_flag == 1
&& dqc.grids_flag == -1 && dqc.map_flag == 1) {
} else if (DailyQcUtils.points_flag == 1
&& DailyQcUtils.grids_flag == -1 && DailyQcUtils.map_flag == 1) {
ik = 4;
} else if (dqc.points_flag == -1
&& dqc.contour_flag == 1) {
} else if (DailyQcUtils.points_flag == -1
&& DailyQcUtils.contour_flag == 1) {
ik = 5;
} else if (dqc.points_flag == 1
&& dqc.contour_flag == 1) {
} else if (DailyQcUtils.points_flag == 1
&& DailyQcUtils.contour_flag == 1) {
ik = 6;
} else if (dqc.points_flag == -1
&& dqc.grids_flag == -1 && dqc.map_flag == -1) {
} else if (DailyQcUtils.points_flag == -1
&& DailyQcUtils.grids_flag == -1 && DailyQcUtils.map_flag == -1) {
ik = 7;
}
return ik;
@ -319,14 +320,14 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
*/
private void initializeComponents() {
// tdata = DailyQcUtils.tdata;
dqc.points_flag = 1;
dqc.grids_flag = -1;
dqc.map_flag = -1;
dqc.contour_flag = -1;
DailyQcUtils.points_flag = 1;
DailyQcUtils.grids_flag = -1;
DailyQcUtils.map_flag = -1;
DailyQcUtils.contour_flag = -1;
if (MPEDisplayManager.pcpn_time_step != 1) {
MPEDisplayManager.pcpn_time_step = 1;
}
if (dqc.tdata == null || (dqc.tdata.length <= 0)) {
if (DailyQcUtils.tdata == null || (DailyQcUtils.tdata.length <= 0)) {
Date currDate = ChooseDataPeriodDialog.prevDate;
String QcArea = ChooseDataPeriodDialog.prevArea;
int qcDays = MPEDisplayManager.getCurrent().getDqcDays();
@ -338,21 +339,21 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
dataSet.clear();
dataSet.addAll(dataType);
dqc.pcp_flag = 3;
dqc.pcpn_day = 0;
dqc.pcpn_time = 0;
DailyQcUtils.pcp_flag = 3;
DailyQcUtils.pcpn_day = 0;
DailyQcUtils.pcpn_time = 0;
for (i = 0; i < 8; i++) {
if (MPEDisplayManager.pcpn_time_step == 0) {
time_pos = 150 + dqc.pcp_flag;
time_pos = 150 + DailyQcUtils.pcp_flag;
} else if (MPEDisplayManager.pcpn_time_step == 1) {
time_pos = 190 + dqc.pcpn_day;
time_pos = 190 + DailyQcUtils.pcpn_day;
} else if (MPEDisplayManager.pcpn_time_step == 2) {
time_pos = 200 + dqc.pcpn_day;
time_pos = 200 + DailyQcUtils.pcpn_day;
}
if ((i != 0 && i != 7) && dqc.pcp_in_use[time_pos] == -1) {
if ((i != 0 && i != 7) && DailyQcUtils.pcp_in_use[time_pos] == -1) {
dataSet.remove(dataSet.indexOf(dataType.get(i)));
}
}
@ -406,7 +407,7 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
oto.chg_maxmin_time(maxminTimeCbo.getSelectionIndex() + 2);
}
});
if (dqc.qcDays == 1
if (DailyQcUtils.qcDays == 1
&& (dqc.curHr18_00 == 1
|| dqc.curHr00_06 == 1 || dqc.curHr06_12 == 1)) {
maxminTimeCbo.setEnabled(false);
@ -471,8 +472,8 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
renderGridsBtn = new Button(renderComp, SWT.PUSH);
renderGridsBtn.setText("Render Grids+MATs");
renderGridsBtn.setLayoutData(gd);
if (dqc.pcp_in_use[time_pos] == -1
&& dqc.tdata[i].used[4] != 0) {
if (DailyQcUtils.pcp_in_use[time_pos] == -1
&& DailyQcUtils.tdata[i].used[4] != 0) {
renderGridsBtn.setEnabled(true);
} else {
renderGridsBtn.setEnabled(false);
@ -535,7 +536,7 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
chkBxComp.setLayoutData(gd);
int m;
tsbuttons = new Button[dqc.tsmax + 2];
tsbuttons = new Button[DailyQcUtils.tsmax + 2];
nexChk = new Button(chkBxComp, SWT.CHECK);
nexChk.setEnabled(false);
@ -548,9 +549,9 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
}
});
tsbuttons[0] = nexChk;
for (m = 0; m < dqc.tsmax; m++) {
for (m = 0; m < DailyQcUtils.tsmax; m++) {
final Button bname = new Button(chkBxComp, SWT.CHECK);
bname.setText(dqc.ts[m].name);
bname.setText(DailyQcUtils.ts[m].name);
bname.setData(m + 1);
bname.addSelectionListener(new SelectionAdapter() {
@Override
@ -571,20 +572,20 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
}
});
tsbuttons[m + 1] = allChk;
for (int i = 0; i < dqc.tsmax + 2; i++) {
for (int i = 0; i < DailyQcUtils.tsmax + 2; i++) {
if (i == 0) {
/*
* Do not show the NEXRAD option. Nexrad data are now displayed
* through the MPE portion of MPE Editor.
*/
dqc.dflag[i] = -1;
DailyQcUtils.dflag[i] = -1;
continue;
} else {
dqc.dflag[i] = 1;
DailyQcUtils.dflag[i] = 1;
}
if (dqc.dflag[i] == 1) {
if (DailyQcUtils.dflag[i] == 1) {
tsbuttons[i].setSelection(true);
} else {
tsbuttons[i].setSelection(false);
@ -610,7 +611,7 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
// int qflag[] = dqc.qflag;
for (i = 0; i < 10; i++) {
dqc.qflag[i] = 1;
DailyQcUtils.qflag[i] = 1;
}
// qflag[5] = -1;
@ -630,9 +631,9 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
}
if (mpe_show_missing_gage_set == true) {
dqc.qflag[7] = 1;
DailyQcUtils.qflag[7] = 1;
} else {
dqc.qflag[7] = -1;
DailyQcUtils.qflag[7] = -1;
}
Composite pointQualComp = new Composite(pointQualGroup, SWT.NONE);
@ -690,7 +691,7 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
if (i == 5) {
continue;
}
if (dqc.qflag[dqc.funct[i]] == 1) {
if (DailyQcUtils.qflag[dqc.funct[i]] == 1) {
qsbuttons[i].setSelection(true);
} else {
qsbuttons[i].setSelection(false);
@ -708,7 +709,7 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
Label pntDispLbl = new Label(pntSetComp, SWT.CENTER);
pntDispLbl.setText("Point display:");
dqc.plot_view = 4;
DailyQcUtils.plot_view = 4;
pntDispCbo = new Combo(pntSetComp, SWT.DROP_DOWN | SWT.READ_ONLY);
pntDispCbo.setTextLimit(30);
@ -732,9 +733,9 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
int i;
final ScreeningOptions so = new ScreeningOptions();
if (dqc.tdata[dqc.pcpn_day].stddev == 15.0) {
if (DailyQcUtils.tdata[DailyQcUtils.pcpn_day].stddev == 15.0) {
i = 0;
} else if (dqc.tdata[dqc.pcpn_day].stddev == 10.0) {
} else if (DailyQcUtils.tdata[DailyQcUtils.pcpn_day].stddev == 10.0) {
i = 1;
} else {
i = 2;
@ -874,7 +875,7 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
@Override
public void mouseUp(MouseEvent e) {
int sel = pntElFilter.getSelection();
dqc.elevation_filter_value = sel;
DailyQcUtils.elevation_filter_value = sel;
opo.refresh_exposure();
}
@ -889,7 +890,7 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
pntFilter.setSelection(0);
pntRevFilter.setSelection(0);
dqc.elevation_filter_value = pntElFilter.getSelection();
DailyQcUtils.elevation_filter_value = pntElFilter.getSelection();
opo.send_expose();
OtherTempOptions oto = new OtherTempOptions();