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

ASM #253 Update MPE Bias Table to allow reverting modified bias, back to original value.

Browse source 
Change-Id: I1f84133404e14f7debb66e66735aa0d96a92b316

Former-commit-id: a7092ac01d [formerly b58b7d3d5a] [formerly a7092ac01d [formerly b58b7d3d5a] [formerly 8a00348730 [formerly 2f608451c941efcc5372f0d0870ac72409f518e3]]]
Former-commit-id: 8a00348730
Former-commit-id: 452cbdcc4e [formerly d079dbcb7c]
Former-commit-id: 39437970c7
This commit is contained in:
steve.naples 2014-05-02 16:15:04 +00:00
parent f99bcfc97f
commit 18c51dac23
1 changed files with 57 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
View file

@ -23,6 +23,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.TimeZone; import java.util.TimeZone;
@ -32,10 +33,10 @@ import org.eclipse.swt.events.ControlAdapter;
import org.eclipse.swt.events.ControlEvent; import org.eclipse.swt.events.ControlEvent;
import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Button;
@ -72,6 +73,7 @@ import com.raytheon.viz.mpe.ui.radartable.ReadBiasTableParam;
* Feb 2, 2014 16201 snaples Added saved data flag support * Feb 2, 2014 16201 snaples Added saved data flag support
* Apr 4, 2014 17223 snaples Updated other_office_id and rfc_bias to object * Apr 4, 2014 17223 snaples Updated other_office_id and rfc_bias to object
* array so that called procedure can update and return values properly. * array so that called procedure can update and return values properly.
* May 1, 2014 16626 snaples Updated the Manual Bias button to allow revert to original value.
* *
* </pre> * </pre>
* *
@ -148,6 +150,10 @@ public class RadarBiasTableDialog extends Dialog {
Button[] manEdit = null; Button[] manEdit = null;
Text[] lbTxts = null;
private final Map<String, Integer> biasChgs = new HashMap<String, Integer>();
static { static {
sdf.setTimeZone(TimeZone.getTimeZone("GMT")); sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
pgsdf.setTimeZone(TimeZone.getTimeZone("GMT")); pgsdf.setTimeZone(TimeZone.getTimeZone("GMT"));
@ -343,7 +349,7 @@ public class RadarBiasTableDialog extends Dialog {
dt = pgsdf.format(dt3); dt = pgsdf.format(dt3);
rsList = new HashMap<String, MPERadarData>(radIds.length); rsList = new HashMap<String, MPERadarData>(radIds.length);
rsList = MPEDataManager.getInstance().readRadarData(dt3); rsList = MPEDataManager.getInstance().readRadarData(dt3);
Text[] lbTxts = new Text[radIds.length]; lbTxts = new Text[radIds.length];
manEdit = new Button[radIds.length]; manEdit = new Button[radIds.length];
for (int i = 0; i < radIds.length; i++) { for (int i = 0; i < radIds.length; i++) {
@ -398,9 +404,10 @@ public class RadarBiasTableDialog extends Dialog {
}); });
bias = String.format("%-1.2f", radarresultdata.getRwBiasValUsed());
oldbias[i] = (float) radarresultdata.getRwBiasValUsed(); oldbias[i] = (float) radarresultdata.getRwBiasValUsed();
editbias[i] = 0.0f; editbias[i] = 0.0f;
editbias[i] = oldbias[i];
bias = String.format("%-1.2f", editbias[i]);
gd = new GridData(SWT.FILL, SWT.CENTER, true, true); gd = new GridData(SWT.FILL, SWT.CENTER, true, true);
final Text lbiasTxt = new Text(biasListComp, SWT.SINGLE final Text lbiasTxt = new Text(biasListComp, SWT.SINGLE
@ -419,17 +426,16 @@ public class RadarBiasTableDialog extends Dialog {
lbiasTxt.setData(i); lbiasTxt.setData(i);
lbiasTxt.addModifyListener(new ModifyListener() { lbiasTxt.addModifyListener(new ModifyListener() {
@Override
@Override public void modifyText(ModifyEvent e) {
public void modifyText(ModifyEvent e) {
final int ei = (Integer) lbiasTxt.getData(); final int ei = (Integer) lbiasTxt.getData();
try { try {
float parsedFloat = Float.parseFloat(lbiasTxt.getText()); float parsedFloat = Float.parseFloat(lbiasTxt.getText());
editbias[ei] = parsedFloat; editbias[ei] = parsedFloat;
manEdit[ei].setSelection(!mbiasBtn.getSelection());
manEdit[ei].setText("YES"); manEdit[ei].setText("YES");
lbiasTxt.setBackground(getParent().getDisplay() lbiasTxt.setBackground(getParent().getDisplay()
.getSystemColor(SWT.COLOR_WHITE)); .getSystemColor(SWT.COLOR_WHITE));
biasChgs.put(radIds[ei], ei);
applyBtn.setEnabled(true); applyBtn.setEnabled(true);
} catch (NumberFormatException e1) { } catch (NumberFormatException e1) {
lbiasTxt.setBackground(getParent().getDisplay() lbiasTxt.setBackground(getParent().getDisplay()
@ -442,16 +448,36 @@ public class RadarBiasTableDialog extends Dialog {
lbTxts[i] = lbiasTxt; lbTxts[i] = lbiasTxt;
gd = new GridData(SWT.FILL, SWT.CENTER, true, true); gd = new GridData(SWT.FILL, SWT.CENTER, true, true);
mbiasBtn = new Button(biasListComp, SWT.TOGGLE | SWT.READ_ONLY); final Button mbiasBtn = new Button(biasListComp, SWT.TOGGLE);
// mbiasBtn.setEnabled(false);
mbias = ("n".equalsIgnoreCase(radarresultdata.getEditBias()) || radarresultdata mbias = ("n".equalsIgnoreCase(radarresultdata.getEditBias()) || radarresultdata
.getEditBias() == null) ? "NO" : "YES"; .getEditBias() == null) ? "NO" : "YES";
mbiasBtn.setText(mbias); mbiasBtn.setText(mbias);
mbiasBtn.setLayoutData(gd); mbiasBtn.setLayoutData(gd);
mbiasBtn.setData(i); mbiasBtn.setData(i);
mbiasBtn.setSelection(false);
manEdit[i] = mbiasBtn; manEdit[i] = mbiasBtn;
mbiasBtn.addSelectionListener(new SelectionAdapter() {
/**
* (non-Javadoc)
*
* @see
* org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse
* .swt.events.SelectionEvent)
*/
@Override
public void widgetSelected(SelectionEvent e) {
final int ai = (Integer) mbiasBtn.getData();
if ("YES".equalsIgnoreCase(mbiasBtn.getText())) {
manEdit[ai].setSelection(false);
editbias[ai] = oldbias[ai];
lbTxts[ai].setText(String.format("%-1.2f", editbias[ai]));
biasChgs.put(radIds[ai], ai);
applyBtn.setEnabled(false);
manEdit[ai].setText("NO");
}
}
});
gd = new GridData(SWT.FILL, SWT.CENTER, true, true); gd = new GridData(SWT.FILL, SWT.CENTER, true, true);
Label acoefLbl = new Label(biasListComp, SWT.CENTER); Label acoefLbl = new Label(biasListComp, SWT.CENTER);
if (abzerocoef.mlt_zrcoef == 0.0) { if (abzerocoef.mlt_zrcoef == 0.0) {
@ -515,29 +541,27 @@ public class RadarBiasTableDialog extends Dialog {
final float memspan = -99.0f; final float memspan = -99.0f;
ArrayList<Rwradarresult> rwr = new ArrayList<Rwradarresult>(); ArrayList<Rwradarresult> rwr = new ArrayList<Rwradarresult>();
Rwradarresult rwrr = new Rwradarresult(); Rwradarresult rwrr = new Rwradarresult();
for (int i = 0; i < radIds.length; i++) { Iterator<String> bi = biasChgs.keySet().iterator();
if (radIds[i].equals("ZZZ")) { while (bi.hasNext()) {
continue; String rid = bi.next();
} where = String.format("WHERE radid='%s' AND obstime='%s'",rid, obstime);
if (manEdit[i] != null rwr = (ArrayList<Rwradarresult>) IHFSDbGenerated.GetRWRadarResult(where);
&& "YES".equalsIgnoreCase(manEdit[i].getText())) { if (rwr.size() != 0) {
where = String.format("WHERE radid='%s' AND obstime='%s'", rwrr = rwr.get(0);
radIds[i], obstime); } else {
rwr = (ArrayList<Rwradarresult>) IHFSDbGenerated continue;
.GetRWRadarResult(where); }
if (rwr.size() != 0) { int indexval = biasChgs.get(rid);
rwrr = rwr.get(0); if("YES".equalsIgnoreCase(manEdit[indexval].getText())){
} else { rwrr.setEditBias("y");
continue; rwrr.setMemSpanUsed((double) memspan);
} } else {
rwrr.setEditBias("y"); rwrr.setEditBias("n");
rwrr.setMemSpanUsed((double) memspan); }
rwrr.setRwBiasValUsed((double) editbias[i]); rwrr.setRwBiasValUsed((double) editbias[indexval]);
IHFSDbGenerated.UpdateRWRadarResult(rwrr); IHFSDbGenerated.UpdateRWRadarResult(rwrr);
} else {
continue;
}
} }
biasChgs.clear();
return; return;
} }
} }