projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Ship TeleMega-v1.0 firmware
[fw/altos]
/
altosui
/
AltosGraph.java
diff --git
a/altosui/AltosGraph.java
b/altosui/AltosGraph.java
index a73e3fd8ee2837e67df4e23e02ba86543afb6386..c505d2d8c5dc41771b9cc1d07bd03e8afece8f0e 100644
(file)
--- a/
altosui/AltosGraph.java
+++ b/
altosui/AltosGraph.java
@@
-22,7
+22,7
@@
import java.util.ArrayList;
import java.awt.*;
import javax.swing.*;
import java.awt.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_
1
.*;
+import org.altusmetrum.altoslib_
2
.*;
import org.altusmetrum.altosuilib_1.*;
import org.jfree.ui.*;
import org.altusmetrum.altosuilib_1.*;
import org.jfree.ui.*;
@@
-37,76
+37,92
@@
import org.jfree.data.*;
class AltosVoltage extends AltosUnits {
class AltosVoltage extends AltosUnits {
- public double value(double v) {
+ public double value(double v
, boolean imperial_units
) {
return v;
}
return v;
}
- public String show_units() {
+ public double inverse(double v, boolean imperial_units) {
+ return v;
+ }
+
+ public String show_units(boolean imperial_units) {
return "V";
}
return "V";
}
- public String say_units() {
+ public String say_units(
boolean imperial_units
) {
return "volts";
}
return "volts";
}
- public int show_fraction(int width) {
+ public int show_fraction(int width
, boolean imperial_units
) {
return width / 2;
}
}
class AltosNsat extends AltosUnits {
return width / 2;
}
}
class AltosNsat extends AltosUnits {
- public double value(double v) {
+ public double value(double v, boolean imperial_units) {
+ return v;
+ }
+
+ public double inverse(double v, boolean imperial_units) {
return v;
}
return v;
}
- public String show_units() {
+ public String show_units(
boolean imperial_units
) {
return "Sats";
}
return "Sats";
}
- public String say_units() {
+ public String say_units(
boolean imperial_units
) {
return "Satellites";
}
return "Satellites";
}
- public int show_fraction(int width) {
+ public int show_fraction(int width
, boolean imperial_units
) {
return 0;
}
}
class AltosPressure extends AltosUnits {
return 0;
}
}
class AltosPressure extends AltosUnits {
- public double value(double p) {
+ public double value(double p
, boolean imperial_units
) {
return p;
}
return p;
}
- public String show_units() {
+ public double inverse(double p, boolean imperial_units) {
+ return p;
+ }
+
+ public String show_units(boolean imperial_units) {
return "Pa";
}
return "Pa";
}
- public String say_units() {
+ public String say_units(
boolean imperial_units
) {
return "pascals";
}
return "pascals";
}
- public int show_fraction(int width) {
+ public int show_fraction(int width
, boolean imperial_units
) {
return 0;
}
}
class AltosDbm extends AltosUnits {
return 0;
}
}
class AltosDbm extends AltosUnits {
- public double value(double d) {
+ public double value(double d, boolean imperial_units) {
+ return d;
+ }
+
+ public double inverse(double d, boolean imperial_units) {
return d;
}
return d;
}
- public String show_units() {
+ public String show_units(
boolean imperial_units
) {
return "dBm";
}
return "dBm";
}
- public String say_units() {
+ public String say_units(
boolean imperial_units
) {
return "D B M";
}
return "D B M";
}
- public int show_fraction(int width) {
+ public int show_fraction(int width
, boolean imperial_units
) {
return 0;
}
}
return 0;
}
}