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

Omaha #3841 - Fixed saving problem for distance and time.

Browse source 
Former-commit-id: bfbe322c73 [formerly 15ae209055] [formerly b8be69c429 [formerly d6737249fc9d3db54a143345053acdfe889686bf]]
Former-commit-id: b8be69c429
Former-commit-id: 8ba4d73cff
This commit is contained in:
Slav Korolev 2015-02-03 11:27:45 -05:00
parent 63e1f2bead
commit d023dc9dd3
9 changed files with 43 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
View file

@ -51,7 +51,8 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* Oct 16, 2014 3220 skorolev Corrected getInstance() method.
* Oct 27, 2014 3667 skorolev Cleaned code.
* Nov 21, 2014 3841 skorolev Corrected handleOkBtnSelection.
* Dec 11, 2014 3220 skorolev Removed unnecessary code.
* Dec 11, 2014 3220 skorolev Removed unnecessary code.
* Feb 03, 2015 3841 skorolev Replaced resetParams with resetStatus.
*
* </pre>
*
@ -109,7 +110,7 @@ public class FogMonitoringAreaConfigDlg extends MonitoringAreaConfigDlg {
* using new monitor area configuration
*/
fireConfigUpdateEvent();
resetParams();
resetStatus();
} else { // Return back to continue edit.
return;
}

10
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
View file

@ -58,8 +58,9 @@ import com.raytheon.uf.viz.monitor.ui.dialogs.ZoneTableDlg;
* Dec 03, 2012 15216/15639 zhao fixed a bug related to Link-to-Frame
* Dec 7, 2012 1351 skorolev Changes for non-blocking dialogs.
* Apr 28, 2014 3086 skorolev Updated getConfigMgr method.
* Jan 27, 2015 3220 skorolev Removed "site".Added check on dispose.Corrected configMgr assignment.Added table cache update.
*
* Jan 27, 2015 3220 skorolev Removed "site".Added check on dispose.Corrected configMgr assignment.
* Added table cache update.
* Feb 04, 2015 3841 skorolev Corrected notify method for empty table update.
* </pre>
*
* @author ?
@ -148,12 +149,11 @@ public class FogZoneTableDlg extends ZoneTableDlg {
// The algorithm output.
if (me.getSource() instanceof FogMonitor) {
FogMonitor fog = (FogMonitor) me.getSource();
ObMultiHrsReports obData = fog.getObData();
Date date = fog.getDialogTime();
if (date != null) {
Date nominalTime = date;
ObMultiHrsReports obData = fog.getObData();
if (!isLinkedToFrame()) {
nominalTime = obData.getLatestNominalTime();
}
@ -162,6 +162,8 @@ public class FogZoneTableDlg extends ZoneTableDlg {
.getAlgorithmData(nominalTime));
obData.setFogAlgCellType(fogAlgCellType);
this.updateTableDlg(obData.getObHourReports(nominalTime));
} else {
this.updateZoneTable(obData.getLatestNominalTime());
}
}
}

3
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
View file

@ -52,6 +52,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* Oct 27, 2014 3667 skorolev Cleaned code.
* Nov 21, 2014 3841 skorolev Corrected handleOkBtnSelection.
* Dec 11, 2014 3220 skorolev Removed unnecessary code.
* Feb 03, 2015 3841 skorolev Replaced resetParams with resetStatus.
*
*
* </pre>
@ -101,7 +102,7 @@ public class SSMonitoringAreaConfigDlg extends MonitoringAreaConfigDlg {
}
}
fireConfigUpdateEvent();
resetParams();
resetStatus();
} else { // Return back to continue edit.
return;
}

8
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSZoneTableDlg.java
View file

@ -56,7 +56,9 @@ import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants;
* Nov 10, 2012 1297 skorolev Added initiateProdArray
* Dec 7, 2012 1351 skorolev Changes for non-blocking dialogs.
* Apr 28, 2014 3086 skorolev Updated getConfigMgr method.
* Jan 27, 2015 3220 skorolev Removed "site". Added check on dispose.Corrected configMgr assignment.Added table cache update.
* Jan 27, 2015 3220 skorolev Removed "site". Added check on dispose.Corrected configMgr assignment.
* Added table cache update.
* Feb 04, 2015 3841 skorolev Corrected notify method for empty table update.
*
* </pre>
*
@ -153,10 +155,10 @@ public class SSZoneTableDlg extends ZoneTableDlg {
if (me.getSource() instanceof SafeSeasMonitor) {
SafeSeasMonitor monitor = (SafeSeasMonitor) me.getSource();
ObMultiHrsReports obData = monitor.getObData();
Date date = monitor.getDialogTime();
if (date != null) {
Date nominalTime = date;
ObMultiHrsReports obData = monitor.getObData();
if (!isLinkedToFrame()) {
nominalTime = obData.getLatestNominalTime();
}
@ -165,6 +167,8 @@ public class SSZoneTableDlg extends ZoneTableDlg {
obData.setFogAlgCellType(monitor.getAlgCellTypes(fogAlgThreats));
this.updateTableDlg(monitor.getObData().getObHourReports(
nominalTime));
} else {
this.updateZoneTable(obData.getLatestNominalTime());
}
}
}

3
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
View file

@ -52,6 +52,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* Oct 27, 2014 3667 skorolev Cleaned code.
* Nov 21, 2014 3841 skorolev Corrected handleOkBtnSelection.
* Dec 11, 2014 3220 skorolev Removed unnecessary code.
* Feb 03, 2015 3841 skorolev Replaced resetParams with resetStatus.
*
* </pre>
*
@ -110,7 +111,7 @@ public class SnowMonitoringAreaConfigDlg extends MonitoringAreaConfigDlg {
}
}
fireConfigUpdateEvent();
resetParams();
resetStatus();
} else { // Return back to continue edit.
return;
}

11
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowZoneTableDlg.java
View file

@ -53,7 +53,9 @@ import com.raytheon.uf.viz.monitor.ui.dialogs.ZoneTableDlg;
* Nov. 8, 2012 1297 skorolev Added initiateProdArray method
* Dec 7, 2012 1351 skorolev Changes for non-blocking dialogs
* Apr 28, 2014 3086 skorolev Updated getConfigMgr method.
* Jan 27, 2015 3220 skorolev Removed "site". Added check on dispose.Corrected configMgr assignment.Added table cache update.
* Jan 27, 2015 3220 skorolev Removed "site". Added check on dispose.Corrected configMgr assignment.
* Added table cache update.
* Feb 04, 2015 3841 skorolev Corrected notify method for empty table update.
*
* </pre>
*
@ -146,12 +148,15 @@ public class SnowZoneTableDlg extends ZoneTableDlg {
if (me.getSource() instanceof SnowMonitor) {
SnowMonitor monitor = (SnowMonitor) me.getSource();
ObMultiHrsReports obData = monitor.getObData();
Date date = monitor.getDialogTime();
if (date != null) {
if (!isLinkedToFrame()) {
date = monitor.getObData().getLatestNominalTime();
date = obData.getLatestNominalTime();
}
this.updateTableDlg(monitor.getObData().getObHourReports(date));
this.updateTableDlg(obData.getObHourReports(date));
} else {
this.updateZoneTable(obData.getLatestNominalTime());
}
}
}

6
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java Executable file → Normal file
View file

@ -55,7 +55,9 @@ import com.raytheon.uf.viz.monitor.thresholds.AbstractThresholdMgr;
* Jan 25, 2010 4281, 3888, 3877 wkwock/zhao added getHistTableData method
* Oct.31, 2012 1297 skorolev Clean code.
* Jan.29, 2013 15654 zhao add Wind Chill calculation for SNOW
* Jan 27, 2015 3220 skorolev Updated getStationTableData method.Replaced MonitoringArea with cfgMgr.Added multiHrsTabData - Table data cache.
* Jan 27, 2015 3220 skorolev Updated getStationTableData method.Replaced MonitoringArea with cfgMgr.
* Added multiHrsTabData - Table data cache.
* Feb 04, 2015 3841 skorolev Corrected getEmptyZoneTableData method.
*
* </pre>
*
@ -245,6 +247,8 @@ public class ObMultiHrsReports {
} else {
tabData = hourReports.getZoneTableData();
}
// update data cache
multiHrsReports.put(nominalTime, hourReports);
// update cache with empty table data
if (multiHrsTabData.replace(nominalTime, tabData) == null) {
multiHrsTabData.put(nominalTime, tabData);

12
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/EditNewZoneDlg.java
View file

@ -57,6 +57,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* Apr 28, 2014 3086 skorolev Removed local getAreaConfigMgr method.
* Nov 10, 2014 3741 skorolev Fixed configXML issue.
* Nov 21, 2014 3841 skorolev Content of ID field made an editable.
* Feb 03, 2015 3841 skorolev Fixed deleteSelected method.
*
* </pre>
*
@ -358,9 +359,14 @@ public class EditNewZoneDlg extends CaveSWTDialog {
}
String area = zoneList.getItem(zoneList.getSelectionIndex());
zoneList.remove(zoneList.getSelectionIndex());
idTF.setText("");
latTF.setText("");
lonTF.setText("");
zoneList.select(0);
if (zoneList.getItemCount() != 0) {
handleZoneSelection();
} else {
idTF.setText("");
latTF.setText("");
lonTF.setText("");
}
if (macDlg.getMaZones().contains(area)) {
macDlg.getMaZones().remove(area);
macDlg.configMgr.removeArea(area);

10
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
View file

@ -80,6 +80,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* Nov 12, 2014 3650 skorolev Added confirmation box for unsaved changes in the dialog.
* Nov 21, 2014 3841 skorolev Added formIsValid method.
* Dec 18, 2014 3841 skorolev Corrected addZoneStn method.
* Feb 03, 2015 3841 skorolev Fixed saving problem for distance and time.
*
* </pre>
*
@ -1336,18 +1337,11 @@ public abstract class MonitoringAreaConfigDlg extends CaveSWTDialog implements
populateMaRegionalList();
}
/**
* Reset configuration parameters.
*/
protected void resetParams() {
getValues();
resetStatus();
}
/**
* Saving configuration parameters.
*/
protected void saveConfigs() {
getValues();
configMgr.saveConfigXml();
configMgr.saveAdjacentAreaConfigXml();
}