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

Merge "Omaha #3165 remove deprecated buildColorMap()" into omaha_14.4.1

Browse source 
Former-commit-id: ac0f0e2298 [formerly 0a9fc691b9] [formerly ac0f0e2298 [formerly 0a9fc691b9] [formerly fbda7c4489 [formerly 221f81f4368a6bbd69255a1a148e055d65a2c957]]]
Former-commit-id: fbda7c4489
Former-commit-id: fe1f9e8977 [formerly 9e6433f44b]
Former-commit-id: 6f0d007112
This commit is contained in:
Nate Jensen 2014-07-01 10:22:25 -05:00 • committed by Gerrit Code Review
commit 73bdd3a339
5 changed files with 43 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cave/com.raytheon.uf.viz.objectiveanalysis/.settings/org.eclipse.jdt.core.prefs
View file

@ -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

15
cave/com.raytheon.uf.viz.objectiveanalysis/src/com/raytheon/uf/viz/objectiveanalysis/rsc/OAResource.java
View file

@ -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
*
* </pre>
*
@ -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;

11
cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/rsc/TimeHeightImageResource.java
View file

@ -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
*
* </pre>
*
@ -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) {

9
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/RadarImageResource.java
View file

@ -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<D extends IDescriptor> 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);
}
}

21
ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java
View file

@ -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.
*
* <pre>
@ -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
*
* </pre>
*
* @author sgurung
@ -149,7 +152,8 @@ public abstract class RadarImageResource<D extends IDescriptor> 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<D extends IDescriptor> 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<D extends IDescriptor> 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<D extends IDescriptor> 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);
}
}