Issue #1784 Update ColorMapParameters import for ncep plugins

Change-Id: I704f2d98eb07531108593de681a9f7ffc67b04e8

Former-commit-id: 884757847d855af099219c8ef2715a6319913646
This commit is contained in:
Dustin Johnson 2013-03-13 08:45:54 -05:00
parent 71365cd945
commit 9cd29d7625
4 changed files with 21 additions and 18 deletions

View file

@ -1,8 +1,11 @@
package gov.noaa.nws.ncep.viz.rsc.solarimage; package gov.noaa.nws.ncep.viz.rsc.solarimage;
import gov.noaa.nws.ncep.common.dataplugin.solarimage.SolarImageRecord; import gov.noaa.nws.ncep.common.dataplugin.solarimage.SolarImageRecord;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import com.raytheon.uf.common.colormap.image.ColorMapData;
import com.raytheon.uf.common.colormap.image.ColorMapData.ColorMapDataType;
import com.raytheon.uf.viz.core.exception.VizException; import com.raytheon.uf.viz.core.exception.VizException;

View file

@ -6,6 +6,8 @@ import gov.noaa.nws.ncep.viz.rsc.solarimage.util.ImageData;
import java.io.File; import java.io.File;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import com.raytheon.uf.common.colormap.image.ColorMapData;
import com.raytheon.uf.common.colormap.image.ColorMapData.ColorMapDataType;
import com.raytheon.uf.common.datastorage.DataStoreFactory; import com.raytheon.uf.common.datastorage.DataStoreFactory;
import com.raytheon.uf.common.datastorage.IDataStore; import com.raytheon.uf.common.datastorage.IDataStore;
import com.raytheon.uf.common.datastorage.records.ByteDataRecord; import com.raytheon.uf.common.datastorage.records.ByteDataRecord;

View file

@ -8,8 +8,6 @@ import gov.noaa.nws.ncep.viz.rsc.solarimage.wcs.CSConversions;
import gov.noaa.nws.ncep.viz.rsc.solarimage.wcs.WCSConverter; import gov.noaa.nws.ncep.viz.rsc.solarimage.wcs.WCSConverter;
import java.awt.geom.AffineTransform; import java.awt.geom.AffineTransform;
import java.io.File;
import java.io.FileNotFoundException;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
@ -21,13 +19,14 @@ import org.geotools.referencing.operation.transform.AffineTransform2D;
import org.opengis.referencing.operation.MathTransform; import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.NoninvertibleTransformException; import org.opengis.referencing.operation.NoninvertibleTransformException;
import org.opengis.referencing.operation.TransformException; import org.opengis.referencing.operation.TransformException;
import com.raytheon.uf.common.colormap.prefs.ColorMapParameters;
import com.raytheon.uf.common.geospatial.ReferencedCoordinate; import com.raytheon.uf.common.geospatial.ReferencedCoordinate;
import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority; import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.viz.core.IGraphicsTarget; import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.PixelCoverage; import com.raytheon.uf.viz.core.PixelCoverage;
import com.raytheon.uf.viz.core.drawables.ColorMapParameters;
import com.raytheon.uf.viz.core.drawables.IColormappedImage; import com.raytheon.uf.viz.core.drawables.IColormappedImage;
import com.raytheon.uf.viz.core.drawables.IImage; import com.raytheon.uf.viz.core.drawables.IImage;
import com.raytheon.uf.viz.core.drawables.IRenderable; import com.raytheon.uf.viz.core.drawables.IRenderable;
@ -65,15 +64,15 @@ public class SolarImageDisplay implements IRenderable {
private boolean isInterpolated = true; private boolean isInterpolated = true;
private SolarImageRecord record; private final SolarImageRecord record;
private SolarImageDataCallback dataCallback; private SolarImageDataCallback dataCallback;
private ColorMapParameters colorMapParameters; private final ColorMapParameters colorMapParameters;
private GeneralGridGeometry gridGeom; private final GeneralGridGeometry gridGeom;
private boolean logConvert; private final boolean logConvert;
private WCSConverter transform; private WCSConverter transform;
@ -83,11 +82,11 @@ public class SolarImageDisplay implements IRenderable {
private MathTransform pixelToWorld; private MathTransform pixelToWorld;
private HeaderData headerData; private final HeaderData headerData;
private Header header; private final Header header;
private int nx; private final int nx;
private int ny; private final int ny;
private double scale; private double scale;
private AffineTransform at; private AffineTransform at;

View file

@ -16,6 +16,8 @@ import org.opengis.referencing.operation.TransformException;
import com.raytheon.uf.common.colormap.ColorMap; import com.raytheon.uf.common.colormap.ColorMap;
import com.raytheon.uf.common.colormap.IColorMap; import com.raytheon.uf.common.colormap.IColorMap;
import com.raytheon.uf.common.colormap.prefs.ColorMapParameters;
import com.raytheon.uf.common.colormap.prefs.DataMappingPreferences;
import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.geospatial.ReferencedCoordinate; import com.raytheon.uf.common.geospatial.ReferencedCoordinate;
import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.IUFStatusHandler;
@ -25,18 +27,15 @@ import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.IDisplayPaneContainer; import com.raytheon.uf.viz.core.IDisplayPaneContainer;
import com.raytheon.uf.viz.core.IGraphicsTarget; import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.drawables.ColorMapLoader; import com.raytheon.uf.viz.core.drawables.ColorMapLoader;
import com.raytheon.uf.viz.core.drawables.ColorMapParameters;
import com.raytheon.uf.viz.core.drawables.PaintProperties; import com.raytheon.uf.viz.core.drawables.PaintProperties;
import com.raytheon.uf.viz.core.exception.VizException; import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.AbstractVizResource; import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
import com.raytheon.uf.viz.core.rsc.IInputHandler; import com.raytheon.uf.viz.core.rsc.IInputHandler;
import com.raytheon.uf.viz.core.rsc.IInputHandler.InputPriority;
import com.raytheon.uf.viz.core.rsc.IResourceDataChanged; import com.raytheon.uf.viz.core.rsc.IResourceDataChanged;
import com.raytheon.uf.viz.core.rsc.LoadProperties; import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.IInputHandler.InputPriority;
import com.raytheon.uf.viz.core.rsc.capabilities.Capabilities;
import com.raytheon.uf.viz.core.rsc.capabilities.ColorMapCapability; import com.raytheon.uf.viz.core.rsc.capabilities.ColorMapCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.ImagingCapability; import com.raytheon.uf.viz.core.rsc.capabilities.ImagingCapability;
import com.raytheon.uf.viz.core.style.DataMappingPreferences;
import com.raytheon.uf.viz.core.style.LabelingPreferences; import com.raytheon.uf.viz.core.style.LabelingPreferences;
import com.raytheon.uf.viz.core.style.MatchCriteria; import com.raytheon.uf.viz.core.style.MatchCriteria;
import com.raytheon.uf.viz.core.style.StyleManager; import com.raytheon.uf.viz.core.style.StyleManager;
@ -78,7 +77,7 @@ public class SolarImageResource extends
private DataTime displayedDateTime; private DataTime displayedDateTime;
private HashMap<DataTime, SolarImageDisplay> imageDisplayMap; private final HashMap<DataTime, SolarImageDisplay> imageDisplayMap;
private boolean log10scale = false; private boolean log10scale = false;
@ -86,9 +85,9 @@ public class SolarImageResource extends
//sampling //sampling
boolean sampling = false; boolean sampling = false;
private Sampling samplingRsc; private final Sampling samplingRsc;
private IInputHandler inputAdapter = getSolarImageInputHandler(); private final IInputHandler inputAdapter = getSolarImageInputHandler();
protected ReferencedCoordinate sampleCoord; protected ReferencedCoordinate sampleCoord;