From b7c6ab238639df7f9fa8a29f90d558a1b1b8f016 Mon Sep 17 00:00:00 2001 From: Nate Jensen Date: Mon, 30 Jun 2014 13:22:57 -0500 Subject: [PATCH] Omaha #3165 remove deprecated buildColorMap() Change-Id: I1bcf368173ff785c0e05acb9c14cfbaa33080bed Former-commit-id: 128950ec19b8205c917c57b7cb9e0b7a7752aa6d [formerly 766d3323d3fa0d22c220ca5cf53787e873e146c7 [formerly 6b3aa0f461293e6b8d94f8cfc5f956ab172b2e3c]] Former-commit-id: 766d3323d3fa0d22c220ca5cf53787e873e146c7 Former-commit-id: a393ad429aada14703858e44b5ccb60ecdcef454 --- .../.settings/org.eclipse.jdt.core.prefs | 7 ------- .../viz/objectiveanalysis/rsc/OAResource.java | 15 +++++++++---- .../rsc/TimeHeightImageResource.java | 11 +++++++++- .../viz/radar/rsc/RadarImageResource.java | 9 ++++++-- .../rsc/ncradar/rsc/RadarImageResource.java | 21 +++++++++++++------ 5 files changed, 43 insertions(+), 20 deletions(-) delete mode 100644 cave/com.raytheon.uf.viz.objectiveanalysis/.settings/org.eclipse.jdt.core.prefs diff --git a/cave/com.raytheon.uf.viz.objectiveanalysis/.settings/org.eclipse.jdt.core.prefs b/cave/com.raytheon.uf.viz.objectiveanalysis/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index ecb19f2cff..0000000000 --- a/cave/com.raytheon.uf.viz.objectiveanalysis/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -#Thu Nov 05 16:42:06 CST 2009 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/cave/com.raytheon.uf.viz.objectiveanalysis/src/com/raytheon/uf/viz/objectiveanalysis/rsc/OAResource.java b/cave/com.raytheon.uf.viz.objectiveanalysis/src/com/raytheon/uf/viz/objectiveanalysis/rsc/OAResource.java index 1cc1d623c8..d52e41d827 100644 --- a/cave/com.raytheon.uf.viz.objectiveanalysis/src/com/raytheon/uf/viz/objectiveanalysis/rsc/OAResource.java +++ b/cave/com.raytheon.uf.viz.objectiveanalysis/src/com/raytheon/uf/viz/objectiveanalysis/rsc/OAResource.java @@ -40,6 +40,8 @@ import org.eclipse.swt.graphics.RGB; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.referencing.datum.PixelInCell; +import com.raytheon.uf.common.colormap.ColorMapException; +import com.raytheon.uf.common.colormap.ColorMapLoader; import com.raytheon.uf.common.colormap.IColorMap; import com.raytheon.uf.common.colormap.prefs.ColorMapParameters; import com.raytheon.uf.common.dataquery.requests.RequestConstraint; @@ -99,6 +101,7 @@ import com.vividsolutions.jts.geom.Coordinate; * Aug 27, 2013 2287 randerso Added new parameters to * GriddedVectorDisplay constructor * Sep 23, 2013 2363 bsteffen Add more vector configuration options. + * Jun 30, 2014 3165 njensen Use ColorMapLoader to get ColorMap * * * @@ -256,8 +259,12 @@ public class OAResource extends ColorMapCapability.class).getColorMapParameters(); if (parameters.getColorMap() == null) { - parameters.setColorMap(target.buildColorMap(parameters - .getColorMapName())); + try { + parameters.setColorMap(ColorMapLoader + .loadColorMap(parameters.getColorMapName())); + } catch (ColorMapException e) { + throw new VizException(e); + } } image.setColorMapParameters(parameters); @@ -433,8 +440,8 @@ public class OAResource extends FloatBuffer dir = data.slice(); GriddedVectorDisplay vector = new GriddedVectorDisplay(mag, dir, descriptor, transformer.getGridGeom(), - VECTOR_DENSITY_FACTOR, - true, displayType, new VectorGraphicsConfig()); + VECTOR_DENSITY_FACTOR, true, displayType, + new VectorGraphicsConfig()); renderableMap.put(dataTime, vector); break; 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 85641c8cc4..28114063be 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 @@ -25,6 +25,8 @@ import java.util.ArrayList; import org.geotools.geometry.DirectPosition2D; 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.prefs.ColorMapParameters; import com.raytheon.uf.common.geospatial.ReferencedCoordinate; import com.raytheon.uf.common.geospatial.interpolation.BilinearInterpolation; @@ -67,6 +69,7 @@ import com.vividsolutions.jts.geom.Coordinate; * Dec 11, 2013 16795 D. Friedman Transform pixel coordinate in inspect * Mar 07, 2014 2791 bsteffen Move Data Source/Destination to numeric * plugin. + * Jun 30, 2014 3165 njensen Use ColorMapLoader to get ColorMap * * * @@ -227,7 +230,12 @@ public class TimeHeightImageResource extends AbstractTimeHeightResource colorMap = "Grid/gridded data"; } - colorMapParams.setColorMap(target.buildColorMap(colorMap)); + try { + colorMapParams.setColorMap(ColorMapLoader + .loadColorMap(colorMap)); + } catch (ColorMapException e) { + throw new VizException(e); + } } target.setupClippingPlane(descriptor.getGraph(this).getExtent()); @@ -247,6 +255,7 @@ public class TimeHeightImageResource extends AbstractTimeHeightResource } } + @Override public void resourceChanged(ChangeType type, Object object) { if (secondaryResource != null) { diff --git a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/RadarImageResource.java b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/RadarImageResource.java index 98b3ca7150..1fc8c235da 100644 --- a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/RadarImageResource.java +++ b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/RadarImageResource.java @@ -37,6 +37,8 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.referencing.operation.MathTransform; import org.opengis.referencing.operation.TransformException; +import com.raytheon.uf.common.colormap.ColorMapException; +import com.raytheon.uf.common.colormap.ColorMapLoader; import com.raytheon.uf.common.colormap.IColorMap; import com.raytheon.uf.common.colormap.image.ColorMapData; import com.raytheon.uf.common.colormap.prefs.ColorMapParameters; @@ -59,7 +61,6 @@ import com.raytheon.uf.viz.core.IMeshCallback; import com.raytheon.uf.viz.core.PixelCoverage; import com.raytheon.uf.viz.core.VizApp; import com.raytheon.uf.viz.core.data.IColorMapDataRetrievalCallback; -import com.raytheon.uf.viz.core.drawables.ColorMapLoader; import com.raytheon.uf.viz.core.drawables.IDescriptor; import com.raytheon.uf.viz.core.drawables.IImage; import com.raytheon.uf.viz.core.drawables.IWireframeShape; @@ -278,7 +279,11 @@ public class RadarImageResource extends colorMapName = "Radar/OSF/16 Level Reflectivity"; } - params.setColorMap(ColorMapLoader.loadColorMap(colorMapName)); + try { + params.setColorMap(ColorMapLoader.loadColorMap(colorMapName)); + } catch (ColorMapException e) { + throw new VizException(e); + } } diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java b/ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java index f3b26dc7b7..26c1a0ad7d 100644 --- a/ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java +++ b/ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java @@ -39,6 +39,8 @@ import org.opengis.referencing.operation.MathTransform; import org.opengis.referencing.operation.TransformException; import com.raytheon.uf.common.colormap.ColorMap; +import com.raytheon.uf.common.colormap.ColorMapException; +import com.raytheon.uf.common.colormap.ColorMapLoader; import com.raytheon.uf.common.colormap.IColorMap; import com.raytheon.uf.common.colormap.image.ColorMapData; import com.raytheon.uf.common.colormap.prefs.ColorMapParameters; @@ -85,7 +87,7 @@ import com.vividsolutions.jts.geom.Coordinate; /** * TODO Add Description - * + * * This class is based on Raytheon's code. * * 
@@ -101,7 +103,8 @@ import com.vividsolutions.jts.geom.Coordinate;
  *                                      for the colorbar 
  * 12/19/2012   #960       Greg Hull   override propertiesChanged() to update colorBar.
  * 06/10/2013   #999       Greg Hull   RadarRecords from RadarFrameData, rm interrogator
- *                                      
+ * 06/30/2014    3165      njensen     Use ColorMapLoader to get ColorMap
+ * 
  *
* * @author sgurung @@ -149,7 +152,8 @@ public abstract class RadarImageResource extends super(time, interval); } - public boolean updateFrameData( IRscDataObject rscDataObj ) { + @Override + public boolean updateFrameData( IRscDataObject rscDataObj ) { super.updateFrameData(rscDataObj); @@ -166,7 +170,8 @@ public abstract class RadarImageResource extends return true; } - public void dispose() { + @Override + public void dispose() { // if( tileSet != baseTile && tileSet != null ) { // tileSet.dispose(); // tileSet = null; @@ -262,7 +267,7 @@ public abstract class RadarImageResource extends ColorBarFromColormap colorBar = ((RadarResourceData)resourceData).getColorBar(); - ((ColorBarFromColormap)colorBar).setColorMap( colorMap ); + colorBar.setColorMap( colorMap ); colorMapParameters = new ColorMapParameters(); colorMapParameters.setColorMap( colorMap ); @@ -456,7 +461,11 @@ public abstract class RadarImageResource extends colorMapName = "Radar/OSF/16 Level Reflectivity"; } - params.setColorMap(target.buildColorMap(colorMapName)); + try { + params.setColorMap(ColorMapLoader.loadColorMap(colorMapName)); + } catch (ColorMapException e) { + throw new VizException(e); + } }