1,7 → 1,6 |
package dongfang.mkt.ui.offscreendisplay; |
|
import java.awt.BorderLayout; |
import java.awt.Font; |
import java.awt.GridLayout; |
import java.util.Formatter; |
import java.util.Locale; |
18,22 → 17,15 |
import dongfang.mkt.frames.OSDDataResponseFrame; |
|
public class VariousInfoPane extends JPanel implements OSDDataConsumer { |
|
static class BigLabel extends JLabel { |
public BigLabel() { |
super(); |
setFont(getFont().deriveFont(Font.BOLD, 16)); |
} |
} |
|
class PositionsPanel extends JPanel implements OSDDataConsumer { |
class CurrentPositionPanel extends JPanel { |
BigLabel lat; |
BigLabel lon; |
JLabel lat; |
JLabel lon; |
|
void init() { |
lat = new BigLabel(); |
lon = new BigLabel(); |
lat = new JLabel(); |
lon = new JLabel(); |
} |
|
int getNumRows() { |
55,11 → 47,11 |
} |
|
class HomePositionPanel extends CurrentPositionPanel { |
BigLabel home; |
JLabel home; |
|
void init() { |
super.init(); |
home = new BigLabel(); |
home = new JLabel(); |
} |
|
int getNumRows() { |
126,16 → 118,16 |
|
class HeightsPanel extends JPanel implements OSDDataConsumer { |
class HeightPanel extends JPanel implements OSDDataConsumer { |
BigLabel baroHeight; |
BigLabel GPSHeight; |
BigLabel baroVVI; |
BigLabel GPSVVI; |
JLabel baroHeight; |
JLabel GPSHeight; |
JLabel baroVVI; |
JLabel GPSVVI; |
|
void init() { |
baroHeight = new BigLabel(); |
GPSHeight = new BigLabel(); |
baroVVI = new BigLabel(); |
GPSVVI = new BigLabel(); |
baroHeight = new JLabel(); |
GPSHeight = new JLabel(); |
baroVVI = new JLabel(); |
GPSVVI = new JLabel(); |
} |
|
int getNumRows() { |
211,14 → 203,14 |
} |
|
class SpeedHeadingPanel extends JPanel implements OSDDataConsumer { |
BigLabel noseDirection; |
BigLabel flightDirection; |
BigLabel speed; |
JLabel noseDirection; |
JLabel flightDirection; |
JLabel speed; |
|
void init() { |
noseDirection = new BigLabel(); |
flightDirection = new BigLabel(); |
speed = new BigLabel(); |
noseDirection = new JLabel(); |
flightDirection = new JLabel(); |
speed = new JLabel(); |
Border b = BorderFactory.createTitledBorder( |
BorderFactory.createEtchedBorder(), "Speed and heading"); |
setBorder(b); |
261,7 → 253,6 |
class StatusPanel extends JPanel implements OSDDataConsumer { |
JProgressBar dataAgeProgress; |
JProgressBar battery; |
BigLabel numberOfSatellites; |
|
long dataTime = 0; |
|
268,7 → 259,6 |
void init() { |
dataAgeProgress = new JProgressBar(0, 5000); |
battery = new JProgressBar(100, 130); |
numberOfSatellites = new BigLabel(); |
|
//dataAgeProgress.setEnabled(false); |
Border b = BorderFactory.createTitledBorder( |
292,7 → 282,7 |
} |
|
int getNumRows() { |
return 3; |
return 2; |
} |
|
void layoutSubs() { |
300,8 → 290,6 |
add(dataAgeProgress); |
add(new JLabel("Battery")); |
add(battery); |
add(new JLabel("Satellites")); |
add(numberOfSatellites); |
} |
|
StatusPanel() { |
315,7 → 303,6 |
return; |
dataTime = System.currentTimeMillis(); |
battery.setValue(data.getBatteryVoltage()); |
numberOfSatellites.setText("" + data.getNumberOfSatellites()); |
} |
} |
|