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

Merge "ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool" into asm_14.3.1

Browse source 
Former-commit-id: 79c408d965 [formerly 05aea71f77] [formerly f14ea5f877] [formerly 79c408d965 [formerly 05aea71f77] [formerly f14ea5f877] [formerly 708e8a8886 [formerly f14ea5f877 [formerly c4a0a681a3f0ea21237684cdadb2aab8ac8ca078]]]]
Former-commit-id: 708e8a8886
Former-commit-id: f03cea1295 [formerly cfba2b439c] [formerly 0863e174af108a5ada072782dca0c186e9728d18 [formerly 0bd1e23078]]
Former-commit-id: 2bfa47b9df8d0acfc640c1101eb14754c8c25816 [formerly c5f4587e6c]
Former-commit-id: 564c67673e
This commit is contained in:
Matthew Howard 2014-09-09 14:01:39 -05:00 • committed by Gerrit Code Review
commit 92f605872d
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()
* and generateExistingTrackInfo()
* 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>
*
@ -694,7 +695,8 @@ public class StormTrackDisplay implements IRenderable {
}
if (state.geomChanged) {
if (StormTrackState.trackType.equals("lineOfStorms") && state.justSwitchedToLOS) {
if (StormTrackState.trackType != null && StormTrackState.trackType.equals("lineOfStorms")
&& state.justSwitchedToLOS) {
GeodeticCalculator gc = new GeodeticCalculator();
Coordinate[] coords = state.dragMeGeom.getCoordinates();
gc.setStartingGeographicPoint(coords[0].x, coords[0].y);
@ -721,7 +723,8 @@ public class StormTrackDisplay implements IRenderable {
state.lineWidth, state.lineStyle);
paintLabels(target, paintProps);
}
if (StormTrackState.trackType.equals("lineOfStorms") && state.justSwitchedToLOS) {
if (StormTrackState.trackType != null && StormTrackState.trackType.equals("lineOfStorms")
&& state.justSwitchedToLOS) {
state.angle = StormTrackState.oneStormAngle;
}
}
@ -801,7 +804,7 @@ public class StormTrackDisplay implements IRenderable {
currentState.pointMoved = false;
currentState.originalTrack = false;
moved = true;
if (StormTrackState.trackType.equals("lineOfStorms") &&
if (StormTrackState.trackType != null && StormTrackState.trackType.equals("lineOfStorms") &&
currentState.justSwitchedToLOS) {
currentState.justSwitchedToLOS = false;
}
@ -1212,7 +1215,7 @@ public class StormTrackDisplay implements IRenderable {
double angle = state.angle;
if(!state.justSwitchedToOS) {
if (StormTrackState.trackType.equals("oneStorm")) {
if (StormTrackState.trackType != null && StormTrackState.trackType.equals("oneStorm")) {
StormTrackState.oneStormAngle = angle;
}
}