Changeset 202

Timestamp:

04/07/11 21:47:15 (14 months ago)

Author:

stefan

Message:

implemented issues #167, #249, #250, #251

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• src/org/jergometer/gui/MainWindow.java (modified) (3 diffs)
• src/org/jergometer/Jergometer.java (modified) (3 diffs)
• src/org/jergometer/model/BikeProgramTree.java (modified) (6 diffs)
• src/org/jergometer/UserSettings.java (modified) (3 diffs)

trunk/CHANGELOG

@@ -3 +3 @@
 
 == coming 0.7.10 ==
+
+2011-04-07
+* [stefan]  * fixed bug #249: incorrect distance and speed displayed (has to be devided by 10)
+            * implemented issue #167: mark real pulse red when pulse information is missing
+            * implemented issue #250: display units for distance, speed, power, ...
+            * implemented issue #251: select last training program after start
 
 2010-09-05

trunk/src/org/jergometer/gui/MainWindow.java

@@ -146 +146 @@
 
   public void setData(DataRecord dataRecord) {
-    pulseLabel.setText(dataRecord.getPulse() + "");
-    pedalRpmLabel.setText(dataRecord.getPedalRpm() + "");
-    speedLabel.setText(dataRecord.getSpeed() + "");
-    distanceLabel.setText(dataRecord.getDistance() + "");
-    destPowerLabel.setText(dataRecord.getDestPower() + "");
-    energyLabel.setText(dataRecord.getEnergy() + "");
+    if (dataRecord.getPulse() != 0) {
+      pulseLabel.setText(dataRecord.getPulse() + "");
+      pulseLabel.setForeground(Color.black);
+    } else {
+      pulseLabel.setText("?");
+      pulseLabel.setForeground(Color.red);
+    }
+    pedalRpmLabel.setText(dataRecord.getPedalRpm() + " rpm");
+    speedLabel.setText(String.format("%.1f km/h", (double) dataRecord.getSpeed() / 10));
+    distanceLabel.setText(String.format("%.1f km", (double) dataRecord.getDistance() / 10));
+    destPowerLabel.setText(dataRecord.getDestPower() + " W");
+    energyLabel.setText(dataRecord.getEnergy() + " kJ");
     timeLabel.setText(dataRecord.getTime());
-    realPowerLabel.setText(dataRecord.getRealPower() + "");
+    realPowerLabel.setText(dataRecord.getRealPower() + " W");
   }
 
@@ -477 +483 @@
               } catch (Exception e) {
                 JOptionPane.showMessageDialog(mainWindow, I18n.getString("msg.could_not_open_file.please_configure_editor"),
-                    I18n.getString("msg.could_not_open_xml_editor"), JOptionPane.ERROR_MESSAGE);
+                  I18n.getString("msg.could_not_open_xml_editor"), JOptionPane.ERROR_MESSAGE);
                 openSettingsWindow();
               }
@@ -486 +492 @@
               } catch (IOException e) {
                 JOptionPane.showMessageDialog(mainWindow, I18n.getString("msg.error_during_execution_of", command),
-                    I18n.getString("msg.could_not_open_xml_editor"), JOptionPane.ERROR_MESSAGE);
+                  I18n.getString("msg.could_not_open_xml_editor"), JOptionPane.ERROR_MESSAGE);
               } catch (InterruptedException ignored) {
               }

trunk/src/org/jergometer/Jergometer.java

@@ -15 +15 @@
 
 import javax.swing.*;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.TreePath;
 import java.awt.*;
 import java.awt.event.*;
@@ -224 +226 @@
     jergometerSettings.setLastUserName(userName);
     userSettings = new UserSettings(jergometerSettings.getLastUserName());
+    if (userSettings.getLastProgram() != null) {
+      DefaultMutableTreeNode programNode = programTree.getProgramNode(userSettings.getLastProgram());
+      final TreePath path = new TreePath(programNode.getPath());
+      SwingUtilities.invokeLater(new Runnable() {
+        @Override
+        public void run() {
+          mainWindow.getProgramTree().expandPath(path);
+          mainWindow.getProgramTree().getSelectionModel().setSelectionPath(path);
+          mainWindow.getProgramTree().scrollPathToVisible(path);
+        }
+      });
+    }
     userData = new UserData(jergometerSettings.getLastUserName(), programTree);
     String[] userNames = jergometerSettings.getUserNames().toArray(new String[jergometerSettings.getUserNames().size()]);
@@ -412 +426 @@
     filterSessions();
     visualizeBikeProgram(bikeProgram, bright, -1);
+
+    if (userSettings != null) {
+      userSettings.setLastProgram(bikeProgram.getProgramName());
+    }
   }
 

trunk/src/org/jergometer/model/BikeProgramTree.java

@@ -7 +7 @@
 import org.jergometer.translation.I18n;
 import org.jergometer.control.BikeProgram;
+import sun.security.action.GetPropertyAction;
 
 import javax.swing.text.MutableAttributeSet;
@@ -24 +25 @@
   /** Root element of the tree. */
   private DefaultMutableTreeNode root;
-  private HashMap<String,BikeProgram> allPrograms = new HashMap<String, BikeProgram>();
+  private HashMap<String,DefaultMutableTreeNode> allProgramNodes = new HashMap<String, DefaultMutableTreeNode>();
   private static final FileFilter FILE_FILTER = new FileFilter() {
     public boolean accept(File file) {
@@ -67 +68 @@
         BikeProgram program = new BikeProgram(file, relativePath, new BikeProgramData(doc.getRootElement()));
         newNode.setUserObject(program);
-        allPrograms.put(program.getProgramName(), program);
+        allProgramNodes.put(program.getProgramName(), newNode);
       } catch (Exception e) {
         System.err.println("Error parsing bike program.");
@@ -145 +146 @@
   }
 
+  public DefaultMutableTreeNode getProgramNode(String name) {
+    return allProgramNodes.get(name);
+  }
+
   /**
    * Returns the bike program by name.
@@ -152 +157 @@
    */
   public BikeProgram getProgram(String name) {
-    return allPrograms.get(name);
+    return (BikeProgram) allProgramNodes.get(name).getUserObject();
   }
 
@@ -206 +211 @@
       BikeProgram bikeProgram = (BikeProgram) node.getUserObject();
 
-      allPrograms.remove(bikeProgram.getProgramName());
+      allProgramNodes.remove(bikeProgram.getProgramName());
 
       // delete the program file

trunk/src/org/jergometer/UserSettings.java

@@ -27 +27 @@
   private void load() {
     File settingsFile = new File(JergometerSettings.jergometerUsersDirName + "/" + userName + "/settings.xml");
-    if (!settingsFile.exists()) {
+    if (settingsFile.exists()) {
       // default settings
       XMLParser parser = new XMLParser();
@@ -36 +36 @@
         XMLElement users = root.getChildElement("programs");
         lastProgram = users.getAttribute("lastprogram");
-      } catch (Exception e) {
+      } catch (Exception ignored) {
       }
     }
@@ -60 +60 @@
       writer.write(doc.toString());
       writer.close();
-    } catch (IOException e) {
+    } catch (IOException ignored) {
     }
   }