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

Issue #1926 faster and cleaner cell track rendering

Browse source 
Change-Id: Idf5496946a6568640c465f5043ca098afe46c2c9

Former-commit-id: 3294b4aea3 [formerly 4dc01c1830 [formerly 64440f97ef] [formerly 3294b4aea3 [formerly 74b82955cf41099b5bc2fcc726ea515366722925]]]
Former-commit-id: 4dc01c1830 [formerly 64440f97ef]
Former-commit-id: 4dc01c1830
Former-commit-id: fa63458f01
This commit is contained in:
Nate Jensen 2013-04-24 10:01:20 -05:00
parent 319347c87f
commit ab5f62f9ef
1 changed files with 24 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanDrawer.java
View file

@ -238,7 +238,6 @@ public class ScanDrawer {
circle.radius = size * (SIN_HEX_ANGLE);
circle.lineWidth = outlineWidth;
circle.basics.color = color;
aTarget.drawCircle(circle);
if (isNew(ctdr)) {
DrawableCircle innerCircle = new DrawableCircle();
@ -247,7 +246,9 @@ public class ScanDrawer {
innerCircle.radius = size / 2 * (SIN_HEX_ANGLE);
innerCircle.lineWidth = outlineWidth;
innerCircle.basics.color = color;
aTarget.drawCircle(innerCircle);
aTarget.drawCircle(circle, innerCircle);
} else {
aTarget.drawCircle(circle);
}
}
}
@ -831,7 +832,7 @@ public class ScanDrawer {
double dir, double length) {
double[] earAngles = new double[] { 10, -10 };
List<double[]> coords = new ArrayList<double[]>();
List<double[]> coords = new ArrayList<double[]>(earAngles.length);
for (double earAngle : earAngles) {
@ -969,15 +970,13 @@ public class ScanDrawer {
if (sdc.getPastTracks()) {
if (ctdr.getPastCoordinates() != null) {
for (Date date : ctdr.getPastCoordinates().keySet()) {
dates.add(date);
}
Collections.sort(dates);
count = dates.size();
double[] point = null;
double[] point = null;
for (int i = dates.size() - 1; i >= 0; i--) {
Coordinate coor = ctdr.getPastCoordinates().get(
dates.get(i));
@ -1014,45 +1013,34 @@ public class ScanDrawer {
}
}
// Draw data
// draw the past points
if (pastPoints.size() > 0) {
double cirRadius = 2.0 / screenToWorldRatio;
DrawableCircle[] pastCircles = new DrawableCircle[pastPoints.size()];
for (int i = 0; i < pastPoints.size(); i++) {
DrawableCircle pc = new DrawableCircle();
double[] point = pastPoints.get(i);
pc.setCoordinates(point[0], point[1], 0);
pc.basics.color = getResourceColor();
pc.radius = cirRadius;
pc.filled = true;
pastCircles[i] = pc;
}
aTarget.drawCircle(pastCircles);
aTarget.drawPoints(pastPoints, getResourceColor(), PointStyle.DISC,
0.7f);
}
if (pastPoints.size() > 1) {
DrawableLine line = new DrawableLine();
line.points = pastPoints;
line.width = outlineWidth;
line.basics.color = getResourceColor();
aTarget.drawLine(line);
}
if (pastPoints.size() > 0) {
double[] oldPoint = pastPoints.get(0);
aTarget.drawLine(oldPoint[0], oldPoint[1], 0.0, center[0],
center[1], 0.0, getResourceColor(), outlineWidth);
}
drawX(center);
// draw the X
aTarget.drawPoint(center[0], center[1], 0.0, getResourceColor(),
PointStyle.X, 1.3f);
// draw the future points
if (futurePoints.size() > 0) {
aTarget.drawPoints(futurePoints, getResourceColor(),
PointStyle.CROSS, 1.3f);
}
if (futurePoints.size() > 1) {
DrawableLine line = new DrawableLine();
line.points = futurePoints;
// draw the track line
DrawableLine line = new DrawableLine();
for (int i = pastPoints.size() - 1; i > -1; i--) {
double[] pt = pastPoints.get(i);
line.addPoint(pt[0], pt[1]);
}
line.addPoint(center[0], center[1]);
for (double[] pt : futurePoints) {
line.addPoint(pt[0], pt[1]);
}
if (line.points.size() > 1) {
line.width = outlineWidth;
line.basics.color = getResourceColor();
aTarget.drawLine(line);