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

Merge "Issue #1803 fix redbook sharing in collaboration" into development

Browse source 
Former-commit-id: e88519c5e3 [formerly 296b4dee5e8907296c45b8372b5dffe28a2b9f4c]
Former-commit-id: 666b271528
This commit is contained in:
Nate Jensen 2014-04-10 13:50:55 -05:00 • committed by Gerrit Code Review
commit 573981b0d5
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbook/rsc/RedbookFrame.java
View file

@ -94,6 +94,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* Jul 19, 2013 16401 D. Friedman Fix unknown block processing.
* Mar 13, 2014 2907 njensen split edex.redbook plugin into common
* and edex redbook plugins
* Apr 10, 2014 1803 njensen Fix dispose() for collaboration
*
* </pre>
*
@ -141,7 +142,7 @@ public class RedbookFrame implements IRenderable {
return (this.compiler != null);
}
public void deInit() {
protected void deInit() {
if (this.wireframeShape != null) {
this.wireframeShape.dispose();
}
@ -329,9 +330,9 @@ public class RedbookFrame implements IRenderable {
@Override
public void paint(IGraphicsTarget target, PaintProperties paintProps)
throws VizException {
target.drawWireframeShape(this.wireframeShape, this.redbookResource
.getCapability(ColorableCapability.class).getColor(),
RGB color = this.redbookResource.getCapability(
ColorableCapability.class).getColor();
target.drawWireframeShape(this.wireframeShape, color,
this.redbookResource.getCapability(OutlineCapability.class)
.getOutlineWidth(),
this.redbookResource.getCapability(OutlineCapability.class)
@ -339,8 +340,9 @@ public class RedbookFrame implements IRenderable {
synchronized (this) {
IExtent pe = paintProps.getView().getExtent();
IFont font = this.redbookResource.getRenderingFont();
Rectangle2D cellSize = target.getStringBounds(font, "M");
DrawableString m = new DrawableString("M", color);
m.font = this.redbookResource.getRenderingFont();
Rectangle2D cellSize = target.getStringsBounds(m);
boolean clipped = true;
double xRatio = paintProps.getView().getExtent().getWidth()
/ paintProps.getCanvasBounds().width;
@ -556,7 +558,7 @@ public class RedbookFrame implements IRenderable {
: VerticalAlignment.BOTTOM;
Rectangle2D bounds = target.getStringsBounds(dstring);
if (blanked) {
dstring.textStyle = TextStyle.BLANKED;
dstring.addTextStyle(TextStyle.BLANKED);
}
if (isLegend) {
target.getExtension(ICanvasRenderingExtension.class)
@ -608,9 +610,7 @@ public class RedbookFrame implements IRenderable {
}
public void dispose() {
if (this.wireframeShape != null) {
this.wireframeShape.dispose();
}
deInit();
}
public DataTime getDataTime() {