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

Omaha #3888 fixed pop up for thesholds and fog monitor safety.

Browse source 
Former-commit-id: d01e7774b5 [formerly b1c25aa439095ef52ad228662bbe1d38aae5d555]
Former-commit-id: 344ed156e4
This commit is contained in:
Dave Hladky 2015-03-09 15:50:16 -05:00
parent 651a86512c
commit 168ea904ea
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java
View file

@ -90,6 +90,7 @@ import com.vividsolutions.jts.geom.Geometry;
* Apr 28, 2014 3086 skorolev Removed local getMonitorAreaConfig method. * Apr 28, 2014 3086 skorolev Removed local getMonitorAreaConfig method.
* Sep 04, 2014 3220 skorolev Updated configUpdate method and added updateMonitoringArea. * Sep 04, 2014 3220 skorolev Updated configUpdate method and added updateMonitoringArea.
* Sep 23, 2014 3356 njensen Remove unnecessary import * Sep 23, 2014 3356 njensen Remove unnecessary import
* Mar 09, 2014 3888 dhladky Stopped processing when dialogs are null or disposed.
* *
* *
* </pre> * </pre>
@ -366,14 +367,20 @@ public class FogMonitor extends ObsMonitor implements IFogResourceListener {
*/ */
@Override @Override
protected void process(ObReport result) throws Exception { protected void process(ObReport result) throws Exception {
obData.addReport(result);
String zone = findZone(result.getPlatformId()); if (zoneDialog != null && !zoneDialog.isDisposed()) {
if (zone != null) {
AreaContainer ac = getTableData().getArea(zone); obData.addReport(result);
if (ac != null) { String zone = findZone(result.getPlatformId());
ac.addReport(result.getObservationTime(), result); if (zone != null) {
fireMonitorEvent(this); AreaContainer ac = getTableData().getArea(zone);
if (ac != null) {
ac.addReport(result.getObservationTime(), result);
fireMonitorEvent(this);
}
} }
} else {
monitor.nullifyMonitor();
} }
} }

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

@ -78,6 +78,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* Sep 24, 2014 2757 skorolev Fixed problem with adding and removing zones. * Sep 24, 2014 2757 skorolev Fixed problem with adding and removing zones.
* Oct 27, 2014 3667 skorolev Corrected functionality of dialog. Cleaned code. * Oct 27, 2014 3667 skorolev Corrected functionality of dialog. Cleaned code.
* Nov 12, 2014 3650 skorolev Added confirmation box for unsaved changes in the dialog. * Nov 12, 2014 3650 skorolev Added confirmation box for unsaved changes in the dialog.
* Mar 08, 2015 3888 dhladky Restored threshold pop-up when adding new stations/zones.
* *
* </pre> * </pre>
* *
@ -1476,12 +1477,7 @@ public abstract class MonitoringAreaConfigDlg extends CaveSWTDialog implements
* Reset data status. * Reset data status.
*/ */
protected void resetStatus() { protected void resetStatus() {
if (!configMgr.getAddedZones().isEmpty()) {
configMgr.getAddedZones().clear();
}
if (!configMgr.getAddedStations().isEmpty()) {
configMgr.getAddedStations().clear();
}
this.timeWindowChanged = false; this.timeWindowChanged = false;
this.maZonesRemoved = false; this.maZonesRemoved = false;
this.maStationsRemoved = false; this.maStationsRemoved = false;