Issue #1380 fix kml handling of uninitialized coor bars.

Former-commit-id: fc3a59d796 [formerly 5040239f69] [formerly 0418beb8c7] [formerly fc3a59d796 [formerly 5040239f69] [formerly 0418beb8c7] [formerly 1828fcbccf [formerly 0418beb8c7 [formerly 31189d6a6ca7a97220f2713f067c27e9bb415fd1]]]]
Former-commit-id: 1828fcbccf
Former-commit-id: 242ea756de [formerly 1c508fc105] [formerly 4af344ddcea63070ee5636c11476c5bc7bc9cb20 [formerly ba7f4d2e71]]
Former-commit-id: 3f975eb81366fda48a50c613ef2d948aba3184f9 [formerly c94c7901af]
Former-commit-id: 04d22c0f2b
This commit is contained in:
Ben Steffensmeier 2012-12-03 15:21:20 -06:00
parent 0ffbb6aaa7
commit 6e962adfef

View file

@ -304,7 +304,6 @@ public class KmlExportJob extends Job {
lastIndex = Math.min(lastIndex, descriptor.getNumberOfFrames()); lastIndex = Math.min(lastIndex, descriptor.getNumberOfFrames());
rscmonitor.beginTask("Saving " + rsc.getName(), lastIndex rscmonitor.beginTask("Saving " + rsc.getName(), lastIndex
- startIndex); - startIndex);
addColorMap(resourceOut, display.getBackgroundColor(), rsc);
DataTime[] times = descriptor.getFramesInfo().getTimeMap() DataTime[] times = descriptor.getFramesInfo().getTimeMap()
.get(rsc); .get(rsc);
if ((times == null || times.length == 0) if ((times == null || times.length == 0)
@ -352,6 +351,7 @@ public class KmlExportJob extends Job {
return; return;
} }
} }
addColorMap(resourceOut, display.getBackgroundColor(), rsc);
} }
rp.getProperties().setVisible(false); rp.getProperties().setVisible(false);
if (options.isPreserveVisibility() && !visibility.get(c)) { if (options.isPreserveVisibility() && !visibility.get(c)) {
@ -550,6 +550,10 @@ public class KmlExportJob extends Job {
xAnchor = Math.min(1, cap.getResourceIndex()); xAnchor = Math.min(1, cap.getResourceIndex());
} }
IColorMap colorMap = parameters.getColorMap(); IColorMap colorMap = parameters.getColorMap();
if (colorMap == null) {
// the resource isn't actually using it's color bar.
return;
}
BufferedImage bi = new BufferedImage(colorMap.getSize() * 2, 25, BufferedImage bi = new BufferedImage(colorMap.getSize() * 2, 25,
BufferedImage.TYPE_INT_RGB); BufferedImage.TYPE_INT_RGB);
Graphics graphics = bi.getGraphics(); Graphics graphics = bi.getGraphics();