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

Omaha #3492 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createWireframeShape()

Browse source 
Change-Id: Ie521a2041586825b9fb995a675e5caa550fa5313

Former-commit-id: 0df04ef8a5b4eee4398a411fc02baba22f719eaf
This commit is contained in:
Mark Peters 2014-08-13 12:19:48 -05:00
parent 85e0997b56
commit 8e7d6964c6
11 changed files with 38 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/rsc/rendering/ShapeRenderingHandler.java
View file

@ -82,13 +82,8 @@ public class ShapeRenderingHandler extends CollaborationRenderingHandler {
IGraphicsTarget target = getGraphicsTarget();
int shapeId = event.getObjectId();
IWireframeShape shape = null;
if (event.getSimplificationLevel() != null) {
shape = target.createWireframeShape(event.isMutable(),
event.getGridGeometry(), event.getSimplificationLevel());
} else {
shape = target.createWireframeShape(event.isMutable(),
event.getGridGeometry());
}
shape = target.createWireframeShape(event.isMutable(),
event.getGridGeometry());
dataManager.putRenderableObject(shapeId, shape);
}

6
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
View file

@ -193,6 +193,7 @@ import com.vividsolutions.jts.geom.Point;
* May 05, 2014 3026 mpduff Display Hpe bias source.
* May 19, 2014 DR 16096 gzhang Make getBasin() protected for FFMPDataGenerator.
* 06/24/2016 mnash Make FFMPResource implement Interrogatable
* Aug 13, 2014 3492 mapeters Updated deprecated createWireframeShape() calls.
* </pre>
*
* @author dhladky
@ -2803,7 +2804,7 @@ public class FFMPResource extends
// create the frames/shaded shapes here
localWireframeShape = req.target.createWireframeShape(false,
descriptor, 0.0f);
descriptor);
localShadedShape = req.target.createShadedShape(false,
descriptor.getGridGeometry(), true);
@ -2870,8 +2871,7 @@ public class FFMPResource extends
// create the frames/shaded shapes here
try {
// read in geometries
basinShape = req.target.createWireframeShape(false, descriptor,
0.0f);
basinShape = req.target.createWireframeShape(false, descriptor);
JTSCompiler jtsCompiler3 = new JTSCompiler(null, basinShape,
descriptor, PointStyle.CROSS);
RGB color = getCapability(ColorableCapability.class).getColor();

11
cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/DispatchGraphicsTarget.java
View file

@ -754,7 +754,7 @@ public class DispatchGraphicsTarget extends DispatchingObject<IGraphicsTarget>
IDescriptor descriptor, float simplificationLevel) {
// Create original
IWireframeShape targetShape = wrappedObject.createWireframeShape(
mutable, descriptor, simplificationLevel);
mutable, descriptor);
// Create wrapped
DispatchingWireframeShape dispatching = new DispatchingWireframeShape(
targetShape, getDispatcher(), descriptor.getGridGeometry());
@ -776,7 +776,7 @@ public class DispatchGraphicsTarget extends DispatchingObject<IGraphicsTarget>
GeneralGridGeometry geom, float simplificationLevel) {
// Create original
IWireframeShape targetShape = wrappedObject.createWireframeShape(
mutable, geom, simplificationLevel);
mutable, geom);
// Create wrapped
DispatchingWireframeShape dispatching = new DispatchingWireframeShape(
targetShape, getDispatcher(), geom);
@ -803,7 +803,7 @@ public class DispatchGraphicsTarget extends DispatchingObject<IGraphicsTarget>
boolean spatialChopFlag, IExtent extent) {
// Create original
IWireframeShape targetShape = wrappedObject.createWireframeShape(
mutable, descriptor, simplificationLevel);
mutable, descriptor);
// Create wrapped
DispatchingWireframeShape dispatching = new DispatchingWireframeShape(
targetShape, getDispatcher(), descriptor.getGridGeometry());
@ -853,7 +853,7 @@ public class DispatchGraphicsTarget extends DispatchingObject<IGraphicsTarget>
boolean spatialChopFlag, IExtent extent) {
// Create original
IWireframeShape targetShape = wrappedObject.createWireframeShape(
mutable, geom, simplificationLevel);
mutable, geom);
// Create wrapped
DispatchingWireframeShape dispatching = new DispatchingWireframeShape(
targetShape, getDispatcher(), geom);
@ -871,9 +871,6 @@ public class DispatchGraphicsTarget extends DispatchingObject<IGraphicsTarget>
.createEvent(CreateWireframeShapeEvent.class, shape);
event.setGridGeometry(geom);
event.setMutable(mutable);
event.setIExtent(extent);
event.setSimplificationLevel(simplificationLevel);
event.setSpatialChopFlag(spatialChopFlag);
dispatch(event);
}

5
cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/events/shapes/CreateWireframeShapeEvent.java
View file

@ -38,6 +38,8 @@ import com.raytheon.uf.viz.remote.graphics.events.ICreationEvent;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Mar 27, 2012 mschenke Initial creation
* Aug 13, 2014 3492 mapeters Deprecated simplificationLevel, spatialChopFlag,
* and extent fields.
*
* </pre>
*
@ -54,12 +56,15 @@ public class CreateWireframeShapeEvent extends AbstractDispatchingObjectEvent
@DynamicSerializeElement
private boolean mutable;
@Deprecated
@DynamicSerializeElement
private Float simplificationLevel;
@Deprecated
@DynamicSerializeElement
private Boolean spatialChopFlag;
@Deprecated
@DynamicSerializeElement
private double[] extent;

4
cave/com.raytheon.viz.bcd/src/com/raytheon/viz/bcd/BCDResource.java
View file

@ -77,6 +77,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* now closes on FileInputStream instead of FileChannel in initInternal()
* Jul 29, 2014 3465 mapeters Updated deprecated drawString() calls.
* Aug 04, 2014 3489 mapeters Updated deprecated getStringBounds() calls.
* Aug 13, 2014 3492 mapeters Updated deprecated createWireframeShape() calls.
*
* </pre>
*
@ -172,8 +173,7 @@ public class BCDResource extends
if (wireframeShape == null) {
this.gridGeometry = descriptor.getGridGeometry();
wireframeShape = target.createWireframeShape(true, descriptor,
0.0f);
wireframeShape = target.createWireframeShape(true, descriptor);
// wireframeShape = target.createWireframeShape(true,
// mapDescriptor);
File file = new File(resourceData.getFilename());

3
cave/com.raytheon.viz.dataaccess/src/com/raytheon/viz/dataaccess/rsc/geometry/GenericGeometryResource.java
View file

@ -58,6 +58,7 @@ import com.vividsolutions.jts.geom.Point;
* ------------ ---------- ----------- --------------------------
* Jan 30, 2013 bkowal Initial creation
* Feb 6, 2013 #1555 bkowal Improve Geometry Loop
* Aug 13, 2014 #3492 mapeters Updated deprecated createWireframeShape() calls.
* </pre>
*
* @author bkowal
@ -207,7 +208,7 @@ public class GenericGeometryResource extends
if (numberOfPoints > 0) {
// create the wireframe shape
shape = target.createWireframeShape(false, this.descriptor, 0.0f);
shape = target.createWireframeShape(false, this.descriptor);
JTSCompiler jtsCompiler = new JTSCompiler(null, shape,
this.descriptor, PointStyle.CROSS);

7
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/zones/ShapeBuilderJob.java
View file

@ -56,7 +56,8 @@ import com.vividsolutions.jts.io.WKBReader;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* wldougher Initial creation.
* Aug 1, 2014 3471 mapeters Updated deprecated createShadedShape() calls.
* Aug 01, 2014 3471 mapeters Updated deprecated createShadedShape() calls.
* Aug 13, 2014 3492 mapeters Updated deprecated createWireframeShape() calls.
*
* </pre>
*
@ -189,9 +190,9 @@ public class ShapeBuilderJob extends Job {
response.background = request.target.createShadedShape(false,
descriptor.getGridGeometry(), true);
response.outline = request.target.createWireframeShape(false,
descriptor, 0.0f);
descriptor);
response.cwaOutline = request.target.createWireframeShape(false,
descriptor, 0.0f);
descriptor);
JTSCompiler compiler = new JTSCompiler(response.background,
response.outline, descriptor, PointStyle.CROSS);
JTSCompiler cwaCompiler = new JTSCompiler(null,

6
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
View file

@ -104,6 +104,7 @@ import com.vividsolutions.jts.io.WKBReader;
* Jul 31, 2013 #2239 randerso Fixed scaling of maps that cross the date line
* Jan 07, 2014 #2662 randerso Fixed limitZones (subDomainUGCs) support
* Feb 18, 2014 #2819 randerso Removed unnecessary clones of geometries
* Aug 13, 2014 #3492 mapeters Updated deprecated createWireframeShape() calls.
*
* </pre>
*
@ -322,7 +323,7 @@ public class ZoneSelectorResource extends DbMapResource {
}
IWireframeShape newOutlineShape = req.target
.createWireframeShape(false, req.descriptor, 0.0f);
.createWireframeShape(false, req.descriptor);
newOutlineShape.allocate(numPoints);
JTSCompiler outlineCompiler = new JTSCompiler(null,
@ -354,8 +355,7 @@ public class ZoneSelectorResource extends DbMapResource {
if (wfoGeoms.size() > 0) {
IWireframeShape newWfoShape = req.target
.createWireframeShape(false, req.descriptor,
0.0f);
.createWireframeShape(false, req.descriptor);
newWfoShape.allocate(wfoPoints);
JTSCompiler wfoCompiler = new JTSCompiler(null,

7
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotMeanAreaFreezeResource.java
View file

@ -67,8 +67,9 @@ import com.vividsolutions.jts.geom.Polygon;
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 8, 2009 snaples Initial creation
* Aug 1, 2014 3471 mapeters Updated deprecated createShadedShape() calls.
* Apr 08, 2009 snaples Initial creation
* Aug 01, 2014 3471 mapeters Updated deprecated createShadedShape() calls.
* Aug 13, 2014 3492 mapeters Updated deprecated createWireframeShape() calls.
*
* </pre>
*
@ -203,7 +204,7 @@ public class PlotMeanAreaFreezeResource extends
IMapDescriptor descriptor = (IMapDescriptor) displayMgr
.getRenderableDisplay().getDescriptor();
jtsGeometryFactory = new GeometryFactory();
outlineShape = target.createWireframeShape(false, descriptor, 0.0f);
outlineShape = target.createWireframeShape(false, descriptor);
shadedShape = target.createShadedShape(false,
descriptor.getGridGeometry(), true);

9
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotMeanAreaPrecipResource.java
View file

@ -70,9 +70,10 @@ import com.vividsolutions.jts.geom.Polygon;
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 8, 2009 snaples Initial creation
* May 2, 2013 15970 snaples Updated setColor to use the correct color.
* Aug 1, 2014 3471 mapeters Updated deprecated createShadedShape() calls.
* Apr 08, 2009 snaples Initial creation
* May 02, 2013 15970 snaples Updated setColor to use the correct color.
* Aug 01, 2014 3471 mapeters Updated deprecated createShadedShape() calls.
* Aug 13, 2014 3492 mapeters Updated deprecated createWireframeShape() calls.
*
* </pre>
*
@ -222,7 +223,7 @@ public class PlotMeanAreaPrecipResource extends
.getRenderableDisplay().getDescriptor();
jtsGeometryFactory = new GeometryFactory();
outlineShape = target.createWireframeShape(false, descriptor, 0.0f);
outlineShape = target.createWireframeShape(false, descriptor);
shadedShape = target.createShadedShape(false,
descriptor.getGridGeometry(), true);

7
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotMeanAreaTempResource.java
View file

@ -67,8 +67,9 @@ import com.vividsolutions.jts.geom.Polygon;
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 8, 2009 snaples Initial creation
* Aug 1, 2014 3471 mapeters Updated deprecated createShadedShape() calls.
* Apr 08, 2009 snaples Initial creation
* Aug 01, 2014 3471 mapeters Updated deprecated createShadedShape() calls.
* Aug 13, 2014 3492 mapeters Updated deprecated createWireframeShape() calls.
*
* </pre>
*
@ -201,7 +202,7 @@ public class PlotMeanAreaTempResource extends
IMapDescriptor descriptor = (IMapDescriptor) displayMgr
.getRenderableDisplay().getDescriptor();
jtsGeometryFactory = new GeometryFactory();
outlineShape = target.createWireframeShape(false, descriptor, 0.0f);
outlineShape = target.createWireframeShape(false, descriptor);
shadedShape = target.createShadedShape(false,
descriptor.getGridGeometry(), true);