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

Merge "Omaha #3422 Replace drawFilledCircle and drawArc calls" into omaha_14.4.1

Browse source 
Former-commit-id: eac41695224c18aa566e4b1fdcbaf48647d93fdf
This commit is contained in:
Nate Jensen 2014-07-22 14:21:27 -05:00 • committed by Gerrit Code Review
commit 415c9e73fd
2 changed files with 28 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -65,7 +65,7 @@ import com.vividsolutions.jts.geom.Point;
* Oct 13, 2009 2307 dhladky Initial creation * Oct 13, 2009 2307 dhladky Initial creation
* Apr 22, 2013 1926 njensen Faster rendering * Apr 22, 2013 1926 njensen Faster rendering
* May 09, 2014 3145 mpduff Add getter for font so it can be disposed, javadoc fix * May 09, 2014 3145 mpduff Add getter for font so it can be disposed, javadoc fix
* * Jul 22, 2014 3422 mapeters Updated deprecated drawArc() call.
* </pre> * </pre>
* *
* @author dhladky * @author dhladky
@ -358,49 +358,40 @@ public class ScanDrawer {
wLeftX = center[0] - (size); wLeftX = center[0] - (size);
topY = center[1] - (size); topY = center[1] - (size);
bottomY = center[1] + (size); bottomY = center[1] + (size);
DrawableCircle circle = new DrawableCircle();
circle.setCoordinates(center[0], center[1]);
circle.radius = size;
circle.basics.color = getResourceColor();
if (mesoType == 0) { if (mesoType == 0) {
if (isExt) { if (isExt) {
// draw a broken circle // draw a broken circle
aTarget.drawArc(center[0], center[1], 0.0, size,
getResourceColor(), outlineWidth * 4, 0, 360,
LineStyle.DASHED, true);
} else {
DrawableCircle circle = new DrawableCircle();
circle.setCoordinates(center[0], center[1], 0.0);
circle.basics.color = getResourceColor();
circle.radius = size;
circle.lineWidth = outlineWidth * 4; circle.lineWidth = outlineWidth * 4;
circle.filled = false; circle.lineStyle = LineStyle.DASHED;
aTarget.drawCircle(circle);
} else {
circle.lineWidth = outlineWidth * 4;
aTarget.drawCircle(circle); aTarget.drawCircle(circle);
} }
} else if (mesoType == 2) { } else if (mesoType == 2) {
if (isExt) { if (isExt) {
// draw a broken circle // draw a broken circle
aTarget.drawArc(center[0], center[1], 0.0, size,
getResourceColor(), outlineWidth, 0, 360,
LineStyle.DASHED, true);
} else {
DrawableCircle circle = new DrawableCircle();
circle.setCoordinates(center[0], center[1], 0.0);
circle.basics.color = getResourceColor();
circle.radius = size;
circle.lineWidth = outlineWidth; circle.lineWidth = outlineWidth;
circle.filled = false; circle.lineStyle = LineStyle.DASHED;
aTarget.drawCircle(circle);
} else {
circle.lineWidth = outlineWidth;
aTarget.drawCircle(circle); aTarget.drawCircle(circle);
} }
} else if (mesoType == 1) { } else if (mesoType == 1) {
if (isExt) { if (isExt) {
// draw a broken circle // draw a broken circle
aTarget.drawArc(center[0], center[1], 0.0, size, circle.lineWidth = outlineWidth * 4;
getResourceColor(), outlineWidth * 4, 0, 360, circle.lineStyle = LineStyle.DASHED;
LineStyle.DASHED, true); aTarget.drawCircle(circle);
} else { } else {
DrawableCircle circle = new DrawableCircle();
circle.setCoordinates(center[0], center[1], 0.0);
circle.basics.color = getResourceColor();
circle.radius = size;
circle.lineWidth = outlineWidth * 4; circle.lineWidth = outlineWidth * 4;
circle.filled = false;
aTarget.drawCircle(circle); aTarget.drawCircle(circle);
} }
// top spike // top spike

11
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HydroPointResource.java
View file

@ -21,6 +21,7 @@ package com.raytheon.viz.hydrocommon.resource;
import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.graphics.RGB;
import com.raytheon.uf.viz.core.DrawableCircle;
import com.raytheon.uf.viz.core.IGraphicsTarget; import com.raytheon.uf.viz.core.IGraphicsTarget;
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;
@ -40,7 +41,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Sep 22, 2009 snaples Initial creation * Sep 22, 2009 snaples Initial creation
* * Jul 22, 2014 #3422 mapeters Updated deprecated drawFilledCircle() call.
* </pre> * </pre>
* *
* @author snaples * @author snaples
@ -110,8 +111,12 @@ public abstract class HydroPointResource <T extends HydroPointResourceData<?>> e
target.drawShadedRect(paintProps.getView().getExtent(), color, target.drawShadedRect(paintProps.getView().getExtent(), color,
1.0, null); 1.0, null);
} else if (getStyle() == Style.CIRCLE) { } else if (getStyle() == Style.CIRCLE) {
target.drawFilledCircle(pixels[0], pixels[1], 0.0, DrawableCircle circle = new DrawableCircle();
CIRCLE_RADIUS, color); circle.setCoordinates(pixels[0], pixels[1]);
circle.radius = (double)CIRCLE_RADIUS;
circle.basics.color = color;
circle.filled = true;
target.drawCircle(circle);
} }
} }