Repaired exceptions during shape editing when the World Window's vertical exaggeration changes.

Author: pdavidc

src/gov/nasa/worldwind/cache/ShapeDataCache.java

@@ -56,7 +56,7 @@ public static class ShapeDataCacheEntry extends AVListImpl
         public ShapeDataCacheEntry(DrawContext dc, long minExpiryTime, long maxExpiryTime)
         {
             this.timer = new TimedExpirySupport(Math.max(minExpiryTime, 0), Math.max(maxExpiryTime, 0));
-            this.globeStateKey = dc != null ? dc.getGlobe().getGlobeStateKey(dc) : null;
+            this.globeStateKey = dc != null ? dc.getGlobe().getGlobeStateKey() : null;
             this.verticalExaggeration = dc != null ? dc.getVerticalExaggeration() : 1d;
         }
 

src/gov/nasa/worldwind/util/ShapeEditor.java

@@ -21,6 +21,7 @@
 
 import java.awt.*;
 import java.awt.event.*;
+import java.beans.*;
 import java.util.*;
 import java.util.List;
 
@@ -40,7 +41,7 @@
  * @author tag
  * @version $Id: ShapeEditor.java 3423 2015-09-23 20:59:03Z tgaskins $
  */
-public class ShapeEditor implements SelectListener
+public class ShapeEditor implements SelectListener, PropertyChangeListener
 {
     // Control point purposes
     /**
@@ -680,6 +681,7 @@ protected void enable()
         this.updateControlPoints();
 
         this.getWwd().addSelectListener(this);
+        this.getWwd().getSceneController().addPropertyChangeListener(this);
     }
 
     /**
@@ -695,6 +697,7 @@ protected void disable()
         layers.remove(this.getShadowLayer());
 
         getWwd().removeSelectListener(this);
+        getWwd().getSceneController().removePropertyChangeListener(this);
 
         ((Component) this.getWwd()).setCursor(null);
     }
@@ -846,6 +849,28 @@ else if (dragEvent.getTopPickedObject().getParentLayer() == this.getControlPoint
         }
     }
 
+    /**
+     * The property change listener, the method called when a property of the Scene Controller changes
+     * (vertical exaggeration, etc.). Does not necessarily indicate a property associated with this editor.
+     *
+     * @param event the property change event indicating the property name and its associated value.
+     */
+    public void propertyChange(PropertyChangeEvent event)
+    {
+        if (event == null)
+        {
+            String msg = Logging.getMessage("nullValue.EventIsNull");
+            Logging.logger().log(java.util.logging.Level.FINE, msg);
+            throw new IllegalArgumentException(msg);
+        }
+
+        if (event.getPropertyName().equals(AVKey.VERTICAL_EXAGGERATION))
+        {
+            // The orientation line altitudes depend on the vertical exaggeration.
+            this.updateControlPoints();
+        }
+    }
+
     /**
      * Creates the shape that will remain at the same location and is the same size as the shape to be edited.
      */
@@ -1230,11 +1255,17 @@ protected void updateOrientationLine(Position centerPosition, Position controlPo
             rotationLine.setAltitudeMode(WorldWind.RELATIVE_TO_GROUND);
             rotationLine.setFollowTerrain(true);
 
-            // Add a little altitude so that the line isn't lost during depth buffering.
-            cAltitude = 100 + centerPosition.getAltitude() - this.getWwd().getModel().getGlobe().getElevation(
+            // Set the line's altitude relative to the ground.
+            cAltitude = centerPosition.getAltitude() - this.getWwd().getModel().getGlobe().getElevation(
                 centerPosition.getLatitude(), centerPosition.getLongitude());
-            rAltitude = 100 + controlPoint.getAltitude() - this.getWwd().getModel().getGlobe().getElevation(
+            rAltitude = controlPoint.getAltitude() - this.getWwd().getModel().getGlobe().getElevation(
                 controlPoint.getLatitude(), controlPoint.getLongitude());
+            // Path does not incorporate vertical exaggeration, but airspace shapes do. Compensate for that difference here.
+            cAltitude *= this.getWwd().getSceneController().getVerticalExaggeration();
+            rAltitude *= this.getWwd().getSceneController().getVerticalExaggeration();
+            // Add a little altitude so that the line isn't lost during depth buffering.
+            cAltitude += 100;
+            rAltitude += 100;
         }
         else if (this.getShapeAltitudeMode() == WorldWind.CLAMP_TO_GROUND)
         {

src/gov/nasa/worldwindx/examples/ShapeEditing.java

@@ -6,7 +6,7 @@
 
 package gov.nasa.worldwindx.examples;
 
-import gov.nasa.worldwind.WorldWind;
+import gov.nasa.worldwind.*;
 import gov.nasa.worldwind.avlist.AVKey;
 import gov.nasa.worldwind.event.*;
 import gov.nasa.worldwind.geom.*;
@@ -123,7 +123,7 @@ public AppFrame()
             sphere.setAttributes(attrs);
             sphere.setHighlightAttributes(highlightAttrs);
             sphere.setAltitudeDatum(AVKey.ABOVE_GROUND_LEVEL, AVKey.ABOVE_GROUND_LEVEL);
-            sphere.setAltitudes(1e4, 2e4);
+            sphere.setAltitude(1.5e4);
             layer.addRenderable(sphere);
 
             PartialCappedCylinder partialCylinder = new PartialCappedCylinder(LatLon.fromDegrees(40.5, -105), 5e4);
@@ -234,7 +234,7 @@ public void selected(SelectEvent event)
 
             if (event.getEventAction().equals(SelectEvent.LEFT_CLICK))
             {
-                if (topObject != null && topObject.getObject() instanceof Renderable)
+                if (topObject != null && this.isEditableShape(topObject.getObject()))
                 {
                     if (this.editor == null)
                     {
@@ -268,6 +268,11 @@ else if ((event.getMouseEvent().getModifiersEx() & MouseEvent.SHIFT_DOWN_MASK) =
             }
         }
 
+        protected boolean isEditableShape(Object object)
+        {
+            return object instanceof Airspace || object instanceof SurfaceShape;
+        }
+
         protected void keepShapeHighlighted(boolean tf)
         {
             if (tf)