Changeset 212

Timestamp:

04/09/11 21:48:38 (14 months ago)

Author:

stefan

Message:

replaced output of statistics by velocity templates; implemented issue #253: allow to switch between kJ and kcal

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• lib/velocity-1.7-dep.jar (added)
• src-test/Browser.java (added)
• src-test/templates (added)
• src-test/templates/HelloWorld.vm (added)
• src-test/velocity (added)
• src-test/velocity/HelloWorld.java (added)
• src/org/jergometer/communication/BikeConnectionTester.java (modified) (2 diffs)
• src/org/jergometer/communication/BikeConnector.java (modified) (3 diffs)
• src/org/jergometer/communication/BikeConnectorSimulator.java (added)
• src/org/jergometer/communication/BikeReader.java (added)
• src/org/jergometer/communication/BikeWriter.java (added)
• src/org/jergometer/communication/FileRecorder.java (added)
• src/org/jergometer/communication/KetterBikeConnector.java (moved) (moved from trunk/src/org/jergometer/communication/BikeConnectorSerial.java) (4 diffs)
• src/org/jergometer/communication/KettlerBikeReader.java (copied) (copied from trunk/src/org/jergometer/communication/BikeReader.java) (2 diffs)
• src/org/jergometer/communication/KettlerBikeWriter.java (copied) (copied from trunk/src/org/jergometer/communication/BikeWriter.java) (2 diffs)
• src/org/jergometer/gui/BikeInfoPane.java (added)
• src/org/jergometer/gui/MainWindow.form (modified) (3 diffs)
• src/org/jergometer/gui/MainWindow.java (modified) (12 diffs)
• src/org/jergometer/gui/SettingsWindow.java (modified) (2 diffs)
• src/org/jergometer/gui/templates (added)
• src/org/jergometer/gui/templates/default_de.vm (added)
• src/org/jergometer/gui/templates/default.vm (added)
• src/org/jergometer/Jergometer.java (modified) (1 diff)
• src/org/jergometer/JergometerTestConsole.java (modified) (3 diffs)
• src/velocity.properties (added)

trunk/CHANGELOG

@@ -6 +6 @@
             * implemented issue #247: display error message when JErgometer is started without RXTX library
             * implemented issue #252: rename all occurrences of "COM port" to "serial port"
+            * implemented issue #253: allow to switch between kJ and kcal
 
 == 0.7.11 ==

trunk/src/org/jergometer/communication/BikeConnectionTester.java

@@ -25 +25 @@
   private SerialPort serialPort;
   private BufferedReader reader = null;
-  private BikeWriter writer = null;
+  private KettlerBikeWriter writer = null;
 
   private State state = State.init;
@@ -73 +73 @@
 
     // set reader and writer
-    writer = new BikeWriter(serialPort.getOutputStream());
+    writer = new KettlerBikeWriter(serialPort.getOutputStream());
     RXTXReader rxtxReader = new RXTXReader(serialPort);
     reader = new BufferedReader(new InputStreamReader(rxtxReader));

trunk/src/org/jergometer/communication/BikeConnector.java

@@ -10 +10 @@
 public interface BikeConnector extends Closeable {
   /**
-   * Returns the reader reading receiving from the XUP board.
+   * Returns the reader receiving messages from the ergometer.
    *
    * @return reader
@@ -17 +17 @@
 
   /**
-   * Returns the writer sending messages to the the XUP board.
+   * Returns the writer sending messages to the ergometer.
    *
    * @return writer
@@ -24 +24 @@
 
   /**
-   * Closes the connection to the XUP board.
+   * Closes the connection to the ergometer.
    */
   public void close() throws IOException;

trunk/src/org/jergometer/communication/KetterBikeConnector.java

@@ -9 +9 @@
 import org.jergometer.translation.I18n;
 
-import javax.swing.*;
-
 /**
- * BikeConnectorSerial connects to the bike via serial port (e.g. RS232 or USB).
+ * KetterBikeConnector connects to the bike via serial port (e.g. RS232 or USB).
  * It is used to receive data from the bike and to control it.
  */
-public class BikeConnectorSerial implements BikeConnector {
+public class KetterBikeConnector implements BikeConnector {
 
 // static
@@ -50 +48 @@
 
   private SerialPort serialPort;
-  private BikeReader reader = null;
-  private BikeWriter writer = null;
+  private KettlerBikeReader reader = null;
+  private KettlerBikeWriter writer = null;
 
-  public BikeConnectorSerial(String serialName) throws BikeException, UnsupportedCommOperationException, IOException {
+  public KetterBikeConnector(String serialName) throws BikeException, UnsupportedCommOperationException, IOException {
     connect(serialName);
   }
@@ -86 +84 @@
 
     // set reader and writer
-    writer = new BikeWriter(serialPort.getOutputStream());
+    writer = new KettlerBikeWriter(serialPort.getOutputStream());
     RXTXReader rxtxReader = new RXTXReader(serialPort);
-    reader = new BikeReader(rxtxReader);
+    reader = new KettlerBikeReader(rxtxReader);
   }
 
@@ -112 +110 @@
 
 // getters and setters
-  public BikeReader getReader() {
+  public KettlerBikeReader getReader() {
     return reader;
   }
 
-  public BikeWriter getWriter() {
+  public KettlerBikeWriter getWriter() {
     return writer;
   }

trunk/src/org/jergometer/communication/KettlerBikeReader.java

@@ -12 +12 @@
  * It reads incoming messages from the bike.
  */
-public class BikeReader extends Thread {
+public class KettlerBikeReader extends Thread implements BikeReader {
 
 // static
@@ -36 +36 @@
    * @param in input stream
    */
-  public BikeReader(InputStream in) {
+  public KettlerBikeReader(InputStream in) {
     this.inStream = in;
     this.in = new BufferedReader(new InputStreamReader(inStream), 1);

trunk/src/org/jergometer/communication/KettlerBikeWriter.java

@@ -8 +8 @@
  * It writes messages to the bike.
  */
-public class BikeWriter {
+public class KettlerBikeWriter implements BikeWriter {
 
 // static
@@ -30 +30 @@
    * @param out output stream
    */
-  public BikeWriter(OutputStream out) {
+  public KettlerBikeWriter(OutputStream out) {
     this.out = new DataOutputStream(out);
   }

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

@@ -99 +99 @@
               <grid id="e65ca" layout-manager="GridBagLayout">
                 <constraints>
-                  <grid row="0" column="2" row-span="3" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+                  <grid row="0" column="3" row-span="3" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
                   <gridbag top="0" left="0" bottom="0" right="10" weightx="0.0" weighty="0.0"/>
                 </constraints>
@@ -106 +106 @@
                   <font/>
                 </border>
-                <children>
-                  <component id="dc8ff" class="javax.swing.JLabel">
-                    <constraints>
-                      <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
-                      <gridbag top="5" left="5" bottom="5" right="5" weightx="0.0" weighty="0.0"/>
-                    </constraints>
-                    <properties>
-                      <text resource-bundle="org/jergometer/translation/jergometer" key="property.pulse"/>
-                    </properties>
-                  </component>
-                  <component id="49de1" class="javax.swing.JLabel">
-                    <constraints>
-                      <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
-                      <gridbag top="5" left="5" bottom="5" right="5" weightx="0.0" weighty="0.0"/>
-                    </constraints>
-                    <properties>
-                      <text resource-bundle="org/jergometer/translation/jergometer" key="property.pedal_rpm"/>
-                    </properties>
-                  </component>
-                  <component id="e3555" class="javax.swing.JLabel">
-                    <constraints>
-                      <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
-                      <gridbag top="5" left="5" bottom="5" right="5" weightx="0.0" weighty="0.0"/>
-                    </constraints>
-                    <properties>
-                      <text resource-bundle="org/jergometer/translation/jergometer" key="property.speed"/>
-                    </properties>
-                  </component>
-                  <component id="6ef9f" class="javax.swing.JLabel">
-                    <constraints>
-                      <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
-                      <gridbag top="5" left="5" bottom="5" right="5" weightx="0.0" weighty="0.0"/>
-                    </constraints>
-                    <properties>
-                      <text resource-bundle="org/jergometer/translation/jergometer" key="property.distance"/>
-                    </properties>
-                  </component>
-                  <component id="ed697" class="javax.swing.JLabel">
-                    <constraints>
-                      <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
-                      <gridbag top="5" left="5" bottom="5" right="5" weightx="0.0" weighty="0.0"/>
-                    </constraints>
-                    <properties>
-                      <text resource-bundle="org/jergometer/translation/jergometer" key="property.dest_power"/>
-                    </properties>
-                  </component>
-                  <component id="2f0fd" class="javax.swing.JLabel">
-                    <constraints>
-                      <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
-                      <gridbag top="5" left="5" bottom="5" right="5" weightx="0.0" weighty="0.0"/>
-                    </constraints>
-                    <properties>
-                      <text resource-bundle="org/jergometer/translation/jergometer" key="property.energy"/>
-                    </properties>
-                  </component>
-                  <component id="6d1d6" class="javax.swing.JLabel">
-                    <constraints>
-                      <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
-                      <gridbag top="5" left="5" bottom="5" right="5" weightx="0.0" weighty="0.0"/>
-                    </constraints>
-                    <properties>
-                      <text resource-bundle="org/jergometer/translation/jergometer" key="property.time"/>
-                    </properties>
-                  </component>
-                  <component id="a2637" class="javax.swing.JLabel">
-                    <constraints>
-                      <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
-                      <gridbag top="5" left="5" bottom="5" right="5" weightx="0.0" weighty="0.0"/>
-                    </constraints>
-                    <properties>
-                      <text resource-bundle="org/jergometer/translation/jergometer" key="property.real_power"/>
-                    </properties>
-                  </component>
-                  <component id="354a" class="javax.swing.JLabel" binding="destPowerLabel">
-                    <constraints>
-                      <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-                      <gridbag top="5" left="5" bottom="5" right="5" weightx="0.0" weighty="0.0"/>
-                    </constraints>
-                    <properties>
-                      <text value="-"/>
-                    </properties>
-                  </component>
-                  <component id="7b970" class="javax.swing.JLabel" binding="pulseLabel">
-                    <constraints>
-                      <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-                      <gridbag top="5" left="5" bottom="5" right="5" weightx="0.0" weighty="0.0"/>
-                    </constraints>
-                    <properties>
-                      <text value="-"/>
-                    </properties>
-                  </component>
-                  <component id="1f67f" class="javax.swing.JLabel" binding="pedalRpmLabel">
-                    <constraints>
-                      <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-                      <gridbag top="5" left="5" bottom="5" right="5" weightx="0.0" weighty="0.0"/>
-                    </constraints>
-                    <properties>
-                      <text value="-"/>
-                    </properties>
-                  </component>
-                  <component id="2e3af" class="javax.swing.JLabel" binding="speedLabel">
-                    <constraints>
-                      <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-                      <gridbag top="5" left="5" bottom="5" right="5" weightx="0.0" weighty="0.0"/>
-                    </constraints>
-                    <properties>
-                      <text value="-"/>
-                    </properties>
-                  </component>
-                  <component id="e5e59" class="javax.swing.JLabel" binding="distanceLabel">
-                    <constraints>
-                      <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-                      <gridbag top="5" left="5" bottom="5" right="5" weightx="0.0" weighty="0.0"/>
-                    </constraints>
-                    <properties>
-                      <text value="-"/>
-                    </properties>
-                  </component>
-                  <component id="a54fc" class="javax.swing.JLabel" binding="energyLabel">
-                    <constraints>
-                      <grid row="5" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-                      <gridbag top="5" left="5" bottom="5" right="5" weightx="0.0" weighty="0.0"/>
-                    </constraints>
-                    <properties>
-                      <text value="-"/>
-                    </properties>
-                  </component>
-                  <component id="225d8" class="javax.swing.JLabel" binding="timeLabel">
-                    <constraints>
-                      <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-                      <gridbag top="5" left="5" bottom="5" right="5" weightx="0.0" weighty="0.0"/>
-                    </constraints>
-                    <properties>
-                      <text value="-"/>
-                    </properties>
-                  </component>
-                  <component id="4b725" class="javax.swing.JLabel" binding="realPowerLabel">
-                    <constraints>
-                      <grid row="7" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-                      <gridbag top="5" left="5" bottom="5" right="5" weightx="0.0" weighty="0.0"/>
-                    </constraints>
-                    <properties>
-                      <text value="-"/>
-                    </properties>
-                  </component>
-                </children>
+                <children/>
               </grid>
               <component id="e6b31" class="javax.swing.JLabel" binding="welcomeLabel">
@@ -287 +142 @@
                 </children>
               </grid>
+              <component id="c6a78" class="org.jergometer.gui.BikeInfoPane" binding="bikeInfoPane" custom-create="true">
+                <constraints>
+                  <grid row="0" column="2" row-span="3" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                  <gridbag weightx="0.0" weighty="0.0"/>
+                </constraints>
+                <properties>
+                  <background swing-color="Label.background"/>
+                  <contentType value="text/html"/>
+                  <editable value="false"/>
+                  <enabled value="true"/>
+                  <text value="&lt;html&gt;&#10;  &lt;head&gt;&#10;&#10;  &lt;/head&gt;&#10;  &lt;body&gt;&#10;    &lt;p style=&quot;margin-top: 0&quot;&gt;&#10;      &#10;    &lt;/p&gt;&#10;  &lt;/body&gt;&#10;&lt;/html&gt;&#10;"/>
+                </properties>
+                <clientProperties>
+                  <JEditorPane.honorDisplayProperties class="java.lang.Boolean" value="true"/>
+                </clientProperties>
+              </component>
             </children>
           </grid>

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

@@ -1 +1 @@
 package org.jergometer.gui;
 
+import de.endrullis.utils.VelocityUtils;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
+import org.apache.velocity.context.Context;
+import org.apache.velocity.exception.ResourceNotFoundException;
 import org.jergometer.Jergometer;
 import org.jergometer.control.BikeProgram;
@@ -16 +22 @@
 import java.awt.event.*;
 import java.util.ArrayList;
+import java.util.Locale;
 import java.util.ResourceBundle;
 import java.util.Enumeration;
@@ -28 +35 @@
  */
 public class MainWindow extends JFrame implements ActionListener, TreeSelectionListener, ListSelectionListener, KeyListener {
+  private static double kcalFactor = 0.239005736;
+
   private JPanel mainPanel;
-  private JLabel pulseLabel;
-  private JLabel speedLabel;
-  private JLabel distanceLabel;
-  private JLabel destPowerLabel;
-  private JLabel pedalRpmLabel;
-  private JLabel energyLabel;
-  private JLabel timeLabel;
-  private JLabel realPowerLabel;
   private Diagram diagram;
   private JTable sessionTable;
@@ -43 +44 @@
   private JButton recordButton;
   private JButton stopButton;
+  private BikeInfoPane bikeInfoPane;
 
   // menu items
@@ -71 +73 @@
   private DefaultMutableTreeNode copiedProgramNode = null;
   private boolean movePrograms = false;
+  private DataRecord lastDataRecord;
+  private boolean kcal = false;
 
   /**
@@ -91 +95 @@
     super(title);
     this.jergometer = jergometer;
+    $$$setupUI$$$();
     setContentPane(mainPanel);
     createPopups();
@@ -107 +112 @@
     programTree.getInputMap().getParent().remove(KeyStroke.getKeyStroke("control A"));
     programTree.setCellRenderer(new BetterTreeCellRenderer());
+
+    // reset bikeInfoPane
+    bikeInfoPane.resetValues();
 
     // add listener
@@ -146 +154 @@
 
   public void setData(DataRecord dataRecord) {
-    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() + " W");
+    lastDataRecord = dataRecord;
+
+    updateBikeInfoPane(dataRecord);
+  }
+
+  public void updateBikeInfoPane(DataRecord dataRecord) {
+    if (dataRecord == null) return;
+
+    VelocityContext context = new VelocityContext();
+    context.put("pulse", dataRecord.getPulse());
+    context.put("pulseString", dataRecord.getPulse() == 0 ? "?" : "" + dataRecord.getPulse());
+    context.put("pedalRpm", dataRecord.getPedalRpm());
+    context.put("pedalRpmString", dataRecord.getPedalRpm() + " rpm");
+    context.put("speed", dataRecord.getSpeed());
+    context.put("speedString", String.format("%.1f km/h", (double) dataRecord.getSpeed() / 10));
+    context.put("distance", dataRecord.getDistance());
+    context.put("distanceString", dataRecord.getDistance() + " km");
+    context.put("destPower", dataRecord.getDestPower());
+    context.put("destPowerString", dataRecord.getDestPower() + " W");
+    context.put("actPower", dataRecord.getRealPower());
+    context.put("actPowerString", dataRecord.getRealPower() + " W");
+    context.put("energy", dataRecord.getEnergy());
+    String energyString = dataRecord.getEnergy() + " kJ";
+    if (kcal) {
+      energyString = ((int) (dataRecord.getEnergy() * kcalFactor)) + " kcal";
+    }
+    context.put("energyString", energyString);
+    context.put("timeString", dataRecord.getTime());
+
+    bikeInfoPane.setContext(context);
+  }
+
+  public void bikeInfoPaneAction(String action) {
+    if (action.equals("energy")) {
+      kcal = !kcal;
+      updateBikeInfoPane(lastDataRecord);
+    }
   }
 
@@ -804 +835 @@
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    $$$setupUI$$$();
+  public void createUIComponents() {
+    try {
+      bikeInfoPane = new BikeInfoPane(this, getLangTemplate("org/jergometer/gui/templates/default"));
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+  }
+
+  private Template getLangTemplate(String templateName) throws Exception {
+    String cc = Locale.getDefault().getCountry().toLowerCase();
+    try {
+      return VelocityUtils.getTemplate(templateName + "_" + cc + ".vm");
+    } catch (ResourceNotFoundException e) {
+      return VelocityUtils.getTemplate(templateName + ".vm");
+    }
   }
 
@@ -819 +860 @@
    */
   private void $$$setupUI$$$() {
+    createUIComponents();
     mainPanel = new JPanel();
     mainPanel.setLayout(new GridBagLayout());
@@ -895 +937 @@
     panel4.setLayout(new GridBagLayout());
     gbc = new GridBagConstraints();
-    gbc.gridx = 2;
+    gbc.gridx = 3;
     gbc.gridy = 0;
     gbc.gridheight = 3;
     gbc.insets = new Insets(0, 0, 0, 10);
     panel1.add(panel4, gbc);
-    final JLabel label1 = new JLabel();
-    this.$$$loadLabelText$$$(label1, ResourceBundle.getBundle("org/jergometer/translation/jergometer").getString("property.pulse"));
-    gbc = new GridBagConstraints();
-    gbc.gridx = 0;
-    gbc.gridy = 0;
-    gbc.anchor = GridBagConstraints.EAST;
-    gbc.insets = new Insets(5, 5, 5, 5);
-    panel4.add(label1, gbc);
-    final JLabel label2 = new JLabel();
-    this.$$$loadLabelText$$$(label2, ResourceBundle.getBundle("org/jergometer/translation/jergometer").getString("property.pedal_rpm"));
-    gbc = new GridBagConstraints();
-    gbc.gridx = 0;
-    gbc.gridy = 1;
-    gbc.anchor = GridBagConstraints.EAST;
-    gbc.insets = new Insets(5, 5, 5, 5);
-    panel4.add(label2, gbc);
-    final JLabel label3 = new JLabel();
-    this.$$$loadLabelText$$$(label3, ResourceBundle.getBundle("org/jergometer/translation/jergometer").getString("property.speed"));
-    gbc = new GridBagConstraints();
-    gbc.gridx = 0;
-    gbc.gridy = 2;
-    gbc.anchor = GridBagConstraints.EAST;
-    gbc.insets = new Insets(5, 5, 5, 5);
-    panel4.add(label3, gbc);
-    final JLabel label4 = new JLabel();
-    this.$$$loadLabelText$$$(label4, ResourceBundle.getBundle("org/jergometer/translation/jergometer").getString("property.distance"));
-    gbc = new GridBagConstraints();
-    gbc.gridx = 0;
-    gbc.gridy = 3;
-    gbc.anchor = GridBagConstraints.EAST;
-    gbc.insets = new Insets(5, 5, 5, 5);
-    panel4.add(label4, gbc);
-    final JLabel label5 = new JLabel();
-    this.$$$loadLabelText$$$(label5, ResourceBundle.getBundle("org/jergometer/translation/jergometer").getString("property.dest_power"));
-    gbc = new GridBagConstraints();
-    gbc.gridx = 0;
-    gbc.gridy = 4;
-    gbc.anchor = GridBagConstraints.EAST;
-    gbc.insets = new Insets(5, 5, 5, 5);
-    panel4.add(label5, gbc);
-    final JLabel label6 = new JLabel();
-    this.$$$loadLabelText$$$(label6, ResourceBundle.getBundle("org/jergometer/translation/jergometer").getString("property.energy"));
-    gbc = new GridBagConstraints();
-    gbc.gridx = 0;
-    gbc.gridy = 5;
-    gbc.anchor = GridBagConstraints.EAST;
-    gbc.insets = new Insets(5, 5, 5, 5);
-    panel4.add(label6, gbc);
-    final JLabel label7 = new JLabel();
-    this.$$$loadLabelText$$$(label7, ResourceBundle.getBundle("org/jergometer/translation/jergometer").getString("property.time"));
-    gbc = new GridBagConstraints();
-    gbc.gridx = 0;
-    gbc.gridy = 6;
-    gbc.anchor = GridBagConstraints.EAST;
-    gbc.insets = new Insets(5, 5, 5, 5);
-    panel4.add(label7, gbc);
-    final JLabel label8 = new JLabel();
-    this.$$$loadLabelText$$$(label8, ResourceBundle.getBundle("org/jergometer/translation/jergometer").getString("property.real_power"));
-    gbc = new GridBagConstraints();
-    gbc.gridx = 0;
-    gbc.gridy = 7;
-    gbc.anchor = GridBagConstraints.EAST;
-    gbc.insets = new Insets(5, 5, 5, 5);
-    panel4.add(label8, gbc);
-    destPowerLabel = new JLabel();
-    destPowerLabel.setText("-");
-    gbc = new GridBagConstraints();
-    gbc.gridx = 1;
-    gbc.gridy = 4;
-    gbc.anchor = GridBagConstraints.WEST;
-    gbc.insets = new Insets(5, 5, 5, 5);
-    panel4.add(destPowerLabel, gbc);
-    pulseLabel = new JLabel();
-    pulseLabel.setText("-");
-    gbc = new GridBagConstraints();
-    gbc.gridx = 1;
-    gbc.gridy = 0;
-    gbc.anchor = GridBagConstraints.WEST;
-    gbc.insets = new Insets(5, 5, 5, 5);
-    panel4.add(pulseLabel, gbc);
-    pedalRpmLabel = new JLabel();
-    pedalRpmLabel.setText("-");
-    gbc = new GridBagConstraints();
-    gbc.gridx = 1;
-    gbc.gridy = 1;
-    gbc.anchor = GridBagConstraints.WEST;
-    gbc.insets = new Insets(5, 5, 5, 5);
-    panel4.add(pedalRpmLabel, gbc);
-    speedLabel = new JLabel();
-    speedLabel.setText("-");
-    gbc = new GridBagConstraints();
-    gbc.gridx = 1;
-    gbc.gridy = 2;
-    gbc.anchor = GridBagConstraints.WEST;
-    gbc.insets = new Insets(5, 5, 5, 5);
-    panel4.add(speedLabel, gbc);
-    distanceLabel = new JLabel();
-    distanceLabel.setText("-");
-    gbc = new GridBagConstraints();
-    gbc.gridx = 1;
-    gbc.gridy = 3;
-    gbc.anchor = GridBagConstraints.WEST;
-    gbc.insets = new Insets(5, 5, 5, 5);
-    panel4.add(distanceLabel, gbc);
-    energyLabel = new JLabel();
-    energyLabel.setText("-");
-    gbc = new GridBagConstraints();
-    gbc.gridx = 1;
-    gbc.gridy = 5;
-    gbc.anchor = GridBagConstraints.WEST;
-    gbc.insets = new Insets(5, 5, 5, 5);
-    panel4.add(energyLabel, gbc);
-    timeLabel = new JLabel();
-    timeLabel.setText("-");
-    gbc = new GridBagConstraints();
-    gbc.gridx = 1;
-    gbc.gridy = 6;
-    gbc.anchor = GridBagConstraints.WEST;
-    gbc.insets = new Insets(5, 5, 5, 5);
-    panel4.add(timeLabel, gbc);
-    realPowerLabel = new JLabel();
-    realPowerLabel.setText("-");
-    gbc = new GridBagConstraints();
-    gbc.gridx = 1;
-    gbc.gridy = 7;
-    gbc.anchor = GridBagConstraints.WEST;
-    gbc.insets = new Insets(5, 5, 5, 5);
-    panel4.add(realPowerLabel, gbc);
     welcomeLabel = new JLabel();
     welcomeLabel.setFont(new Font("Bitstream Vera Serif", Font.BOLD, 16));
@@ -1060 +974 @@
     sessionTable = new JTable();
     scrollPane2.setViewportView(sessionTable);
+    bikeInfoPane.setBackground(UIManager.getColor("Label.background"));
+    bikeInfoPane.setContentType("text/html");
+    bikeInfoPane.setEditable(false);
+    bikeInfoPane.setEnabled(true);
+    bikeInfoPane.setText("<html>\n  <head>\n\n  </head>\n  <body>\n    <p style=\"margin-top: 0\">\n      \n    </p>\n  </body>\n</html>\n");
+    bikeInfoPane.putClientProperty("JEditorPane.honorDisplayProperties", Boolean.TRUE);
+    gbc = new GridBagConstraints();
+    gbc.gridx = 2;
+    gbc.gridy = 0;
+    gbc.gridheight = 3;
+    gbc.fill = GridBagConstraints.HORIZONTAL;
+    panel1.add(bikeInfoPane, gbc);
   }
 

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

@@ -1 +1 @@
 package org.jergometer.gui;
 
+import org.jergometer.communication.KetterBikeConnector;
 import org.jergometer.translation.I18n;
-import org.jergometer.communication.BikeConnectorSerial;
 import org.jergometer.communication.BikeConnectionTester;
 import org.jergometer.JergometerSettings;
@@ -384 +384 @@
     try {
       // detect available serial ports
-      for (String s : BikeConnectorSerial.getPortNames()) {
+      for (String s : KetterBikeConnector.getPortNames()) {
         comboBoxModel.addElement(s);
         // check if this comport this the current comport

trunk/src/org/jergometer/Jergometer.java

@@ -198 +198 @@
     if (comPort == null) {
       throw new UnconfiguredSerialPortException();
-    }
-    bikeConnector = new BikeConnectorSerial(comPort);
+    } else
+    if (comPort.equals("replay")) {
+      bikeConnector = new BikeConnectorSimulator();
+    } else
+    if (comPort.startsWith("record:")) {
+      comPort = comPort.substring("record:".length());
+      bikeConnector = new KetterBikeConnector(comPort);
+      bikeConnector.getReader().addBikeReaderListener(new FileRecorder(BikeConnectorSimulator.SIMULATOR_SESSION));
+    } else {
+      bikeConnector = new KetterBikeConnector(comPort);
+    }
 
     BikeReader bikeReader = bikeConnector.getReader();

trunk/src/org/jergometer/JergometerTestConsole.java

@@ -23 +23 @@
 // dynamic  
 
-  private BikeConnector bikeConnector;
+  private KetterBikeConnector bikeConnector;
 
   public JergometerTestConsole() throws UnsupportedCommOperationException, BikeException {
@@ -30 +30 @@
 
       if(osName.toLowerCase().startsWith("windows")) {
-        bikeConnector = new BikeConnectorSerial("COM1");
+        bikeConnector = new KetterBikeConnector("COM1");
       } else {
-        bikeConnector = new BikeConnectorSerial("/dev/ttyUSB0");
-//        bikeConnector = new BikeConnectorSerial("/dev/ttyS0");
+        bikeConnector = new KetterBikeConnector("/dev/ttyUSB0");
+//        bikeConnector = new KetterBikeConnector("/dev/ttyS0");
       }
 
-      BikeWriter bikeWriter = bikeConnector.getWriter();
-      BikeReader bikeReader = bikeConnector.getReader();
+      KettlerBikeWriter bikeWriter = bikeConnector.getWriter();
+      KettlerBikeReader bikeReader = bikeConnector.getReader();
       bikeReader.addBikeReaderListener(this);
       bikeReader.start();
@@ -122 +122 @@
 
           case 11:
-            bikeReader.setPrintAvailable(BikeReader.PrintAvailable.characters);
+            bikeReader.setPrintAvailable(KettlerBikeReader.PrintAvailable.characters);
             break;
 
           case 12:
-            bikeReader.setPrintAvailable(BikeReader.PrintAvailable.decimals);
+            bikeReader.setPrintAvailable(KettlerBikeReader.PrintAvailable.decimals);
             break;