projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosuilib: In display thread, set new state synchronously
[fw/altos]
/
altosuilib
/
AltosEepromMonitorUI.java
diff --git
a/altosuilib/AltosEepromMonitorUI.java
b/altosuilib/AltosEepromMonitorUI.java
index b72dfdf49757ae65dce59cf64b6d6a974e91e6ae..5f0df7d3ec1b4e3eab77c5ab8886b78bc717819b 100644
(file)
--- a/
altosuilib/AltosEepromMonitorUI.java
+++ b/
altosuilib/AltosEepromMonitorUI.java
@@
-15,12
+15,12
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altosuilib_
3
;
+package org.altusmetrum.altosuilib_
8
;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_
5
.*;
+import org.altusmetrum.altoslib_
8
.*;
public class AltosEepromMonitorUI extends AltosUIDialog implements AltosEepromMonitor {
JFrame owner;
public class AltosEepromMonitorUI extends AltosUIDialog implements AltosEepromMonitor {
JFrame owner;
@@
-167,15
+167,21
@@
public class AltosEepromMonitorUI extends AltosUIDialog implements AltosEepromMo
pos = lblock / 1000.0;
s = String.format("block %d", block);
} else {
pos = lblock / 1000.0;
s = String.format("block %d", block);
} else {
+ if (state == AltosLib.ao_flight_invalid)
+ state = 0;
if (state_block > 100)
state_block = 100;
if (state < min_state) state = min_state;
if (state_block > 100)
state_block = 100;
if (state < min_state) state = min_state;
- if (state >= max_state) state = max_state - 1;
+ if (state > max_state) state = max_state;
+
+ if (state == max_state)
+ state_block = 0;
+
state -= min_state;
int nstate = max_state - min_state;
state -= min_state;
int nstate = max_state - min_state;
- double spos = (double)
(state - min_state)
/ (double) nstate;
+ double spos = (double)
state
/ (double) nstate;
double bpos = state_block / 100.0;
pos = spos + bpos / nstate;
double bpos = state_block / 100.0;
pos = spos + bpos / nstate;