(200);
+ for (Station station : disclosed) {
+ if ((station.plotImage == null)
+ && stationMap.containsKey(station.info[0].stationId)) {
+ toQueue.add(station.info);
+ }
+ }
+ if (toQueue.size() > 0) {
+ GetDataTask task = new GetDataTask(toQueue, Params.PLOT_ONLY);
+ generator.enqueueDataRetrieval(task);
+ }
+ } else {
+ issueRefresh();
+ }
+
+ }
+
+ @Override
+ public void messageGenerated(PlotInfo[] key, String message) {
+ // Key will be the same PlotInfo[] provided to the generator(which will
+ // be all the PlotInfo[] from a single station) and message will be the
+ // sample text.
+ DataTime normTime = getNormalizedTime(key[0].dataTime);
+ FrameInformation frameInfo = this.frameMap.get(normTime);
+ if (frameInfo != null) {
+ Station s = frameInfo.stationMap.get(key[0].stationId);
+ if (s != null) {
+ s.rawMessage = message;
+ issueRefresh();
+ }
+ }
+ }
+
}
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java
deleted file mode 100644
index 6aa51f3e8a..0000000000
--- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java
+++ /dev/null
@@ -1,786 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- *
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- *
- * Contractor Name: Raytheon Company
- * Contractor Address: 6825 Pine Street, Suite 340
- * Mail Stop B8
- * Omaha, NE 68106
- * 402.291.0100
- *
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-
-package com.raytheon.viz.pointdata.rsc;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.commons.lang.Validate;
-import org.eclipse.swt.graphics.RGB;
-import org.opengis.coverage.grid.GridEnvelope;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
-import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
-import com.raytheon.uf.common.geospatial.ReferencedCoordinate;
-import com.raytheon.uf.common.status.IUFStatusHandler;
-import com.raytheon.uf.common.status.UFStatus;
-import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.common.time.BinOffset;
-import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.common.time.TimeRange;
-import com.raytheon.uf.viz.core.IGraphicsTarget;
-import com.raytheon.uf.viz.core.PixelExtent;
-import com.raytheon.uf.viz.core.drawables.IImage;
-import com.raytheon.uf.viz.core.drawables.PaintProperties;
-import com.raytheon.uf.viz.core.drawables.ext.ISingleColorImageExtension.ISingleColorImage;
-import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.core.jobs.JobPool;
-import com.raytheon.uf.viz.core.map.MapDescriptor;
-import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
-import com.raytheon.uf.viz.core.rsc.IResourceDataChanged;
-import com.raytheon.uf.viz.core.rsc.LoadProperties;
-import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
-import com.raytheon.uf.viz.core.rsc.capabilities.DensityCapability;
-import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
-import com.raytheon.uf.viz.core.rsc.capabilities.OutlineCapability;
-import com.raytheon.viz.pointdata.IPlotModelGeneratorCaller;
-import com.raytheon.viz.pointdata.PlotAlertParser;
-import com.raytheon.viz.pointdata.PlotInfo;
-import com.raytheon.viz.pointdata.drawables.IPointImageExtension;
-import com.raytheon.viz.pointdata.drawables.IPointImageExtension.PointImage;
-import com.raytheon.viz.pointdata.rsc.progdisc.AbstractProgDisclosure;
-import com.raytheon.viz.pointdata.rsc.progdisc.AbstractProgDisclosure.IProgDiscListener;
-import com.raytheon.viz.pointdata.rsc.progdisc.DynamicProgDisclosure;
-import com.raytheon.viz.pointdata.rsc.progdisc.SpiProgDisclosure;
-import com.raytheon.viz.pointdata.thread.GetDataTask;
-import com.raytheon.viz.pointdata.thread.GetDataTask.Params;
-import com.raytheon.viz.pointdata.thread.PlotThreadOverseer;
-import com.raytheon.viz.pointdata.units.PlotUnits;
-import com.vividsolutions.jts.geom.Coordinate;
-
-/**
- * Provides a resource that will display plot data for a given reference time.
- *
- *
- *
- * SOFTWARE HISTORY
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Nov 20, 2006 brockwoo Initial creation.
- * Feb 17, 2009 njensen Refactored to new rsc architecture.
- * Mar 17, 2009 2105 jsanchez Plot goessounding/poessounding
- * availability.
- * Mar 30, 2009 2169 jsanchez Updated initNewFrame.
- * Apr 09, 2009 952 jsanchez Plot acars.
- * Apr 13, 2009 2251 jsanchez Plot profilers.
- * Apr 21, 2009 chammack Refactor to common pointData model
- * Feb 01, 2013 1567 njensen Refactor handling of updates
- * May 14, 2013 1869 bsteffen Get plots working without dataURI
- * May 23, 2013 14996 snaples Updated processUpdatedPlot to handle AWOS
- * stations updates properly
- * Jun 06, 2013 2072 bsteffen Fix concurrency problems when init is
- * called before time matching is done.
- * Jun 25, 2013 1869 bsteffen Fix plot sampling.
- * Sep 04, 2013 16519 kshresth Fix Metar Display Problem
- * Dec 02, 2013 2473 njensen Prog Disclose paint frames at high priority
- * Mar 21, 2014 2868 njensen Use PlotThreadOverseer for increased efficiency
- *
- *
- *
- * @author brockwoo
- * @version 1.0
- */
-public class PlotResource2 extends
- AbstractVizResource implements
- IResourceDataChanged, IPlotModelGeneratorCaller, IProgDiscListener {
- private static final transient IUFStatusHandler statusHandler = UFStatus
- .getHandler(PlotResource2.class);
-
- private static final double MAX_SAMPLE_DISANCE = 2;
-
- public static final String NO_DATA = "NO DATA";
-
- private AbstractProgDisclosure progressiveDisclosure;
-
- private PlotThreadOverseer generator;
-
- private double plotWidth;
-
- private final Map frameMap;
-
- private DataTime displayedTime;
-
- private RGB imageColor = null;
-
- private JobPool frameRetrievalPool = new JobPool("Retrieving plot frame",
- 8, true);
-
- private class FrameRetriever implements Runnable {
-
- private DataTime dataTime;
-
- @Override
- public void run() {
- try {
- initNewFrame(dataTime);
- } catch (VizException e) {
- statusHandler.handle(Priority.PROBLEM,
- "Error retrieving frame information for time: "
- + dataTime, e);
- }
- }
-
- }
-
- /**
- * A station represents all the data for a single location(station) for a
- * single frame
- *
- */
- public static class Station {
- /*
- * Contains all PlotInfo objects for the same stationId with the same
- * normalized time(real time will be different)
- */
- public PlotInfo[] info;
-
- /*
- * The image to display for this plot
- */
- public PointImage plotImage;
-
- /*
- * Sampling text for this plot
- */
- public String rawMessage;
-
- /*
- * Information used be the progressive disclosure algorithm
- */
- public Object progDiscInfo;
-
- /*
- * Location of the plot in descriptor grid space.
- */
- public Coordinate pixelLocation;
-
- }
-
- public class FrameInformation {
- Map stationMap = new ConcurrentHashMap();
-
- List lastComputed = Collections.emptyList();
- }
-
- /**
- * Create a surface plot resource.
- *
- * @param target
- * The graphic target to draw to
- * @param refTime
- * The reference time to request data against
- * @throws VizException
- */
- public PlotResource2(PlotResourceData data, LoadProperties props) {
- super(data, props);
- if (data.getAlertParser() == null) {
- data.setAlertParser(new PlotAlertParser());
- }
- this.dataTimes = new ArrayList();
- this.frameMap = new ConcurrentHashMap();
- data.addChangeListener(this);
- }
-
- @Override
- public String getName() {
- return this.resourceData.getPlotSource();
- }
-
- @Override
- protected void paintInternal(IGraphicsTarget aTarget,
- PaintProperties paintProps) throws VizException {
- DataTime curTime = paintProps.getDataTime();
- if (curTime == null) {
- return;
- }
-
- FrameInformation curFrame = frameMap.get(curTime);
- if (curFrame == null) {
- curFrame = startFrameInit(curTime);
- }
-
- if (progressiveDisclosure.updateProperties(paintProps)
- || !curTime.equals(displayedTime)) {
- displayedTime = paintProps.getDataTime();
- progressiveDisclosure.update(curFrame.stationMap.values(),
- displayedTime, true);
- resourceData.getPlotInfoRetriever().updateActiveFrame(
- paintProps.getDataTime(),
- descriptor.pixelToWorld(paintProps.getView().getExtent(),
- descriptor.getCRS()), descriptor.getCRS());
- }
-
- if (!progressiveDisclosure.isDone() || !generator.isDone()
- || frameRetrievalPool.isActive()) {
- issueRefresh();
- }
-
- List stationList = curFrame.lastComputed;
-
- if (stationList.isEmpty()) {
- return;
- }
-
- List images = new ArrayList(stationList.size());
- for (Station station : stationList) {
- if (station.plotImage == null) {
- continue;
- }
- // set image color so shader can draw in appropriate color
- ((ISingleColorImage) station.plotImage.getImage())
- .setColor(imageColor);
- images.add(station.plotImage);
- }
-
- aTarget.getExtension(IPointImageExtension.class).drawPointImages(
- paintProps, images);
- }
-
- @Override
- protected void initInternal(IGraphicsTarget aTarget) throws VizException {
- Map request = resourceData.getMetadataMap();
- RequestConstraint plugin = request.get("pluginName");
- PlotUnits.register();
- generator = new PlotThreadOverseer(aTarget, descriptor,
- this.resourceData.getPlotModelFile(),
- this.resourceData.getLevelKey(), plugin.getConstraintValue(),
- this.resourceData.getMetadataMap(), this);
- this.generator.setPlotModelColor(getCapability(
- ColorableCapability.class).getColor());
- this.imageColor = getCapability(ColorableCapability.class).getColor();
- this.generator.setPlotModelLineStyle(getCapability(
- OutlineCapability.class).getLineStyle());
- this.generator.setPlotModelLineWidth(getCapability(
- OutlineCapability.class).getOutlineWidth());
- this.generator.setPlotMissingData(resourceData.isPlotMissingData());
- this.generator.setLowerLimit(resourceData.getLowerLimit());
- this.generator.setUpperLimit(resourceData.getUpperLimit());
- this.plotWidth = generator.getOriginalPlotModelWidth();
- this.plotWidth *= getCapability(MagnificationCapability.class)
- .getMagnification();
- generator.setPlotModelSize(Math.round(plotWidth));
-
- // TODO this should be in a factory or something
- if (resourceData.getSpiFile() != null) {
- progressiveDisclosure = new SpiProgDisclosure(this, descriptor,
- resourceData.getSpiFile());
- } else {
- progressiveDisclosure = new DynamicProgDisclosure(this, descriptor);
- }
- progressiveDisclosure.setMagnification(this.getCapability(
- MagnificationCapability.class).getMagnification());
- progressiveDisclosure.setDensity(this.getCapability(
- DensityCapability.class).getDensity());
- progressiveDisclosure.setPixelSizeHint(resourceData.getPixelSizeHint());
- progressiveDisclosure.setPlotWidth(plotWidth);
-
- DataTime[] dts = this.descriptor.getFramesInfo().getTimeMap().get(this);
- // if this is null then the time matcher has not yet had time to time
- // match this, in which case frames will have to load when they are
- // first painted.
- if (dts != null) {
- // init backwards
- for (int i = dts.length - 1; i > -1; i--) {
- DataTime time = dts[i];
- if (time != null) {
- FrameInformation curFrame = frameMap.get(time);
- if (curFrame == null) {
- curFrame = startFrameInit(time);
- }
- }
- }
- }
- }
-
- private synchronized FrameInformation startFrameInit(DataTime time) {
- FrameInformation frame = new FrameInformation();
- dataTimes.add(time);
- frameMap.put(time, frame);
- FrameRetriever retriever = new FrameRetriever();
- retriever.dataTime = time;
- frameRetrievalPool.schedule(retriever);
- return frame;
- }
-
- /**
- * Checks the plots to ensure they are displayable, ie a frame exists that
- * matches their time and they are within the descriptor's world extent. If
- * so, schedules them for disclosure. Also checks if a plot already exists
- * and this is an update, and if so, updates the plot.
- *
- * @param stationsToParse
- * stations to potentially process and display
- * @throws VizException
- */
- protected void updateRecords(PlotInfo[] stationsToParse)
- throws VizException {
- Validate.notNull(stationsToParse);
- Map> plots = new HashMap>();
- // Sort plots into normalized datatimes that should match frames
- for (PlotInfo info : stationsToParse) {
- DataTime normTime = getNormalizedTime(info.dataTime);
- if (frameMap.containsKey(normTime)) {
- List list = plots.get(normTime);
- if (list == null) {
- list = new ArrayList();
- plots.put(normTime, list);
- }
- list.add(info);
-
- }
- }
-
- GridEnvelope range = descriptor.getGridGeometry().getGridRange();
- PixelExtent worldExtent = new PixelExtent(range.getLow(0),
- range.getHigh(0), range.getLow(1), range.getHigh(1));
-
- for (Entry> entry : plots.entrySet()) {
- DataTime time = entry.getKey();
- List info = entry.getValue();
- FrameInformation frameInfo = frameMap.get(time);
-
- // Sort this data in "backwards" so that the most recent observation
- // for a particular station display correctly
- if (info.size() > 1) {
- Collections.sort(info, new Comparator() {
-
- @Override
- public int compare(PlotInfo o1, PlotInfo o2) {
- return o2.dataTime.compareTo(o1.dataTime);
- }
- });
- }
-
- if (frameInfo != null) {
- Map stationMap = frameInfo.stationMap;
- for (PlotInfo plot : info) {
- if (plot.stationId == null) {
- plot.stationId = plot.latitude + "#" + plot.longitude;
- }
- synchronized (stationMap) {
- if (stationMap.containsKey(plot.stationId)) {
- processUpdatedPlot(stationMap.get(plot.stationId),
- plot);
- } else {
- double[] thisLocationPixel = descriptor
- .worldToPixel(new double[] {
- plot.longitude, plot.latitude });
- if ((thisLocationPixel != null)
- && worldExtent.contains(
- thisLocationPixel[0],
- thisLocationPixel[1])) {
- Station station = new Station();
- station.info = new PlotInfo[] { plot };
- station.pixelLocation = new Coordinate(
- thisLocationPixel[0],
- thisLocationPixel[1]);
- stationMap.put(plot.stationId, station);
- }
- }
- }
- }
-
- progressiveDisclosure.update(stationMap.values(), time);
- }
- }
- issueRefresh();
- }
-
- /**
- * Updates an existing station with a new plot.
- *
- * @param existingStation
- * the existing station
- * @param plot
- * the newly received plot
- */
- protected void processUpdatedPlot(Station existingStation, PlotInfo plot) {
- if (existingStation.plotImage != null) {
- existingStation.plotImage.getImage().dispose();
- existingStation.plotImage = null;
- // DR14966
- existingStation.rawMessage = null;
- PlotInfo[] samplePlot = new PlotInfo[1];
- samplePlot[0] = new PlotInfo();
- samplePlot[0] = plot;
- List list = new ArrayList();
- list.add(samplePlot);
- Params params = Params.PLOT_AND_SAMPLE;
- GetDataTask task = new GetDataTask(list, params);
- generator.enqueueDataRetrieval(task);
- // End DR14996
- }
- boolean dup = false;
- for (PlotInfo element : existingStation.info) {
- String curUri = element.dataURI;
- String newUri = plot.dataURI;
- if ((curUri == null) || curUri.equals(newUri)) {
- dup = true;
- break;
- }
- }
- if (!dup) {
- // Added for DR14996
- existingStation.info = Arrays.copyOf(existingStation.info, 1);
- existingStation.info[0] = plot;
- Arrays.sort(existingStation.info, new Comparator() {
- @Override
- public int compare(PlotInfo o1, PlotInfo o2) {
- return o1.dataTime.compareTo(o2.dataTime);
- }
- });
- }
- }
-
- private DataTime getNormalizedTime(DataTime time) {
- if (this.resourceData.getBinOffset() != null) {
- return this.resourceData.getBinOffset().getNormalizedTime(time);
- } else {
- return time;
- }
- }
-
- @Override
- protected void disposeInternal() {
- resourceData.getPlotInfoRetriever().cancel();
- progressiveDisclosure.shutdown();
- if (generator != null) {
- generator.shutdown();
- }
- clearImages();
- }
-
- private void initNewFrame(DataTime thisFrameTime) throws VizException {
- RequestConstraint time = new RequestConstraint();
-
- BinOffset tmpBinOffset = this.resourceData.getBinOffset();
- if (tmpBinOffset == null) {
- // do not set the bin offset in the resource data, it is probably
- // null for a reason. non-null binOffset can cause problems with
- // time matching for some products.
- tmpBinOffset = new BinOffset();
- }
- TimeRange tr = null;
-
- if (this.resourceData.isTopOfTheHour()) {
- long offset = tmpBinOffset.getNegOffset() * 1000l;
- long frameInMillis = thisFrameTime.getValidTime().getTimeInMillis();
- tr = new TimeRange(frameInMillis - offset, frameInMillis);
- } else if (this.resourceData.getDefaultPeriod() != null) {
- tr = this.resourceData.getDefaultPeriod().getTimeRange(
- thisFrameTime);
- } else {
- tr = tmpBinOffset.getTimeRange(thisFrameTime);
- }
- if (tr.getDuration() > 0) {
- // handle binning
- DataTime start = new DataTime(tr.getStart());
- DataTime end = new DataTime(tr.getEnd());
- String[] constraintList = { start.toString(), end.toString() };
- time.setBetweenValueList(constraintList);
- time.setConstraintType(RequestConstraint.ConstraintType.BETWEEN);
-
- } else {
- // handle exact times
- time.setConstraintValue(thisFrameTime.toString());
- }
-
- HashMap metadataMap = new HashMap(
- resourceData.getMetadataMap());
- metadataMap.put("dataTime", time);
-
- // results will be sent to resourceChanged(DATA_UPDATE) on current
- // thread
- resourceData.getPlotInfoRetriever().getStations(this, thisFrameTime,
- metadataMap);
- }
-
- @Override
- public String inspect(ReferencedCoordinate coord) throws VizException {
- String message = NO_DATA;
- if (displayedTime != null) {
- if (!this.frameMap.containsKey(displayedTime)) {
- return message;
- }
- Map stationMap = this.frameMap.get(displayedTime).stationMap;
- Coordinate latlon = null;
- try {
- latlon = coord.asLatLon();
- } catch (Exception e) {
- statusHandler.handle(Priority.PROBLEM,
- "Error transforming coordinate", e);
- }
-
- double[] ml = { latlon.x, latlon.y };
- double[] pml = descriptor.worldToPixel(ml);
- Coordinate mouseLocation = new Coordinate(pml[0], pml[1]);
- double screenToWorldRatio = progressiveDisclosure
- .getScreenToWorldRatio();
- List availableStations = new ArrayList();
- for (Station station : stationMap.values()) {
- if (station != null) {
- Coordinate pixelLocation = station.pixelLocation;
- if (distanceBetween(pixelLocation, mouseLocation) <= (this
- .getResourceData().getPixelSampleDistance() / screenToWorldRatio)) {
-
- availableStations.add(station);
- }
-
- }
- }
-
- Station inspectPlot = null;
- if (availableStations.size() == 1) {
- inspectPlot = availableStations.get(0);
- } else if (availableStations.size() > 1) {
- int index = findClosestPlot(latlon, availableStations);
-
- if (index != -1) {
- inspectPlot = availableStations.get(index);
- }
- }
-
- if (inspectPlot != null) {
- message = inspectPlot.rawMessage;
- if (message == null) {
- message = "Generating...";
- List list = new ArrayList(1);
- list.add(inspectPlot.info);
- Params params = Params.PLOT_AND_SAMPLE;
- if (inspectPlot.info[0].pdv != null) {
- params = Params.SAMPLE_ONLY;
- }
- GetDataTask task = new GetDataTask(list, params);
- generator.enqueueDataRetrieval(task);
- }
- }
-
- }
- return message;
- }
-
- private double distanceBetween(Coordinate c1, Coordinate c2) {
-
- double xComponent = (c1.x - c2.x) * (c1.x - c2.x);
- double yComponent = (c1.y - c2.y) * (c1.y - c2.y);
- double rval = Math.sqrt(xComponent + yComponent);
- return rval;
- }
-
- @Override
- public void resourceChanged(ChangeType type, Object object) {
- if (type.equals(ChangeType.DATA_UPDATE)) {
- try {
- updateRecords((PlotInfo[]) object);
- } catch (VizException e) {
- statusHandler.handle(Priority.PROBLEM,
- "Error updating plot resource", e);
- }
-
- } else if (type.equals(ChangeType.CAPABILITY)) {
- if (object instanceof ColorableCapability) {
- if (generator != null) {
- generator.setPlotModelColor(((ColorableCapability) object)
- .getColor());
- this.imageColor = ((ColorableCapability) object).getColor();
- }
- } else if (object instanceof DensityCapability) {
- if (progressiveDisclosure != null) {
- progressiveDisclosure.setDensity(getCapability(
- DensityCapability.class).getDensity());
- issueRefresh();
- }
- } else if (object instanceof MagnificationCapability) {
- if (generator != null) {
- this.plotWidth = generator.getOriginalPlotModelWidth();
- this.plotWidth *= getCapability(
- MagnificationCapability.class).getMagnification();
- generator.setPlotModelSize(Math.round(plotWidth));
-
- }
- if (progressiveDisclosure != null) {
- progressiveDisclosure.setMagnification(getCapability(
- MagnificationCapability.class).getMagnification());
- progressiveDisclosure.setPlotWidth(plotWidth);
- }
- clearImages();
- } else if (object instanceof OutlineCapability) {
- if (generator != null) {
- OutlineCapability cap = (OutlineCapability) object;
- generator.setPlotModelLineStyle(cap.getLineStyle());
- generator.setPlotModelLineWidth(cap.getOutlineWidth());
- clearImages();
- }
- }
- }
- issueRefresh();
- }
-
- /**
- * Returns the index of the closest available plot in the same area as the
- * sampling position.
- *
- * @param latlon
- * The coordinate of the sampling position.
- * @param availableStations
- * List of available plots in the same area as latlon.
- * @return The index of the plot closest to latlon.
- */
- private int findClosestPlot(Coordinate latlon,
- List availableStations) {
- double x1 = latlon.x;
- double y1 = latlon.y;
- double minDistance = MAX_SAMPLE_DISANCE;
- int minIndex = -1;
-
- for (int i = 0; i < availableStations.size(); i++) {
- PlotInfo info = availableStations.get(i).info[0];
- double x2 = info.longitude;
- double y2 = info.latitude;
- double d = Math.sqrt(Math.pow(x2 - x1, 2) + Math.pow(y2 - y1, 2));
-
- if (d < minDistance) {
- minDistance = d;
- minIndex = i;
- }
- }
-
- return minIndex;
- }
-
- @Override
- public void clearImages() {
- for (Entry entry : this.frameMap.entrySet()) {
- FrameInformation frameInfo = entry.getValue();
- for (Station station : frameInfo.stationMap.values()) {
- if (station.plotImage != null) {
- station.plotImage.getImage().dispose();
- station.plotImage = null;
-
- if (station.info != null) {
- for (PlotInfo info : station.info) {
- info.plotQueued = false;
- }
- }
- }
- }
- }
- issueRefresh();
- }
-
- @Override
- public void modelGenerated(PlotInfo[] key, IImage image) {
- DataTime normTime = getNormalizedTime(key[0].dataTime);
- FrameInformation frameInfo = this.frameMap.get(normTime);
- if (frameInfo != null) {
- Station s = frameInfo.stationMap.get(key[0].stationId);
- if (s != null) {
- if (image != null) {
- ISingleColorImage si = (ISingleColorImage) image;
- s.plotImage = new PointImage(si, s.pixelLocation);
- s.plotImage.setSiteId(s.info[0].stationId);
- si.setColor(imageColor);
- } else {
- frameInfo.stationMap.remove(key[0].stationId);
- progressiveDisclosure.update(frameInfo.stationMap.values(),
- normTime);
- }
- issueRefresh();
- } else if (image != null) {
- image.dispose();
- }
- } else if (image != null) {
- image.dispose();
- }
- }
-
- @Override
- public void remove(DataTime dataTime) {
- super.remove(dataTime);
- FrameInformation frameInfo = this.frameMap.remove(dataTime);
- if (frameInfo != null) {
- for (Station s : frameInfo.stationMap.values()) {
- if ((s != null) && (s.plotImage != null)) {
- s.plotImage.getImage().dispose();
- s.plotImage = null;
- }
- }
- frameInfo.stationMap.clear();
- }
- }
-
- @Override
- public void project(CoordinateReferenceSystem crs) throws VizException {
- clearImages();
- frameRetrievalPool.cancel();
- frameRetrievalPool = new JobPool("Retrieving plot frame", 8, true);
- frameMap.clear();
- }
-
- @Override
- public synchronized void disclosureComplete(DataTime time,
- List disclosed) {
- FrameInformation frame = frameMap.get(time);
- if (frame != null) {
- frame.lastComputed = disclosed;
- issueRefresh();
- Map stationMap = frame.stationMap;
- List toQueue = new ArrayList(200);
- for (Station station : disclosed) {
- if ((station.plotImage == null)
- && stationMap.containsKey(station.info[0].stationId)) {
- toQueue.add(station.info);
- }
- }
- if (toQueue.size() > 0) {
- GetDataTask task = new GetDataTask(toQueue, Params.PLOT_ONLY);
- generator.enqueueDataRetrieval(task);
- }
- } else {
- issueRefresh();
- }
-
- }
-
- @Override
- public void messageGenerated(PlotInfo[] key, String message) {
- // Key will be the same PlotInfo[] provided to the generator(which will
- // be all the PlotInfo[] from a single station) and message will be the
- // sample text.
- DataTime normTime = getNormalizedTime(key[0].dataTime);
- FrameInformation frameInfo = this.frameMap.get(normTime);
- if (frameInfo != null) {
- Station s = frameInfo.stationMap.get(key[0].stationId);
- if (s != null) {
- s.rawMessage = message;
- issueRefresh();
- }
- }
- }
-
-}
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResourceData.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResourceData.java
index 2d6c350337..a786d70524 100644
--- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResourceData.java
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResourceData.java
@@ -59,7 +59,7 @@ import com.raytheon.viz.pointdata.rsc.retrieve.PointDataPlotInfoRetriever;
* Aug 09, 2013 2033 mschenke Switched File.separator to
* IPathManager.SEPARATOR
* Sep 05, 2013 2316 bsteffen Unify pirep and ncpirep.
- *
+ * Jun 06, 2014 2061 bsteffen Remove old PlotResource
*
*
*
@@ -74,13 +74,6 @@ public class PlotResourceData extends AbstractRequestableResourceData {
public static class PluginPlotProperties {
- /**
- * Plugins that use the point data api will be instantiated using
- * PlotResource2, otherwise PlotResource will be used which requires
- * that the PDO of the plugin implement IDecoderGettable
- */
- public final boolean usesPointDataApi;
-
/**
* When this is true all plots will be correlated based on the
* stationId, otherwise each dataURI is mapped to a specific set of
@@ -88,19 +81,16 @@ public class PlotResourceData extends AbstractRequestableResourceData {
*/
public final boolean hasDistinctStationId;
- public PluginPlotProperties(boolean usesPointDataApi,
- boolean hasDistinctStationId) {
- this.usesPointDataApi = usesPointDataApi;
+ public PluginPlotProperties(boolean hasDistinctStationId) {
this.hasDistinctStationId = hasDistinctStationId;
}
/**
- * This is the goal for all plugins, they should use the new api and
- * they should have distinct stationIds.
+ * This is the goal for all plugins, they should have distinct
+ * stationIds.
*/
public PluginPlotProperties() {
- this.usesPointDataApi = true;
- this.hasDistinctStationId = true;
+ this(true);
}
}
@@ -147,24 +137,20 @@ public class PlotResourceData extends AbstractRequestableResourceData {
private static final Map pluginProps = new HashMap();
static {
- /*
- * These use the original PlotResource, whoever can convert these gets
- * to delete thousands of lines of code, it will be amazing.
- */
- pluginProps.put("acars", new PluginPlotProperties(false, false));
-
/*
* These have a dependency on dataURI because they don't set stationId,
* In the future if stationId can be set to anything that is even a
* little unique we can get rid of this
*/
- pluginProps.put("bufrquikscat", new PluginPlotProperties(true, false));
- pluginProps.put("radar", new PluginPlotProperties(true, false));
- pluginProps.put("lsr", new PluginPlotProperties(true, false));
- pluginProps.put("tcg", new PluginPlotProperties(true, false));
- pluginProps.put("svrwx", new PluginPlotProperties(true, false));
- pluginProps.put("ldadhydro", new PluginPlotProperties(true, false));
- pluginProps.put("textPoints", new PluginPlotProperties(true, false));
+ pluginProps.put("bufrquikscat", new PluginPlotProperties(false));
+ pluginProps.put("radar", new PluginPlotProperties(false));
+ pluginProps.put("lsr", new PluginPlotProperties(false));
+ pluginProps.put("tcg", new PluginPlotProperties(false));
+ pluginProps.put("svrwx", new PluginPlotProperties(false));
+ pluginProps.put("ldadhydro", new PluginPlotProperties(false));
+ pluginProps.put("textPoints", new PluginPlotProperties(false));
+ pluginProps.put("acars", new PluginPlotProperties(false));
+
/*
* The good ones, these don't even need to be here because this is the
* default behavior, but for now they are included so we have a
@@ -215,11 +201,6 @@ public class PlotResourceData extends AbstractRequestableResourceData {
@Override
protected AbstractVizResource constructResource(
LoadProperties loadProperties, PluginDataObject[] objects) {
-
- if (getPluginProperties().usesPointDataApi) {
- return new PlotResource2(this, loadProperties);
- }
-
return new PlotResource(this, loadProperties);
}
@@ -384,7 +365,6 @@ public class PlotResourceData extends AbstractRequestableResourceData {
@Override
public boolean equals(Object obj) {
- // TODO Auto-generated method stub
if (!super.equals(obj)) {
return false;
}
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/progdisc/AbstractProgDisclosure.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/progdisc/AbstractProgDisclosure.java
index 977964aeb1..6d648e36dc 100644
--- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/progdisc/AbstractProgDisclosure.java
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/progdisc/AbstractProgDisclosure.java
@@ -16,7 +16,7 @@ import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.IExtent;
import com.raytheon.uf.viz.core.drawables.PaintProperties;
import com.raytheon.uf.viz.core.map.IMapDescriptor;
-import com.raytheon.viz.pointdata.rsc.PlotResource2.Station;
+import com.raytheon.viz.pointdata.rsc.PlotResource.Station;
/**
*
@@ -26,11 +26,12 @@ import com.raytheon.viz.pointdata.rsc.PlotResource2.Station;
*
* SOFTWARE HISTORY
*
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Jan 12, 2011 bsteffen Initial creation
- * Jul 01, 2011 njensen Added queuing
- * Dec 02, 2013 2573 njensen Smarter queuing
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Jan 12, 2011 bsteffen Initial creation
+ * Jul 01, 2011 njensen Added queuing
+ * Dec 02, 2013 2573 njensen Smarter queuing
+ * Jun 06, 2014 2061 bsteffen Remove old PlotResource
*
*
*
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/progdisc/DynamicProgDisclosure.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/progdisc/DynamicProgDisclosure.java
index 7008071ba1..109d32263e 100644
--- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/progdisc/DynamicProgDisclosure.java
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/progdisc/DynamicProgDisclosure.java
@@ -9,20 +9,23 @@ import org.opengis.referencing.operation.MathTransform;
import com.raytheon.uf.common.geospatial.MapUtil;
import com.raytheon.uf.viz.core.drawables.IDescriptor;
import com.raytheon.uf.viz.core.map.IMapDescriptor;
-import com.raytheon.viz.pointdata.rsc.PlotResource2.Station;
+import com.raytheon.viz.pointdata.rsc.PlotResource.Station;
import com.vividsolutions.jts.geom.Coordinate;
/**
*
- * TODO Add Description
+ * Progressive disclosure for plots with no predetermined ordering. Points to
+ * disclose are chosen arbitrarily.
*
*
*
* SOFTWARE HISTORY
*
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Jan 12, 2011 bsteffen Initial creation
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Jan 12, 2011 bsteffen Initial creation
+ * Jun 06, 2014 2061 bsteffen Remove old PlotResource
+ *
*
*
*
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/progdisc/SpiProgDisclosure.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/progdisc/SpiProgDisclosure.java
index e54ecace13..8eae8d95c6 100644
--- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/progdisc/SpiProgDisclosure.java
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/progdisc/SpiProgDisclosure.java
@@ -8,20 +8,22 @@ import com.raytheon.uf.viz.core.drawables.IDescriptor;
import com.raytheon.uf.viz.core.map.IMapDescriptor;
import com.raytheon.viz.pointdata.StaticPlotInfoPV;
import com.raytheon.viz.pointdata.StaticPlotInfoPV.SPIEntry;
-import com.raytheon.viz.pointdata.rsc.PlotResource2.Station;
+import com.raytheon.viz.pointdata.rsc.PlotResource.Station;
import com.vividsolutions.jts.geom.Coordinate;
/**
*
- * TODO Add Description
+ * Progressive disclosure algorithm that uses information form an spi file to
+ * determine which stations to display.
*
*
*
* SOFTWARE HISTORY
*
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Jan 12, 2011 bsteffen Initial creation
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Jan 12, 2011 bsteffen Initial creation
+ * Jun 06, 2014 2061 bsteffen Remove old PlotResource
*
*
*
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/retrieve/AbstractPlotInfoRetriever.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/retrieve/AbstractPlotInfoRetriever.java
index 344da42c1a..33ffe05a55 100644
--- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/retrieve/AbstractPlotInfoRetriever.java
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/retrieve/AbstractPlotInfoRetriever.java
@@ -28,12 +28,12 @@ import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.IResourceDataChanged;
import com.raytheon.viz.pointdata.PlotInfo;
-import com.raytheon.viz.pointdata.rsc.PlotResource2;
+import com.raytheon.viz.pointdata.rsc.PlotResource;
import com.vividsolutions.jts.geom.Envelope;
/**
* Base class for all objects which can retrieve {@link PlotInfo} objects for
- * use in {@link PlotResource2}. For most applications the
+ * use in {@link PlotResource}. For most applications the
* {@link PointDataPlotInfoRetriever} should be used however other instances can
* provide more advanced features such as incremental loading or retrieving
* additional data.
@@ -45,6 +45,7 @@ import com.vividsolutions.jts.geom.Envelope;
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Oct 23, 2013 2491 bsteffen Remove ISerializableObject
+ * Jun 06, 2014 2061 bsteffen Remove old PlotResource
*
*
*
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/thread/PlotModelDataRequestJob.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/thread/PlotModelDataRequestJob.java
index f39c659f8f..de15382068 100644
--- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/thread/PlotModelDataRequestJob.java
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/thread/PlotModelDataRequestJob.java
@@ -28,9 +28,9 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint.ConstraintType;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.pointdata.PointDataContainer;
import com.raytheon.uf.common.pointdata.PointDataView;
import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -40,7 +40,7 @@ import com.raytheon.uf.viz.datacube.DataCubeContainer;
import com.raytheon.viz.pointdata.IPlotModelGeneratorCaller;
import com.raytheon.viz.pointdata.PlotData;
import com.raytheon.viz.pointdata.PlotInfo;
-import com.raytheon.viz.pointdata.PlotModelFactory2.PlotModelElement;
+import com.raytheon.viz.pointdata.PlotModelFactory.PlotModelElement;
import com.raytheon.viz.pointdata.PointDataRequest;
import com.raytheon.viz.pointdata.rsc.PlotResourceData;
@@ -52,11 +52,12 @@ import com.raytheon.viz.pointdata.rsc.PlotResourceData;
*
* SOFTWARE HISTORY
*
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Apr 22, 2011 njensen Initial creation
- * May 14, 2013 1869 bsteffen Get plots working without dataURI
- * Mar 21, 2014 2868 njensen Major refactor
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Apr 22, 2011 njensen Initial creation
+ * May 14, 2013 1869 bsteffen Get plots working without dataURI
+ * Mar 21, 2014 2868 njensen Major refactor
+ * Jun 06, 2014 2061 bsteffen Remove old PlotResource
*
*
*
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/thread/PlotModelGeneratorJob.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/thread/PlotModelGeneratorJob.java
index 9b313817ee..585248a196 100644
--- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/thread/PlotModelGeneratorJob.java
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/thread/PlotModelGeneratorJob.java
@@ -35,7 +35,7 @@ import com.raytheon.uf.viz.core.drawables.ext.ISingleColorImageExtension;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.viz.pointdata.IPlotModelGeneratorCaller;
import com.raytheon.viz.pointdata.PlotInfo;
-import com.raytheon.viz.pointdata.PlotModelFactory2;
+import com.raytheon.viz.pointdata.PlotModelFactory;
/**
* Job that generates plot images using a PlotModelFactory2.
@@ -44,10 +44,12 @@ import com.raytheon.viz.pointdata.PlotModelFactory2;
*
* SOFTWARE HISTORY
*
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Apr 22, 2011 njensen Initial creation
- * Mar 21, 2014 2868 njensen Major refactor
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Apr 22, 2011 njensen Initial creation
+ * Mar 21, 2014 2868 njensen Major refactor
+ * Jun 06, 2014 2061 bsteffen Remove old PlotResource
+ *
*
*
*
@@ -57,7 +59,7 @@ import com.raytheon.viz.pointdata.PlotModelFactory2;
public class PlotModelGeneratorJob extends AbstractPlotCreationJob {
- private PlotModelFactory2 plotCreator;
+ private PlotModelFactory plotCreator;
private IGraphicsTarget target;
@@ -65,7 +67,7 @@ public class PlotModelGeneratorJob extends AbstractPlotCreationJob {
private Map imageCache = new LRUMap(1000);
protected PlotModelGeneratorJob(PlotThreadOverseer parent,
- IPlotModelGeneratorCaller caller, PlotModelFactory2 plotCreator,
+ IPlotModelGeneratorCaller caller, PlotModelFactory plotCreator,
IGraphicsTarget target) {
super("Creating plots", parent, caller);
this.plotCreator = plotCreator;
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/thread/PlotSampleGeneratorJob.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/thread/PlotSampleGeneratorJob.java
index f8c408f075..3d2eb5e490 100644
--- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/thread/PlotSampleGeneratorJob.java
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/thread/PlotSampleGeneratorJob.java
@@ -25,7 +25,7 @@ import org.eclipse.core.runtime.Status;
import com.raytheon.viz.pointdata.IPlotModelGeneratorCaller;
import com.raytheon.viz.pointdata.PlotInfo;
-import com.raytheon.viz.pointdata.PlotModelFactory2;
+import com.raytheon.viz.pointdata.PlotModelFactory;
/**
* Job that uses the provided plot model factory to generate a sampling message
@@ -35,11 +35,12 @@ import com.raytheon.viz.pointdata.PlotModelFactory2;
*
* SOFTWARE HISTORY
*
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Jul 13, 2011 njensen Initial creation
- * Jun 25, 2013 1869 bsteffen Fix plot sampling.
- * Mar 21, 2014 2868 njensen Major refactor
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Jul 13, 2011 njensen Initial creation
+ * Jun 25, 2013 1869 bsteffen Fix plot sampling.
+ * Mar 21, 2014 2868 njensen Major refactor
+ * Jun 06, 2014 2061 bsteffen Remove old PlotResource
*
*
*
@@ -49,10 +50,10 @@ import com.raytheon.viz.pointdata.PlotModelFactory2;
public class PlotSampleGeneratorJob extends AbstractPlotCreationJob {
- private PlotModelFactory2 plotFactory;
+ private PlotModelFactory plotFactory;
public PlotSampleGeneratorJob(PlotThreadOverseer parent,
- IPlotModelGeneratorCaller caller, PlotModelFactory2 factory) {
+ IPlotModelGeneratorCaller caller, PlotModelFactory factory) {
super("Generating samples", parent, caller);
this.plotFactory = factory;
}
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/thread/PlotThreadOverseer.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/thread/PlotThreadOverseer.java
index 7a1a9931de..159b572d11 100644
--- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/thread/PlotThreadOverseer.java
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/thread/PlotThreadOverseer.java
@@ -35,8 +35,8 @@ import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.map.MapDescriptor;
import com.raytheon.viz.pointdata.IPlotModelGeneratorCaller;
import com.raytheon.viz.pointdata.PlotInfo;
-import com.raytheon.viz.pointdata.PlotModelFactory2;
-import com.raytheon.viz.pointdata.PlotModelFactory2.PlotModelElement;
+import com.raytheon.viz.pointdata.PlotModelFactory;
+import com.raytheon.viz.pointdata.PlotModelFactory.PlotModelElement;
/**
* Oversees a variety of threads used to concurrently and quickly get plots on
@@ -50,9 +50,10 @@ import com.raytheon.viz.pointdata.PlotModelFactory2.PlotModelElement;
*
* SOFTWARE HISTORY
*
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Mar 21, 2014 2868 njensen Initial creation
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Mar 21, 2014 2868 njensen Initial creation
+ * Jun 06, 2014 2061 bsteffen Remove old PlotResource
*
*
*
@@ -78,7 +79,7 @@ public class PlotThreadOverseer {
protected List imageCreationJobList = new ArrayList(
IMAGE_THREADS);
- protected List plotCreatorList = new ArrayList(
+ protected List plotCreatorList = new ArrayList(
IMAGE_THREADS);
protected ConcurrentLinkedQueue sampleTextQueue = new ConcurrentLinkedQueue();
@@ -113,7 +114,7 @@ public class PlotThreadOverseer {
List plotFields = null;
List sampleFields = null;
for (int i = 0; i < IMAGE_THREADS; i++) {
- PlotModelFactory2 plotModelFactory = new PlotModelFactory2(
+ PlotModelFactory plotModelFactory = new PlotModelFactory(
mapDescriptor, plotModelFile);
plotCreatorList.add(plotModelFactory);
imageCreationJobList.add(new PlotModelGeneratorJob(this, caller,
@@ -147,7 +148,7 @@ public class PlotThreadOverseer {
* TODO do we care?
*/
for (int i = 0; i < SAMPLE_THREADS; i++) {
- PlotModelFactory2 plotModelFactory = new PlotModelFactory2(
+ PlotModelFactory plotModelFactory = new PlotModelFactory(
mapDescriptor, plotModelFile);
sampleTextJobList.add(new PlotSampleGeneratorJob(this, caller,
plotModelFactory));
@@ -242,14 +243,14 @@ public class PlotThreadOverseer {
}
public void setPlotModelColor(RGB color) {
- for (PlotModelFactory2 pmf : plotCreatorList) {
+ for (PlotModelFactory pmf : plotCreatorList) {
pmf.setColor(color);
}
// don't clear the image cache, it's magic
}
public void setPlotModelLineStyle(LineStyle lineStyle) {
- for (PlotModelFactory2 pmf : plotCreatorList) {
+ for (PlotModelFactory pmf : plotCreatorList) {
pmf.setLineStyle(lineStyle);
}
for (PlotModelGeneratorJob job : imageCreationJobList) {
@@ -258,7 +259,7 @@ public class PlotThreadOverseer {
}
public void setPlotModelLineWidth(int outlineWidth) {
- for (PlotModelFactory2 pmf : plotCreatorList) {
+ for (PlotModelFactory pmf : plotCreatorList) {
pmf.setLineWidth(outlineWidth);
}
for (PlotModelGeneratorJob job : imageCreationJobList) {
@@ -267,19 +268,19 @@ public class PlotThreadOverseer {
}
public void setPlotMissingData(boolean plotMissingData) {
- for (PlotModelFactory2 pmf : plotCreatorList) {
+ for (PlotModelFactory pmf : plotCreatorList) {
pmf.setPlotMissingData(plotMissingData);
}
}
public void setLowerLimit(double lowerLimit) {
- for (PlotModelFactory2 pmf : plotCreatorList) {
+ for (PlotModelFactory pmf : plotCreatorList) {
pmf.setLowerLimit(lowerLimit);
}
}
public void setUpperLimit(double upperLimit) {
- for (PlotModelFactory2 pmf : plotCreatorList) {
+ for (PlotModelFactory pmf : plotCreatorList) {
pmf.setUpperLimit(upperLimit);
}
}
@@ -289,7 +290,7 @@ public class PlotThreadOverseer {
}
public void setPlotModelSize(long round) {
- for (PlotModelFactory2 pmf : plotCreatorList) {
+ for (PlotModelFactory pmf : plotCreatorList) {
pmf.setPlotDimensions(round, round);
}
for (PlotModelGeneratorJob job : imageCreationJobList) {
diff --git a/cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbookua/rsc/RedbookUpperAirResource.java b/cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbookua/rsc/RedbookUpperAirResource.java
index 667daa23b2..0dca38c994 100644
--- a/cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbookua/rsc/RedbookUpperAirResource.java
+++ b/cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbookua/rsc/RedbookUpperAirResource.java
@@ -70,7 +70,7 @@ import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.DensityCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.viz.pointdata.PlotData;
-import com.raytheon.viz.pointdata.PlotModelFactory2;
+import com.raytheon.viz.pointdata.PlotModelFactory;
import com.raytheon.viz.redbook.Activator;
import com.raytheon.viz.redbook.RedbookWMOMap;
import com.raytheon.viz.redbookua.RedbookUpperAirDecoder;
@@ -108,7 +108,7 @@ public class RedbookUpperAirResource extends
private String humanReadableName;
- private PlotModelFactory2 plotModelFactory;
+ private PlotModelFactory plotModelFactory;
private IGraphicsTarget graphicsTarget;
@@ -244,9 +244,9 @@ public class RedbookUpperAirResource extends
this.graphicsTarget = target;
}
- protected PlotModelFactory2 getPlotModelFactory() {
+ protected PlotModelFactory getPlotModelFactory() {
if (plotModelFactory == null) {
- plotModelFactory = new PlotModelFactory2(getDescriptor(),
+ plotModelFactory = new PlotModelFactory(getDescriptor(),
"redbookuaDesign.svg");
plotModelFactory.setColor(getCapability(ColorableCapability.class)
.getColor());
@@ -378,7 +378,7 @@ public class RedbookUpperAirResource extends
if (pointData == null)
retrieveAndDecodeData();
- PlotModelFactory2 pmf;
+ PlotModelFactory pmf;
synchronized (job) {
plotSettingsChanged = false;
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/pointdata/acarsdb.xml b/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/pointdata/acarsdb.xml
index 0224c80846..b26fb0e717 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/pointdata/acarsdb.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/pointdata/acarsdb.xml
@@ -22,7 +22,7 @@
-
+