*
* 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
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_4;
+package org.altusmetrum.altoslib_14;
import java.io.File;
import java.util.*;
return String.format("-via-%04d", receiver);
}
+ static private String label(int flight) {
+ if (flight < 0)
+ return "corrupt";
+ else
+ return "flight";
+ }
+
+ static private int flight(int flight) {
+ if (flight < 0)
+ return -flight;
+ return flight;
+ }
+
public AltosFile(int year, int month, int day, int serial, int flight, int receiver, String extension) {
super (AltosPreferences.logdir(),
- String.format("%04d-%02d-%02d-serial-%s-flight-%s%s.%s",
- year, month, day, number(serial), number(flight), receiver(receiver), extension));
+ String.format("%04d-%02d-%02d-serial-%s-%s-%s%s.%s",
+ year, month, day, number(serial), label(flight), number(flight(flight)), receiver(receiver), extension));
}
public AltosFile(int year, int month, int day, int serial, int flight, String extension) {
extension);
}
- public AltosFile(AltosState state) {
- this(state.serial, state.flight, state.receiver_serial, "telem");
+ public AltosFile(AltosCalData cal_data) {
+ this(cal_data.serial, cal_data.flight, cal_data.receiver_serial, "telem");
}
}