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

Merge "ASM #16844 - WarnGen can become disabled when moving storm track" into asm_14.3.1

Browse source 
Former-commit-id: 1421171def [formerly 9825175171 [formerly 64318d29379dc904be07fa6bc1d38a51642e0476]]
Former-commit-id: 9825175171
Former-commit-id: bc1c9b692d
This commit is contained in:
Juliya Dynina 2014-10-14 07:10:10 -05:00 • committed by Gerrit Code Review
commit 517a158c00
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -109,8 +109,7 @@ import com.vividsolutions.jts.geom.LineString;
* 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.
* 09-25-2014 ASM #16773 D. Friedman Fix NPE.
*
>>>>>>> master_14.2.4
* 10-10-2014 ASM #16844 D. Friedman Prevent some errors when moving track.
* </pre>
*
* @author mschenke
@ -842,7 +841,9 @@ public class StormTrackDisplay implements IRenderable {
PaintProperties paintProps) throws ImpossibleTrackException {
int moveIndex = this.trackUtil.getCurrentFrame(paintProps
.getFramesInfo());
moveIndex = Math.min(moveIndex, state.timePoints.length - 1);
int pivotIndex = state.displayedPivotIndex;
pivotIndex = Math.min(pivotIndex, state.timePoints.length - 1);
double angle;
double oppositeAngle;