Changeset 191

Timestamp:

02/23/10 21:18:49 (2 years ago)

Author:

stefan

Message:

implemented feature #177: extend timeline automatically when reaching end of traning program

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• src/org/jergometer/diagram/BikeDiagram.java (modified) (1 diff)
• src/org/jergometer/diagram/BikeProgramVisualizer.java (modified) (1 diff)
• src/org/jergometer/diagram/BikeSessionVisualizer.java (modified) (1 diff)
• src/org/jergometer/diagram/ProgressionVisualizer.java (modified) (2 diffs)
• src/org/jergometer/gui/Diagram.java (modified) (9 diffs)
• src/org/jergometer/gui/MainWindow.java (modified) (6 diffs)
• src/org/jergometer/Jergometer.java (modified) (10 diffs)
• src/org/jergometer/JergometerConsole.java (added)
• src/org/jergometer/model/BikeSession.java (modified) (10 diffs)
• src/org/jergometer/model/SessionTableModel.java (modified) (1 diff)
• src/org/jergometer/model/StatsRecord.java (added)
• src/org/jergometer/model/UserData.java (modified) (4 diffs)
• src/org/jergometer/translation/jergometer_de.properties (modified) (1 diff)
• src/org/jergometer/translation/jergometer.properties (modified) (1 diff)

trunk/CHANGELOG

@@ -3 +3 @@
 
 //== 0.7.9 ==
+
+2010-02-23
+* [stefan]  * implemented feature #177: extend timeline automatically when reaching end of traning program
 
 2010-02-20

trunk/src/org/jergometer/diagram/BikeDiagram.java

@@ -12 +12 @@
  */
 public class BikeDiagram {
+  public static void createLegend(Diagram diagram, boolean dest, boolean bright, long programLength) {
+    diagram.addVerticalMarker(programLength, Color.BLACK, new BasicStroke(), "End of program");
+
+    createLegend(diagram, dest, bright);
+  }
+
   public static void createLegend(Diagram diagram, boolean dest, boolean bright) {
     String suffix = "";

trunk/src/org/jergometer/diagram/BikeProgramVisualizer.java

@@ -18 +18 @@
   }
 
-  public void visualize(BikeProgram bikeProgram, boolean bright) {
+  public void visualize(BikeProgram bikeProgram, boolean bright, long duration) {
     synchronized(diagram) {
       BikeProgramData data = bikeProgram.getProgramData();
-      diagram.setTimeRange(new Diagram.Range(0,data.getDuration()));
+      duration = duration == -1 ? data.getDuration() : duration;
+
+      diagram.setTimeRange(new Diagram.Range(0, duration));
       diagram.setTimeAxisType(Diagram.TimeAxisType.minute);
 
       diagram.clearGraphs();
-      BikeDiagram.createLegend(diagram, true, bright);
+      BikeDiagram.createLegend(diagram, true, bright, data.getDuration());
 
       BikeProgramData.Action lastAction = null;

trunk/src/org/jergometer/diagram/BikeSessionVisualizer.java

@@ -21 +21 @@
   }
 
-  public void visualize(BikeSession bikeSession, boolean clearBefore) throws IOException {
+  public void visualize(BikeSession bikeSession, boolean clearBefore, boolean fullSessionLength) throws IOException {
     synchronized(diagram) {
       ArrayList<MiniDataRecord> miniDataRecords = bikeSession.getData();
 
+      int duration = fullSessionLength ? bikeSession.getStatsTotal().getDuration() : bikeSession.getProgramDuration();
+
       if (clearBefore) {
-        diagram.setTimeRange(new Diagram.Range(0,bikeSession.getProgramDuration()));
+        diagram.setTimeRange(new Diagram.Range(0, duration));
         diagram.setTimeAxisType(Diagram.TimeAxisType.minute);
         diagram.clearGraphs();
       }
-      BikeDiagram.createLegend(diagram, false, false);
+      BikeDiagram.createLegend(diagram, false, false, bikeSession.getProgramDuration());
 
       int time = 0;
       for (MiniDataRecord miniDataRecord : miniDataRecords) {
         if (stopped) return;
-        if (time == bikeSession.getProgramDuration()) break;
+        if (time == duration) break;
 
         diagram.addValue("pulse", time, miniDataRecord.getPulse());

trunk/src/org/jergometer/diagram/ProgressionVisualizer.java

@@ -4 +4 @@
 import org.jergometer.model.BikeSession;
 import org.jergometer.model.MiniDataRecord;
+import org.jergometer.model.StatsRecord;
 
 import java.util.ArrayList;
@@ -42 +43 @@
         long time = bikeSession.getStartTime().getTime() - start;
         int programDuration = bikeSession.getProgramDuration();
-        MiniDataRecord sum = bikeSession.getSum();
+        StatsRecord sum = bikeSession.getStatsRegular();
 
-        if (bikeSession.getPulseCount() != 0) {
-          diagram.addValue("pulse", time, sum.getPulse()/bikeSession.getPulseCount());
+        if (sum.getPulseCount() != 0) {
+          diagram.addValue("pulse", time, (int) (sum.getAveragePulse() + 0.5));
         }
         if (programDuration != 0) {
-          diagram.addValue("pedalRPM", time, sum.getPedalRpm()/programDuration);
-          diagram.addValue("power", time, sum.getPower()/programDuration);
-          double performance = ((double) sum.getPower()/programDuration * sum.getPedalRpm()/programDuration / 60);
-          diagram.addValue("performance", time, (int) performance);
+          diagram.addValue("pedalRPM", time, (int) (sum.getAveragePedalRPM() + 0.5));
+          diagram.addValue("power", time, (int) (sum.getAveragePower() + 0.5));
+          double performance = (sum.getAveragePower() * sum.getAveragePedalRPM() / 60);
+          diagram.addValue("performance", time, (int) (performance + 0.5));
         }
       }

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

@@ -53 +53 @@
   private ArrayList<Graph>[] graphs = new ArrayList[] { new ArrayList<Graph>(), new ArrayList<Graph>() };
   private HashMap<Object,Graph> key2Graph = new HashMap<Object, Graph>();
+  private ArrayList<Marker> verticalMarkers = new ArrayList<Marker>();
 
   /** Background image. */
@@ -146 +147 @@
 
     redrawImage();
-    repaint();
   }
 
   public void clearGraphs() {
+    verticalMarkers.clear();
+
     for (ArrayList<Graph> graph : graphs) {
       graph.clear();
@@ -156 +158 @@
 
     redrawImage();
-    repaint();
   }
 
@@ -191 +192 @@
   }
 
+  public synchronized void addVerticalMarker(long time, Color color, Stroke stroke, String msg) {
+    verticalMarkers.add(new Marker(time, color, stroke, msg));
+  }
+
   public void paint(Graphics g) {
     super.paint(g);
@@ -196 +201 @@
   }
 
-  private void redrawImage() {
+  public void redrawImage() {
     Graphics2D g = backgroundImage.createGraphics();
     int width = backgroundImage.getWidth();
@@ -212 +217 @@
     // draw highlights
     drawHighlights(g);
+
+    // draw marker lines
+    drawVerticalMarkers(g);
 
     // draw graph
@@ -227 +235 @@
     drawVerticalAxisMarkers(g, Side.left, true);
     drawTimeAxisMarkers(g, true);
+
+    repaint();
+  }
+
+  private void drawVerticalMarkers(Graphics2D g) {
+    int height = backgroundImage.getHeight();
+
+    Color oldColor = g.getColor();
+    Stroke oldStroke = g.getStroke();
+    for (Marker verticalMarker : verticalMarkers) {
+      if (verticalMarker.color != null) g.setColor(verticalMarker.color);
+      if (verticalMarker.stroke != null) g.setStroke(verticalMarker.stroke);
+      long x = verticalMarker.x;
+      g.draw(new Line2D.Float(getX(x), margin.top, getX(x), height - margin.bottom + crossSize));
+    }
+    g.setColor(oldColor);
+    g.setStroke(oldStroke);
   }
 
@@ -425 +450 @@
     backgroundImage = new BufferedImage(getWidth(), getHeight(), BufferedImage.TYPE_INT_RGB);
     redrawImage();
-    repaint();
   }
 
@@ -518 +542 @@
     }
   }
+
+  public static class Marker {
+    private long x;
+    public Color color;
+    public Stroke stroke;
+    private String msg;
+
+    public Marker(long x, Color color, Stroke stroke, String msg) {
+      this.x = x;
+      this.color = color;
+      this.stroke = stroke;
+      this.msg = msg;
+    }
+  }
 }

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

@@ -52 +52 @@
   private JRadioButtonMenuItem diagramProgressionMenuItem;
   private JCheckBoxMenuItem showOnlyCompletedSessionsMenuItem;
+  private JCheckBoxMenuItem showFullSessionLength;
   private JMenu userMenu;
   private ButtonGroup userButtonGroup;
@@ -205 +206 @@
       showOnlyCompletedSessionsMenuItem.addActionListener(this);
       sessionsMenu.add(showOnlyCompletedSessionsMenuItem);
+      showFullSessionLength = new JCheckBoxMenuItem(I18n.getString("menu.sessions.show_full_length"));
+      showFullSessionLength.setMnemonic(I18n.getMnemonic("menu.sessions.show_full_length_mn"));
+      showFullSessionLength.setAccelerator(KeyStroke.getKeyStroke(I18n.getString("menu.sessions.show_full_length_ks")));
+      showFullSessionLength.addActionListener(this);
+      sessionsMenu.add(showFullSessionLength);
       JMenuItem selectAllSessionsMenuItem = new JMenuItem(I18n.getString("menu.sessions.select_all"));
       selectAllSessionsMenuItem.setActionCommand(AC_SELECT_ALL_SESSIONS);
@@ -382 +388 @@
       jergometer.setSessionsVis(Jergometer.SessionsVis.progression);
     } else if (e.getSource() == showOnlyCompletedSessionsMenuItem) {
-      System.out.println(showOnlyCompletedSessionsMenuItem.isSelected());
       jergometer.setShowOnlyCompletedSessions(showOnlyCompletedSessionsMenuItem.isSelected());
+    } else if (e.getSource() == showFullSessionLength) {
+      jergometer.setShowFullSessionLength(showFullSessionLength.isSelected());
     } else if (e.getActionCommand() == AC_SELECT_ALL_SESSIONS) {
       sessionTable.selectAll();
@@ -448 +455 @@
               } 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();
               }
@@ -457 +464 @@
               } 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) {
               }
@@ -759 +766 @@
   }
 
+  public void setShowFullSessionLength(boolean value) {
+    showFullSessionLength.setSelected(value);
+  }
+
+  public boolean isShowFullSessionLength() {
+    return showFullSessionLength.isSelected();
+  }
+
   {
 // GUI initializer generated by IntelliJ IDEA GUI Designer

trunk/src/org/jergometer/Jergometer.java

@@ -16 +16 @@
 import javax.swing.*;
 import java.awt.event.*;
-import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -140 +139 @@
 
     switchToUser(jergometerSettings.getLastUserName());
+
+    new JergometerConsole(this).start();
 
     Runtime.getRuntime().addShutdownHook(new Thread(){
@@ -328 +329 @@
       Diagram diagram = mainWindow.getDiagram();
 //      diagram.clearGraphs();
-      BikeDiagram.createLegend(diagram, false, false);
+      BikeDiagram.createLegend(diagram, false, false, program.getProgramData().getDuration());
 
       try {
@@ -408 +409 @@
     diagramVisualizer.stopVisualization();
     filterSessions();
-    visualizeBikeProgram(bikeProgram, bright);
+    visualizeBikeProgram(bikeProgram, bright, -1);
   }
 
@@ -421 +422 @@
   }
 
-  private void visualizeBikeProgram(BikeProgram bikeProgram, boolean bright) {
+  private void visualizeBikeProgram(BikeProgram bikeProgram, boolean bright, long duration) {
     BikeProgramVisualizer bikeProgramVisualizer = new BikeProgramVisualizer(mainWindow.getDiagram());
     diagramVisualizer = bikeProgramVisualizer;
-    bikeProgramVisualizer.visualize(bikeProgram, bright);
+    bikeProgramVisualizer.visualize(bikeProgram, bright, duration);
   }
 
@@ -463 +464 @@
     diagramVisualizer.stopVisualization();
 
+    int duration = mainWindow.isShowFullSessionLength() ? bikeSession.getStatsTotal().getDuration() : bikeSession.getProgramDuration();
+
     // draw the program
     BikeProgram bikeProgram = programTree.getProgram(bikeSession.getProgramName());
     boolean programFound = bikeProgram != null;
     if (programFound) {
-      visualizeBikeProgram(bikeProgram, true);
+      visualizeBikeProgram(bikeProgram, true, duration);
     }
 
@@ -473 +476 @@
     BikeSessionVisualizer bikeSessionVisualizer = new BikeSessionVisualizer(mainWindow.getDiagram());
     diagramVisualizer = bikeSessionVisualizer;
-    bikeSessionVisualizer.visualize(bikeSession, !programFound);
+    bikeSessionVisualizer.visualize(bikeSession, !programFound, mainWindow.isShowFullSessionLength());
   }
 
@@ -481 +484 @@
     switch (sessionsVis) {
       case average:
+        boolean fullLength = mainWindow.isShowFullSessionLength();
+
+        // calculate minimal duration
         int duration = Integer.MAX_VALUE;
         for (BikeSession bikeSession : bikeSessions) {
-          duration = Math.min(duration,bikeSession.getProgramDuration());
+          int thisDuration = fullLength ? bikeSession.getStatsTotal().getDuration() : bikeSession.getProgramDuration();
+          duration = Math.min(duration, thisDuration);
         }
 
@@ -545 +552 @@
   }
 
+  public void setShowFullSessionLength(boolean value) {
+    mainWindow.setShowFullSessionLength(value);
+
+    if (selectedSessions.size() == 1) {
+      selectBikeSession(selectedSessions.get(0));
+    } else
+    if (selectedSessions.size() > 1) {
+      selectBikeSessions(selectedSessions);
+    }
+  }
+
+  public BikeProgram getProgram() {
+    return program;
+  }
+
   public ArrayList<BikeSession> getSelectedBikeSessions() {
     return selectedSessions;
@@ -580 +602 @@
   public void bikeData(DataRecord data) {
     mainWindow.setData(data);
-    if (program.getSession().getDuration() < program.getSession().getProgramDuration()) {
-      mainWindow.getDiagram().addValue("pulse", program.getSession().getDuration(), data.getPulse());
-      mainWindow.getDiagram().addValue("pedalRPM", program.getSession().getDuration(), data.getPedalRpm());
-      mainWindow.getDiagram().addValue("power", program.getSession().getDuration(), data.getRealPower());
+
+    Diagram diagram = mainWindow.getDiagram();
+
+    // extends time range when we are at the end
+    if (program.getSession().getDuration() >= diagram.getTimeRange().max) {
+      long newMax = diagram.getTimeRange().max + (program.getProgramData().getDuration() / 2);
+      diagram.setTimeRange(new Diagram.Range(0, newMax));
+      diagram.redrawImage();
+    }
+
+    if (program.getSession().getDuration() < diagram.getTimeRange().max) {
+      int time = program.getSession().getDuration();
+      diagram.addValue("pulse", time, data.getPulse());
+      diagram.addValue("pedalRPM", time, data.getPedalRpm());
+      diagram.addValue("power", time, data.getRealPower());
     }
 

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

@@ -14 +14 @@
   private String programName;
   private int programDuration;
-  private int duration;
   private ArrayList<MiniDataRecord> data;
-  private MiniDataRecord sum = new MiniDataRecord(0, 0, 0);
-  private int pulseCount = 0;
-  private DataRecord lastRecord = new DataRecord(0,0,0,0,0,0,"",0);
+  private StatsRecord statsRegular = new StatsRecord(0, 0, 0, 0, 0);
+  private StatsRecord statsTotal = statsRegular;
+  private StatsRecord currentStats = statsRegular;
+  private DataRecord lastRecordRegular = new DataRecord(0,0,0,0,0,0,"",0);
+  private DataRecord lastRecordTotal = new DataRecord(0,0,0,0,0,0,"",0);
   private File file;
   private boolean onlyMiniInfo = false;
@@ -53 +54 @@
    * @param programName name of the program used for this session
    * @param programDuration duration of the program
-   * @param duration duration of this session
-   * @param sumPulse pulse sum
-   * @param sumPower power sum
-   * @param sumPedalRpm pedal RPM sum
-   * @param pulseCount number of totalized pulse values
+   * @param statsRegular statistics in the regular training time
+   * @param statsTotal statistics in the real total training time
    */
   public BikeSession(String parentDir, Date startTime, String programName, int programDuration,
-                     int duration, int sumPulse, int sumPower, int sumPedalRpm, int pulseCount) {
-    this(new File(getFileName(parentDir, startTime)), startTime, programName, programDuration, duration, sumPulse, sumPower, sumPedalRpm, pulseCount);
+                     StatsRecord statsRegular, StatsRecord statsTotal) {
+    this(new File(getFileName(parentDir, startTime)), startTime, programName, programDuration, statsRegular, statsTotal);
   }
 
@@ -75 +73 @@
    * @param programName name of the program used for this session
    * @param programDuration duration of the program
-   * @param duration duration of this session
-   * @param sumPulse pulse sum
-   * @param sumPower power sum
-   * @param sumPedalRpm pedal RPM sum
-   * @param pulseCount number of totalized pulse values
+   * @param statsRegular statistics in the regular training time
+   * @param statsTotal statistics in the real total training time
    */
   public BikeSession(File file, Date startTime, String programName, int programDuration,
-                     int duration, int sumPulse, int sumPower, int sumPedalRpm, int pulseCount) {
+                     StatsRecord statsRegular, StatsRecord statsTotal) {
     this.onlyMiniInfo = true;
     this.file = file;
     this.startTime = startTime;
     this.programName = programName;
-    this.duration = duration;
     this.programDuration = programDuration;
-    this.sum = new MiniDataRecord(sumPulse, sumPower, sumPedalRpm);
-    this.pulseCount = pulseCount;
+    this.statsRegular = statsRegular;
+    this.statsTotal = statsTotal;
   }
 
   public void initialVirtualBikeSession() {
     data = new ArrayList<MiniDataRecord>();
-    duration = programDuration;
+    statsTotal.duration = programDuration;
   }
 
   public boolean update(DataRecord record) {
-    if(!record.time.equals(lastRecord.time)) {
+    if(!record.time.equals(lastRecordRegular.time)) {
       // ergometer is not paused -> add the data record to my list
       data.add(new MiniDataRecord(record.pulse, record.realPower, record.pedalRpm));
-      duration++;
+
       // update statistics
-      if (data.size() < programDuration) {
-        if (record.pulse > 0) {
-          pulseCount++;
-          sum.pulse += record.pulse;
-        }
-        sum.power += record.realPower;
-        sum.pedalRpm += record.pedalRpm;
-      }
-      lastRecord = record;
+      currentStats.duration++;
+      if (record.pulse > 0) {
+        currentStats.pulseCount++;
+        currentStats.pulseSum += record.pulse;
+      }
+      currentStats.powerSum += record.realPower;
+      currentStats.pedalRpmSum += record.pedalRpm;
+
+      if (currentStats == statsRegular) {
+        lastRecordRegular = record;
+      }
+      lastRecordTotal = record;
+      
+      // switch from regular to total stats end of program reached
+      if (currentStats.duration == programDuration) {
+        statsTotal = statsRegular.clone();
+        currentStats = statsTotal;
+      }
 
       return true;
@@ -121 +124 @@
 
   public void recalculateMiniInfo() {
-    sum = new MiniDataRecord(0, 0, 0);
-    pulseCount = 0;
-    for (int i = 0; i < duration && i < programDuration; i++) {
+    currentStats = null;
+    int size = data.size();
+
+    statsRegular = new StatsRecord(0, 0, 0, 0, 0);
+    for (int i = 0; i < size && i < programDuration; i++) {
       MiniDataRecord record = data.get(i);
+
+      statsRegular.duration++;
       if (record.pulse > 0) {
-        pulseCount++;
-        sum.pulse += record.pulse;
-      }
-      sum.power += record.power;
-      sum.pedalRpm += record.pedalRpm;
-    }
+        statsRegular.pulseCount++;
+        statsRegular.pulseSum += record.pulse;
+      }
+      statsRegular.powerSum += record.power;
+      statsRegular.pedalRpmSum += record.pedalRpm;
+    }
+
+    statsTotal = statsRegular.clone();
+    for (int i = statsRegular.duration; i < size; i++) {
+      MiniDataRecord record = data.get(i);
+
+      statsTotal.duration++;
+      if (record.pulse > 0) {
+        statsTotal.pulseCount++;
+        statsTotal.pulseSum += record.pulse;
+      }
+      statsTotal.powerSum += record.power;
+      statsTotal.pedalRpmSum += record.pedalRpm;
+    }
+
     needToBeSaved = true;
   }
@@ -142 +163 @@
 
     toStream(out);
-
     out.close();
 
@@ -150 +170 @@
   private void toStream(DataOutputStream out) throws IOException {
     out.writeUTF("jergometer session");
-    out.writeUTF("2");
+    out.writeUTF("3");
     out.writeLong(startTime.getTime());
     out.writeUTF(programName);
-    sum.toStream(out);
-    out.writeInt(pulseCount);
-    lastRecord.toStream(out);
     out.writeInt(programDuration);
+    lastRecordRegular.toStream(out);
+    lastRecordTotal.toStream(out);
+    statsRegular.toStream(out);
+    statsTotal.toStream(out);
     out.writeInt(data.size());
     for (MiniDataRecord miniDataRecord : data) {
@@ -167 +188 @@
     if (type.equals("jergometer session")) {
       int format = Integer.parseInt(in.readUTF());
-      startTime = new Time(in.readLong());
-      programName = in.readUTF();
-      sum = new MiniDataRecord(in);
-      pulseCount = in.readInt();
-      lastRecord = new DataRecord(in);
-      if (format >= 2) {
+
+      if (format <= 2) {
+        startTime = new Time(in.readLong());
+        programName = in.readUTF();
+        MiniDataRecord regularSum = new MiniDataRecord(in);
+        int pulseCount = in.readInt();
+        lastRecordRegular = new DataRecord(in);
+        if (format >= 2) {
+          programDuration = in.readInt();
+        }
+        int duration = in.readInt();
+        data = new ArrayList<MiniDataRecord>(duration);
+        for (int i = 0; i < duration; i++) {
+          data.add(new MiniDataRecord(in));
+        }
+        statsRegular = new StatsRecord(regularSum.getPulse(), regularSum.getPower(), regularSum.getPedalRpm(), duration, pulseCount);
+        statsTotal = statsRegular;
+        currentStats = null;
+      } else
+      if (format == 3) {
+        startTime = new Time(in.readLong());
+        programName = in.readUTF();
         programDuration = in.readInt();
-      }
-      duration = in.readInt();
-      data = new ArrayList<MiniDataRecord>(duration);
-      for (int i = 0; i < duration; i++) {
-        data.add(new MiniDataRecord(in));
+        lastRecordRegular = new DataRecord(in);
+        lastRecordTotal = new DataRecord(in);
+        statsRegular = new StatsRecord(in);
+        statsTotal = new StatsRecord(in);
+        int size = in.readInt();
+        data = new ArrayList<MiniDataRecord>(size);
+        for (int i = 0; i < size; i++) {
+          data.add(new MiniDataRecord(in));
+        }
       }
     }
@@ -203 +244 @@
 
   public int getDuration() {
-    return duration;
+    return statsTotal.duration;
   }
 
@@ -211 +252 @@
   }
 
-  public MiniDataRecord getSum() {
-    return sum;
-  }
-
-  public DataRecord getLastRecord() throws IOException {
+  public StatsRecord getStatsRegular() {
+    return statsRegular;
+  }
+
+  public StatsRecord getStatsTotal() {
+    return statsTotal;
+  }
+
+  public DataRecord getLastRecordRegular() throws IOException {
     loadFull();
-    return lastRecord;
+    return lastRecordRegular;
   }
 
   public String getProgramName() {
     return programName;
-  }
-
-  public double getAveragePulse() {
-    return (double) sum.getPulse()/pulseCount;
-  }
-
-  public double getAveragePower() {
-    return (double) sum.getPower()/duration;
-  }
-
-  public double getAveragePedalRPM() {
-    return (double) sum.getPedalRpm()/duration;
-  }
-
-  public int getPulseCount() {
-    return pulseCount;
   }
 
@@ -255 +284 @@
 
   public boolean isCompleted() {
-    return duration >= programDuration;
+    return statsTotal.duration >= programDuration;
   }
 

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

@@ -29 +29 @@
       case 0: return String.format("%1$td.%1$tm.%1$ty %1$tH:%1$tM", bikeSession.getStartTime());
       case 1: return bikeSession.getProgramName();
-      case 2: return String.format("%.1f", bikeSession.getAveragePulse());
-      case 3: return String.format("%.1f", bikeSession.getAveragePower());
+      case 2: return String.format("%.1f", bikeSession.getStatsRegular().getAveragePulse());
+      case 3: return String.format("%.1f", bikeSession.getStatsRegular().getAveragePower());
       case 4:
         int duration = Math.min(bikeSession.getDuration(), bikeSession.getProgramDuration());

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

@@ -80 +80 @@
             }
           }
-          int duration = Integer.parseInt(sessionXml.getAttribute("duration"));
-          int sumPulse = Integer.parseInt(sessionXml.getAttribute("sumPulse"));
-          int sumPower = Integer.parseInt(sessionXml.getAttribute("sumPower"));
-          int sumPedalRpm = Integer.parseInt(sessionXml.getAttribute("sumPedalRpm"));
-          int pulseCount = Integer.parseInt(sessionXml.getAttribute("pulseCount"));
+
+          StatsRecord statsRegular, statsTotal;
+          XMLElement statsRegularXml = sessionXml.getChildElement("statsRegular");
+          if (statsRegularXml != null) {
+            statsRegular = new StatsRecord(statsRegularXml);
+          } else {
+            int duration = Integer.parseInt(sessionXml.getAttribute("duration"));
+            int sumPulse = Integer.parseInt(sessionXml.getAttribute("sumPulse"));
+            int sumPower = Integer.parseInt(sessionXml.getAttribute("sumPower"));
+            int sumPedalRpm = Integer.parseInt(sessionXml.getAttribute("sumPedalRpm"));
+            int pulseCount = Integer.parseInt(sessionXml.getAttribute("pulseCount"));
+            statsRegular = new StatsRecord(sumPulse, sumPower, sumPedalRpm, duration, pulseCount);
+          }
+
+          XMLElement statsTotalXml = sessionXml.getChildElement("statsTotal");
+          if (statsTotalXml != null) {
+            statsTotal = new StatsRecord(statsTotalXml);
+          } else {
+            statsTotal = statsRegular;
+          }
 
           sessions.add(new BikeSession(sessionsDirName, new Date(time), programName, programduration,
-              duration, sumPulse, sumPower, sumPedalRpm, pulseCount));
+              statsRegular, statsTotal));
         }
 
-      } catch (Exception e) {
+      } catch (Exception ignored) {
       }
     } else {
@@ -119 +134 @@
   public void save() {
     XMLElement root = new XMLElement("sessions");
-    root.setAttribute("version", "2");
+    root.setAttribute("version", "3");
 
     {
@@ -130 +145 @@
         sessionXml.setAttribute("programName", "" + session.getProgramName());
         sessionXml.setAttribute("programDuration", "" + session.getProgramDuration());
-        sessionXml.setAttribute("duration", "" + session.getDuration());
-        sessionXml.setAttribute("sumPulse", "" + session.getSum().getPulse());
-        sessionXml.setAttribute("sumPower", "" + session.getSum().getPower());
-        sessionXml.setAttribute("sumPedalRpm", "" + session.getSum().getPedalRpm());
-        sessionXml.setAttribute("pulseCount", "" + session.getPulseCount());
+        sessionXml.addChildElement(session.getStatsRegular().toXml("statsRegular"));
+        sessionXml.addChildElement(session.getStatsTotal().toXml("statsTotal"));
 
         sessionsXml.addChildElement(sessionXml);
@@ -152 +164 @@
       writer.write(doc.toString());
       writer.close();
-    } catch (IOException e) {
+    } catch (IOException ignored) {
     }
   }

trunk/src/org/jergometer/translation/jergometer_de.properties

@@ -44 +44 @@
 menu.sessions.show_only_completed_mn=v
 menu.sessions.show_only_completed_ks=control M
+menu.sessions.show_full_length=Zeige volle Länge
+menu.sessions.show_full_length_mn=L
+menu.sessions.show_full_length_ks=control L
 menu.sessions.select_all=Alle selektieren
 menu.sessions.select_all_mn=A

trunk/src/org/jergometer/translation/jergometer.properties

@@ -44 +44 @@
 menu.sessions.show_only_completed_mn=c
 menu.sessions.show_only_completed_ks=control M
+menu.sessions.show_full_length=Show full length
+menu.sessions.show_full_length_mn=l
+menu.sessions.show_full_length_ks=control L
 menu.sessions.select_all=Select all
 menu.sessions.select_all_mn=A