From 6788d90112fa49b2ac676d07cc623d8a8f92d79a Mon Sep 17 00:00:00 2001
From: Mark Peters <Mark.A.Peters@raytheon.com>
Date: Wed, 13 Aug 2014 09:12:30 -0500
Subject: [PATCH] Omaha #3505 Replace Raytheon references to
 CMDataPreparerManager

Change-Id: Idc2d496973473fb8a13ee5c19560e270b7556e79

Former-commit-id: e9959c63aeacf0a31e232cbb888a676517f0a12a [formerly 6d1d00b1b772db3338769ff1bd870c8d1df273ab] [formerly e4d5f4a587dd65e3766ac8ec2e3df85873e458e6] [formerly e4d5f4a587dd65e3766ac8ec2e3df85873e458e6 [formerly 4bda74945e22bc3fd86f5a373655049d749905ee]] [formerly 85e0997b5680f984fbb6ded19ff6305fd311d4f6 [formerly e4d5f4a587dd65e3766ac8ec2e3df85873e458e6 [formerly 4bda74945e22bc3fd86f5a373655049d749905ee] [formerly 85e0997b5680f984fbb6ded19ff6305fd311d4f6 [formerly ffd44aac9c7f58b48e0ef250a309cbae44230166]]]]
Former-commit-id: 85e0997b5680f984fbb6ded19ff6305fd311d4f6
Former-commit-id: a17839b5c89d28b7f6aa0566761f004df76a1238 [formerly 907534d1162c066d756ad84d314e92e32b3fb0bb] [formerly 984eaff05048845c2a428d45577b352c12252b31 [formerly 17c96e288abecc34f9ece4c90b087f45445b5af6]]
Former-commit-id: 984eaff05048845c2a428d45577b352c12252b31
Former-commit-id: 4661604fdcc8a992d0de384bd4b4c524925c04ba
---
 .../rsc/TimeHeightImageResource.java          | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/rsc/TimeHeightImageResource.java b/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/rsc/TimeHeightImageResource.java
index 28114063be..df57a4677e 100644
--- a/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/rsc/TimeHeightImageResource.java
+++ b/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/rsc/TimeHeightImageResource.java
@@ -19,7 +19,7 @@
  **/
 package com.raytheon.uf.viz.xy.timeheight.rsc;
 
-import java.awt.Rectangle;
+import java.nio.FloatBuffer;
 import java.util.ArrayList;
 
 import org.geotools.geometry.DirectPosition2D;
@@ -27,6 +27,8 @@ import org.geotools.geometry.Envelope2D;
 
 import com.raytheon.uf.common.colormap.ColorMapException;
 import com.raytheon.uf.common.colormap.ColorMapLoader;
+import com.raytheon.uf.common.colormap.image.ColorMapData;
+import com.raytheon.uf.common.colormap.image.ColorMapData.ColorMapDataType;
 import com.raytheon.uf.common.colormap.prefs.ColorMapParameters;
 import com.raytheon.uf.common.geospatial.ReferencedCoordinate;
 import com.raytheon.uf.common.geospatial.interpolation.BilinearInterpolation;
@@ -44,9 +46,10 @@ import com.raytheon.uf.viz.core.IExtent;
 import com.raytheon.uf.viz.core.IGraphicsTarget;
 import com.raytheon.uf.viz.core.PixelCoverage;
 import com.raytheon.uf.viz.core.VizApp;
-import com.raytheon.uf.viz.core.data.prep.CMDataPreparerManager;
+import com.raytheon.uf.viz.core.data.IColorMapDataRetrievalCallback;
 import com.raytheon.uf.viz.core.drawables.IImage;
 import com.raytheon.uf.viz.core.drawables.PaintProperties;
+import com.raytheon.uf.viz.core.drawables.ext.colormap.IColormappedImageExtension;
 import com.raytheon.uf.viz.core.exception.VizException;
 import com.raytheon.uf.viz.core.rsc.IResourceDataChanged;
 import com.raytheon.uf.viz.core.rsc.LoadProperties;
@@ -70,6 +73,8 @@ import com.vividsolutions.jts.geom.Coordinate;
  * Mar 07, 2014  2791     bsteffen    Move Data Source/Destination to numeric
  *                                    plugin.
  * Jun 30, 2014  3165     njensen     Use ColorMapLoader to get ColorMap
+ * Aug 13, 2014  3505     mapeters    Replaced deprecated CMDataPreparerManager
+ *                                    reference in initializeRaster() call.
  * 
  * </pre>
  * 
@@ -175,7 +180,7 @@ public class TimeHeightImageResource extends AbstractTimeHeightResource
             }
             getCapability(ColorMapCapability.class).setColorMapParameters(
                     colorMapParams);
-            int[] dims = new int[] { geometry.getGridRange().getSpan(0),
+            final int[] dims = new int[] { geometry.getGridRange().getSpan(0),
                     geometry.getGridRange().getSpan(1) };
 
             float[] sliceData = interpolatedData;
@@ -186,10 +191,16 @@ public class TimeHeightImageResource extends AbstractTimeHeightResource
                         secondaryResource.interpolatedData);
             }
 
-            image = target.initializeRaster(CMDataPreparerManager
-                    .getDataPreparer(sliceData,
-                            new Rectangle(dims[0], dims[1]), null),
-                    colorMapParams);
+            final FloatBuffer data = FloatBuffer.wrap(sliceData);
+            this.image = target.getExtension(IColormappedImageExtension.class)
+                    .initializeRaster(new IColorMapDataRetrievalCallback() {
+                        @Override
+                        public ColorMapData getColorMapData()
+                                throws VizException {
+                            return new ColorMapData(data, dims,
+                                    ColorMapDataType.FLOAT);
+                        }
+                    }, colorMapParams);
 
             ImagingCapability cap = getCapability(ImagingCapability.class);
             image.setBrightness(cap.getBrightness());