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

Merge branch 'master_14.3.1' into asm_14.3.1

Browse source 
Former-commit-id: e6ac4980b9 [formerly 41e3037133 [formerly b0fef17ac648ed5d13d6125fa600c915b131147d]]
Former-commit-id: 41e3037133
Former-commit-id: cb92ade16f
This commit is contained in:
Brian.Dyke 2014-10-15 13:55:32 -04:00
commit 43ecc95cb9
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/KmlExportJob.java
View file

@ -102,7 +102,7 @@ import de.micromata.opengis.kml.v_2_2_0.Vec2;
* ------------- -------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Jun0 6, 2012 bsteffen Initial creation * Jun0 6, 2012 bsteffen Initial creation
* Jan 23, 2014 2703 bsteffen Use framesInfo for frame count. * Jan 23, 2014 2703 bsteffen Use framesInfo for frame count.
* * Oct 06, 2014 3686 njensen Ensure lastIndex is at least 1
* *
* </pre> * </pre>
* *
@ -305,6 +305,8 @@ public class KmlExportJob extends Job {
int lastIndex = options.getLastFrameIndex(); int lastIndex = options.getLastFrameIndex();
lastIndex = Math.min(lastIndex, descriptor.getFramesInfo() lastIndex = Math.min(lastIndex, descriptor.getFramesInfo()
.getFrameCount()); .getFrameCount());
// in case there's zero frames (i.e. all time agnostic)
lastIndex = Math.max(lastIndex, 1);
rscmonitor.beginTask("Saving " + rsc.getName(), lastIndex rscmonitor.beginTask("Saving " + rsc.getName(), lastIndex
- startIndex); - startIndex);
DataTime[] times = descriptor.getFramesInfo().getTimeMap() DataTime[] times = descriptor.getFramesInfo().getTimeMap()
@ -321,6 +323,7 @@ public class KmlExportJob extends Job {
} }
} }
} }
List<DataTime> pastFrames = new ArrayList<DataTime>(); List<DataTime> pastFrames = new ArrayList<DataTime>();
for (int i = startIndex; i < lastIndex; i += 1) { for (int i = startIndex; i < lastIndex; i += 1) {
descriptor.setFramesInfo(new FramesInfo(i)); descriptor.setFramesInfo(new FramesInfo(i));