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

Omaha #3471 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createShadedShape()

Browse source 
Change-Id: Iea874ecfa2c7f16eacdc7f097039ba20f10fc2b9

Former-commit-id: 038357a6f2 [formerly 1342f67614] [formerly 9be02c8dfe] [formerly 6f375e538b8659de67b413358b0244fd283a34d5 [formerly 9be02c8dfe [formerly 22c077d77f]]] [formerly 88b334cf14 [formerly 9be02c8dfe [formerly 22c077d77f] [formerly 88b334cf14 [formerly 4bcf01e33f1d2e038499fdece63e81b6288b7152]]]]
Former-commit-id: 88b334cf14
Former-commit-id: 37df92febfcce1a6a42706bcd9429e6e457bdf29 [formerly 3dc8f434a87e7d966a11f8dc0dd83eee4a57069c] [formerly 469f73cb43 [formerly 666c988f64]]
Former-commit-id: 469f73cb43
Former-commit-id: 8ccec2e2c8
This commit is contained in:
Mark Peters 2014-08-04 13:27:45 -05:00
parent 21caa8af7a
commit 996273762f
8 changed files with 47 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cave/com.raytheon.uf.viz.radarapps.requests/src/com/raytheon/uf/viz/radarapps/alertreq/AlertAreaLayer.java
View file

@ -64,6 +64,21 @@ import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.GeometryFactory;
import com.vividsolutions.jts.geom.LineString;
/**
* Display radar alert request areas.
*
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Initial creation.
* Aug 1, 2014 3471 mapeters Updated deprecated createShadedShape() calls.
*
* </pre>
*
*/
public class AlertAreaLayer extends
AbstractVizResource<AlertAreaResourceData, MapDescriptor> implements
IContextMenuContributor, IChangeListener {
@ -239,7 +254,8 @@ public class AlertAreaLayer extends
GeneralGridGeometry gg = getGridGeometry();
if (gg != null) {
gridSO = target.createShadedShape(false, this.descriptor, true);
gridSO = target.createShadedShape(false,
this.descriptor.getGridGeometry(), true);
gridWF = target.createWireframeShape(false, this.descriptor);
GeometryFactory geomFactory = new GeometryFactory();

4
cave/com.raytheon.uf.viz.radarapps.requests/src/com/raytheon/uf/viz/radarapps/alertreq/AlertRequestWindow.java
View file

@ -86,14 +86,12 @@ import com.raytheon.uf.viz.core.drawables.IDescriptor;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
import com.raytheon.uf.viz.core.status.StatusConstants;
import com.raytheon.uf.viz.radarapps.alertreq.impl.AlertCategory;
import com.raytheon.uf.viz.radarapps.alertreq.impl.AlertRequestDoc;
import com.raytheon.uf.viz.radarapps.alertreq.impl.AlertRequestEditing;
import com.raytheon.uf.viz.radarapps.alertreq.impl.AlertRequestEditing.Sel;
import com.raytheon.uf.viz.radarapps.core.RadarApps;
import com.raytheon.uf.viz.radarapps.products.ui.ExtProductsUI;
import com.raytheon.uf.viz.radarapps.requests.Activator;
import com.raytheon.viz.ui.EditorUtil;
public class AlertRequestWindow extends Window {
@ -338,7 +336,7 @@ public class AlertRequestWindow extends Window {
String message = "There are modified alert requests for some radars. "
+ "Do you want to send them before exiting?\n\n"
+ "\t\"Cancel\" to return to the editor.\n"
+ "\t\"Exit\" to exit, loosing any modifications.\n"
+ "\t\"Exit\" to exit, losing any modifications.\n"
+ "\t\"Send\" to send modified requests and exit.";
String[] labels = { "Cancel", "Exit", "Send Requests" };
MessageDialog dlg = new MessageDialog(getShell(), "Confirm Exit",

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

@ -48,6 +48,18 @@ import com.vividsolutions.jts.io.ParseException;
import com.vividsolutions.jts.io.WKBReader;
/**
* TODO Add Description
*
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* wldougher Initial creation.
* Aug 1, 2014 3471 mapeters Updated deprecated createShadedShape() calls.
*
* </pre>
*
* @author wldougher
*
*/
@ -175,7 +187,7 @@ public class ShapeBuilderJob extends Job {
// class are both shaded and outlined, so the extra logic has not
// been fully implemented.
response.background = request.target.createShadedShape(false,
descriptor, true);
descriptor.getGridGeometry(), true);
response.outline = request.target.createWireframeShape(false,
descriptor, 0.0f);
response.cwaOutline = request.target.createWireframeShape(false,
@ -267,7 +279,7 @@ public class ShapeBuilderJob extends Job {
RGB color = getColor(request, Integer.valueOf(groupNum));
IShadedShape groupShape = request.target.createShadedShape(
false, descriptor, true);
false, descriptor.getGridGeometry(), true);
JTSCompiler groupCompiler = new JTSCompiler(groupShape, null,
descriptor, PointStyle.CROSS);

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

@ -26,12 +26,12 @@ import javax.measure.unit.Unit;
import org.eclipse.swt.graphics.RGB;
import com.raytheon.uf.common.dataplugin.shef.tables.Colorvalue;
import com.raytheon.uf.common.colormap.Color;
import com.raytheon.uf.common.colormap.ColorMap;
import com.raytheon.uf.common.colormap.prefs.ColorMapParameters;
import com.raytheon.uf.common.colormap.prefs.DataMappingPreferences;
import com.raytheon.uf.common.colormap.prefs.DataMappingPreferences.DataMappingEntry;
import com.raytheon.uf.common.dataplugin.shef.tables.Colorvalue;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
@ -68,6 +68,7 @@ import com.vividsolutions.jts.geom.Polygon;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 8, 2009 snaples Initial creation
* Aug 1, 2014 3471 mapeters Updated deprecated createShadedShape() calls.
*
* </pre>
*
@ -204,7 +205,8 @@ public class PlotMeanAreaFreezeResource extends
jtsGeometryFactory = new GeometryFactory();
outlineShape = target.createWireframeShape(false, descriptor, 0.0f);
shadedShape = target.createShadedShape(false, descriptor, true);
shadedShape = target.createShadedShape(false,
descriptor.getGridGeometry(), true);
JTSCompiler jtsCompiler = new JTSCompiler(shadedShape, outlineShape,
descriptor);

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

@ -72,6 +72,7 @@ import com.vividsolutions.jts.geom.Polygon;
* ------------ ---------- ----------- --------------------------
* 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.
*
* </pre>
*
@ -223,7 +224,8 @@ public class PlotMeanAreaPrecipResource extends
jtsGeometryFactory = new GeometryFactory();
outlineShape = target.createWireframeShape(false, descriptor, 0.0f);
shadedShape = target.createShadedShape(false, descriptor, true);
shadedShape = target.createShadedShape(false,
descriptor.getGridGeometry(), true);
JTSCompiler jtsCompiler = new JTSCompiler(shadedShape, outlineShape,
descriptor);

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

@ -68,6 +68,7 @@ import com.vividsolutions.jts.geom.Polygon;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 8, 2009 snaples Initial creation
* Aug 1, 2014 3471 mapeters Updated deprecated createShadedShape() calls.
*
* </pre>
*
@ -202,7 +203,8 @@ public class PlotMeanAreaTempResource extends
jtsGeometryFactory = new GeometryFactory();
outlineShape = target.createWireframeShape(false, descriptor, 0.0f);
shadedShape = target.createShadedShape(false, descriptor, true);
shadedShape = target.createShadedShape(false,
descriptor.getGridGeometry(), true);
JTSCompiler jtsCompiler = new JTSCompiler(shadedShape, outlineShape,
descriptor);

5
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
View file

@ -214,6 +214,7 @@ import com.vividsolutions.jts.io.WKTReader;
* 04/28,2014 3033 jsanchez Properly handled back up configuration (*.xml) files. Set backupSite to null when backup site is not selected.
* 05/16/2014 DR 17365 D. Friedman Check if moved vertex results in polygon valid in both lat/lon and local coordinates.
* 07/24/2014 3429 mapeters Updated deprecated drawLine() calls.
* 08/01/2014 3471 mapeters Updated deprecated createShadedShape() calls.
* </pre>
*
* @author mschenke
@ -910,8 +911,8 @@ public class WarngenLayer extends AbstractStormTrackResource {
});
manager = new WarngenUIManager(this);
coveredAreaFrame = target.createWireframeShape(true, this.descriptor);
shadedCoveredArea = target.createShadedShape(true, this.descriptor,
true);
shadedCoveredArea = target.createShadedShape(true,
this.descriptor.getGridGeometry(), true);
}
/**

3
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/CWASPSResource.java
View file

@ -58,6 +58,7 @@ import com.vividsolutions.jts.io.WKTReader;
* May 10, 2013 1951 rjpeter Initial history entry, updated ugcZones references
* Nov 08, 2013 16758 mgamazaychikov Added mergeWatches to simplify SPS processing
* and getEventKey to create SPS-unique key
* Aug 01, 2014 3471 mapeters Updated deprecated createShadedShape() calls.
* </pre>
*
* @author rjpeter
@ -210,7 +211,7 @@ public class CWASPSResource extends WatchesResource {
}
entry.shadedShape = target.createShadedShape(false,
descriptor, false);
descriptor.getGridGeometry(), false);
try {
geo = wktr.read(record.getGeometry().toString());