minor fix to not show NULL
authorBill Kuker <bkuker@billkuker.com>
Sun, 24 Oct 2010 22:34:34 +0000 (22:34 +0000)
committerBill Kuker <bkuker@billkuker.com>
Sun, 24 Oct 2010 22:34:34 +0000 (22:34 +0000)
src/com/billkuker/rocketry/motorsim/visual/Chart.java

index 2020bddbf73db0112ab95f16d29664a2a8944e71..97eb6df2d9cb9684388840ca2c2357db5b6567ae 100644 (file)
@@ -138,7 +138,10 @@ public class Chart<X extends Quantity, Y extends Quantity> extends JPanel {
                        marker = new ValueMarker(m.doubleValue(xUnit));\r
                        marker.setPaint(Color.blue);\r
                        marker.setAlpha(0.8f);\r
-                       marker.setLabel(RocketScience.approx(getNear(m)));\r
+                       \r
+                       Amount<Y> val = getNear(m);\r
+                       if ( val != null )\r
+                               marker.setLabel(RocketScience.approx(val));\r
                        \r
                        marker.setLabelTextAnchor(TextAnchor.TOP_LEFT);\r
                        marker.setLabelOffset(new RectangleInsets(0,-5,0,0));\r
@@ -181,7 +184,6 @@ public class Chart<X extends Quantity, Y extends Quantity> extends JPanel {
                                final double higherY = s.getY(idxH).doubleValue();\r
                                final double y = lowerY + dist * (higherY - lowerY);\r
                                \r
-                               \r
                                return Amount.valueOf( y, yUnit);\r
                        }\r
                }\r