X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosEepromMonitor.java;h=ce1c16255c3484ecb9ac371513df40487410f807;hp=daf8d0ba28d9e68ee49c74f63c118a5ca46e588a;hb=9a4c2c7fc6af922d052e23a1b99bf847fbf9b0e9;hpb=708e7937cba52982b91244cf89bfbff46d346135

diff --git a/altosui/AltosEepromMonitor.java b/altosui/AltosEepromMonitor.java
index daf8d0ba..ce1c1625 100644
--- a/altosui/AltosEepromMonitor.java
+++ b/altosui/AltosEepromMonitor.java
@@ -15,21 +15,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package AltosUI;
+package altosui;
 
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
-import java.util.concurrent.LinkedBlockingQueue;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altosuilib_2.*;
 
-public class AltosEepromMonitor extends AltosDialog {
+public class AltosEepromMonitor extends AltosUIDialog {
 
 	Container	pane;
 	Box		box;
@@ -108,7 +101,7 @@ public class AltosEepromMonitor extends AltosDialog {
 		max_state = in_max_state;
 		pbar = new JProgressBar();
 		pbar.setMinimum(0);
-		pbar.setMaximum((max_state - min_state) * 100);
+		pbar.setMaximum(1000);
 		pbar.setValue(0);
 		pbar.setString("startup");
 		pbar.setStringPainted(true);
@@ -142,30 +135,28 @@ public class AltosEepromMonitor extends AltosDialog {
 		cancel.addActionListener(l);
 	}
 
-	private void set_value_internal(String state_name, int in_state, int in_block) {
-		int block = in_block;
-		int state = in_state;
-
-		if (block > 100)
-			block = 100;
+	private void set_value_internal(String state_name, int state, int state_block, int block) {
+		if (state_block > 100)
+			state_block = 100;
 		if (state < min_state) state = min_state;
 		if (state >= max_state) state = max_state - 1;
 		state -= min_state;
 
-		int pos = state * 100 + block;
+		int pos = state * 100 + state_block;
 
-		pbar.setString(state_name);
+		pbar.setString(String.format("block %d state %s", block, state_name));
 		pbar.setValue(pos);
 	}
 
-	public void set_value(String in_state_name, int in_state, int in_block) {
+	public void set_value(String in_state_name, int in_state, int in_state_block, int in_block) {
 		final String state_name = in_state_name;
 		final int state = in_state;
+		final int state_block = in_state_block;
 		final int block = in_block;
 		Runnable r = new Runnable() {
 				public void run() {
 					try {
-						set_value_internal(state_name, state, block);
+						set_value_internal(state_name, state, state_block, block);
 					} catch (Exception ex) {
 					}
 				}
@@ -242,7 +233,7 @@ public class AltosEepromMonitor extends AltosDialog {
 	}
 
 	private void reset_internal() {
-		set_value_internal("startup",min_state,0);
+		set_value_internal("startup",min_state,0, 0);
 		set_flight_internal(0);
 		set_file_internal("");
 	}