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

Issue #2573 safer and faster progressive disclosure

Browse source 
Change-Id: If568c0958f7e6133ce03fe5c4a17e6d865d431fd

Former-commit-id: 5c80b34e16 [formerly 622cc1b223] [formerly 5c80b34e16 [formerly 622cc1b223] [formerly 90d6b5bd74 [formerly 36621eb21598f3730d0aa88973932e877367fecf]]]
Former-commit-id: 90d6b5bd74
Former-commit-id: e5cfe76cac [formerly e40c71acd1]
Former-commit-id: ecd87941e6
This commit is contained in:
Nate Jensen 2013-12-02 17:28:09 -06:00
parent b5962b7f06
commit cd258c50ee
2 changed files with 66 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java
View file

@ -97,6 +97,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* 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
*
* </pre>
*
@ -226,7 +227,7 @@ public class PlotResource2 extends
|| !curTime.equals(displayedTime)) {
displayedTime = paintProps.getDataTime();
progressiveDisclosure.update(curFrame.stationMap.values(),
displayedTime);
displayedTime, true);
resourceData.getPlotInfoRetriever().updateActiveFrame(
paintProps.getDataTime(),
descriptor.pixelToWorld(paintProps.getView().getExtent(),
@ -367,10 +368,10 @@ public class PlotResource2 extends
if (info.size() > 1) {
Collections.sort(info, new Comparator<PlotInfo>() {
@Override
public int compare(PlotInfo o1, PlotInfo o2) {
return o2.dataTime.compareTo(o1.dataTime);
}
@Override
public int compare(PlotInfo o1, PlotInfo o2) {
return o2.dataTime.compareTo(o1.dataTime);
}
});
}

68
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/progdisc/AbstractProgDisclosure.java
View file

@ -2,9 +2,10 @@ package com.raytheon.viz.pointdata.rsc.progdisc;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Deque;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@ -27,8 +28,9 @@ import com.raytheon.viz.pointdata.rsc.PlotResource2.Station;
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jan 12, 2011 bsteffen Initial creation
* Jul 1, 2011 njensen Added queuing
* Jan 12, 2011 bsteffen Initial creation
* Jul 01, 2011 njensen Added queuing
* Dec 02, 2013 2573 njensen Smarter queuing
*
* </pre>
*
@ -63,6 +65,7 @@ public abstract class AbstractProgDisclosure extends Job {
DataTime time = null;
@Override
protected Task clone() {
Task task = new Task();
task.descriptor = descriptor;
@ -94,7 +97,7 @@ public abstract class AbstractProgDisclosure extends Job {
private Task nextTask = new Task();
private Queue<QueueEntry> queue = new ConcurrentLinkedQueue<QueueEntry>();
private Deque<QueueEntry> queue = new LinkedList<QueueEntry>();
public AbstractProgDisclosure(IProgDiscListener listener) {
super("progressive disclosure");
@ -114,9 +117,14 @@ public abstract class AbstractProgDisclosure extends Job {
@Override
protected IStatus run(IProgressMonitor monitor) {
while (!queue.isEmpty()) {
QueueEntry entry = queue.poll();
// Clone the current state so it does not change in the midle of the
QueueEntry entry = null;
synchronized (queue) {
entry = queue.poll();
}
while (entry != null) {
// Clone the current state so it does not change in the middle of
// the
// algorithm
Task task = nextTask.clone();
task.stations = entry.stations;
@ -125,6 +133,9 @@ public abstract class AbstractProgDisclosure extends Job {
&& !task.stations.isEmpty()) {
listener.disclosureComplete(task.time, progDisc(task));
}
synchronized (queue) {
entry = queue.poll();
}
}
return Status.OK_STATUS;
@ -158,11 +169,50 @@ public abstract class AbstractProgDisclosure extends Job {
}
}
/**
* Requests progressive disclosure to run for the specified time with the
* available stations
*
* @param stations
* @param time
*/
public void update(Collection<Station> stations, DataTime time) {
update(stations, time, false);
}
/**
* Requests progressive disclosure to run for the specified time with the
* available stations. If highPriority is true, the next disclosure that is
* run will be this one.
*
* @param stations
* @param time
* @param highPriority
*/
public void update(Collection<Station> stations, DataTime time,
boolean highPriority) {
QueueEntry entry = new QueueEntry();
entry.stations = new ArrayList<Station>(stations);
entry.time = time;
queue.add(entry);
synchronized (queue) {
// time corresponds to a frame and there's no point in running
// an older progressive disclosure task for the same time
// if a newer one is requested, so remove the older one
// if there is more than one for the same time
Iterator<QueueEntry> itr = queue.iterator();
while (itr.hasNext()) {
QueueEntry alreadyQueued = itr.next();
if (entry.time.equals(alreadyQueued.time)) {
itr.remove();
break;
}
}
if (highPriority) {
queue.addFirst(entry);
} else {
queue.addLast(entry);
}
}
update();
}