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

ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool

Browse source 
Change-Id: I68c2b4b336a5145de20f70cb0967c9dc484f3b09

Former-commit-id: 18882502cb [formerly f2bd188b06] [formerly 517f0c9d0c] [formerly 517f0c9d0c [formerly 51d48a6fdc]] [formerly 3f666817e0 [formerly 517f0c9d0c [formerly 51d48a6fdc] [formerly 3f666817e0 [formerly 7a75687b76584b4578fad4c31c8557d78e507f46]]]]
Former-commit-id: 3f666817e0
Former-commit-id: 97906154f18773cd75add3784a808b383d10f2b0 [formerly 4a20c967a8c7ab8e5ec6a22c27436eb4b16fa1ab] [formerly bb4682b291 [formerly 61d967b1cd]]
Former-commit-id: bb4682b291
Former-commit-id: 381ebd2d11
This commit is contained in:
Qinglu.Lin 2014-09-09 08:07:20 -04:00
parent 1de869f7c3
commit 3394459674
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
View file

@ -107,6 +107,7 @@ import com.vividsolutions.jts.geom.LineString;
* 06-17-2014 DR17409 mgamazaychikov Fix futurePoints calculation in generateNewTrackInfo() * 06-17-2014 DR17409 mgamazaychikov Fix futurePoints calculation in generateNewTrackInfo()
* and generateExistingTrackInfo() * and generateExistingTrackInfo()
* 08-21-2014 DR 15700 Qinglu Lin handle the situation where frameTime is null in paintTrack(). * 08-21-2014 DR 15700 Qinglu Lin handle the situation where frameTime is null in paintTrack().
* 09-09-2014 RM #657 Qinglu Lin handle StormTrackState.trackType is null.
* *
* </pre> * </pre>
* *
@ -694,7 +695,8 @@ public class StormTrackDisplay implements IRenderable {
} }
if (state.geomChanged) { if (state.geomChanged) {
if (StormTrackState.trackType.equals("lineOfStorms") && state.justSwitchedToLOS) { if (StormTrackState.trackType != null && StormTrackState.trackType.equals("lineOfStorms")
&& state.justSwitchedToLOS) {
GeodeticCalculator gc = new GeodeticCalculator(); GeodeticCalculator gc = new GeodeticCalculator();
Coordinate[] coords = state.dragMeGeom.getCoordinates(); Coordinate[] coords = state.dragMeGeom.getCoordinates();
gc.setStartingGeographicPoint(coords[0].x, coords[0].y); gc.setStartingGeographicPoint(coords[0].x, coords[0].y);
@ -721,7 +723,8 @@ public class StormTrackDisplay implements IRenderable {
state.lineWidth, state.lineStyle); state.lineWidth, state.lineStyle);
paintLabels(target, paintProps); paintLabels(target, paintProps);
} }
if (StormTrackState.trackType.equals("lineOfStorms") && state.justSwitchedToLOS) { if (StormTrackState.trackType != null && StormTrackState.trackType.equals("lineOfStorms")
&& state.justSwitchedToLOS) {
state.angle = StormTrackState.oneStormAngle; state.angle = StormTrackState.oneStormAngle;
} }
} }
@ -801,7 +804,7 @@ public class StormTrackDisplay implements IRenderable {
currentState.pointMoved = false; currentState.pointMoved = false;
currentState.originalTrack = false; currentState.originalTrack = false;
moved = true; moved = true;
if (StormTrackState.trackType.equals("lineOfStorms") && if (StormTrackState.trackType != null && StormTrackState.trackType.equals("lineOfStorms") &&
currentState.justSwitchedToLOS) { currentState.justSwitchedToLOS) {
currentState.justSwitchedToLOS = false; currentState.justSwitchedToLOS = false;
} }
@ -1212,7 +1215,7 @@ public class StormTrackDisplay implements IRenderable {
double angle = state.angle; double angle = state.angle;
if(!state.justSwitchedToOS) { if(!state.justSwitchedToOS) {
if (StormTrackState.trackType.equals("oneStorm")) { if (StormTrackState.trackType != null && StormTrackState.trackType.equals("oneStorm")) {
StormTrackState.oneStormAngle = angle; StormTrackState.oneStormAngle = angle;
} }
} }