altosuilib: Set graph title to include product/serial/flight info

[fw/altos] / altosuilib / AltosUIAxis.java

diff --git a/altosuilib/AltosUIAxis.java b/altosuilib/AltosUIAxis.java
index 8ec8a11488876b22816ebcb09ec38149a220f8de..e8c315182fb0255467f6a31c485b2c3416b9f1d8 100644 (file)
--- a/altosuilib/AltosUIAxis.java
+++ b/altosuilib/AltosUIAxis.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -48,11 +49,14 @@ public class AltosUIAxis extends NumberAxis {
        public final static int axis_default = axis_include_zero;
 
        public void set_units() {
-               String u = units.parse_units();
-               if (u != null)
-                       setLabel(String.format("%s (%s)", label, u));
-               else
-                       setLabel(label);
+               if (units != null) {
+                       String u = units.parse_units();
+                       if (u != null) {
+                               setLabel(String.format("%s (%s)", label, u));
+                               return;
+                       }
+               }
+               setLabel(label);
        }
 
        public void set_enable(boolean enable) {