nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-14 08:38:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Plot more data on the CP plot and use a binary cache file

Browse Source 
This patch enables more data series to be plotted on a CP plot.
We can now show curves for heartrate, cadence, speed and torque
as well as the original power and energy.

The CP code is refactored into the plotting functions and a new
RideFileCache that precomputes the mean-max as well as distribution
data (for a later patch to show histograms across date ranges).

The code for computing mean-max values has been re-written and
significantly optimised by;
* computing 1s intervals up to 5mins only
* computing 20s intervals for the remainder of the ride
* downsampling data to 5s samples for longer durations
* using a binary file format (cpx) for faster read/aggregation
* using multiple threads

Testing on an old Athlon dual-core showed an increase in performance
over the old cpi code of approximately x20, but since new data series
are now computed it is only x4 faster. Quad/Octo core systems will
show a greater performance increase though.
This commit is contained in:
Mark Liversedge
2011-04-25 02:20:19 +01:00
parent d52e676d32
commit c4494524fd
14 changed files with 1388 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/HistogramWindow.cpp
View File

@@ -20,6 +20,7 @@
#include "MainWindow.h"
#include "PowerHist.h"
#include "RideFile.h"
#include "RideFileCache.h"
#include "RideItem.h"
#include "Settings.h"
#include <QtGui>
@@ -85,7 +86,10 @@ HistogramWindow::HistogramWindow(MainWindow *mainWindow) :
histSumY = new QComboBox();
histSumY->addItem(tr("Absolute Time"));
histSumY->addItem(tr("Percentage Time"));
cComboSeason = new QComboBox(this);
addSeasons();
cl->addWidget(histSumY);
cl->addWidget(cComboSeason);
cl->addStretch();
// sort out default values
@@ -114,6 +118,7 @@ HistogramWindow::HistogramWindow(MainWindow *mainWindow) :
connect(mainWindow, SIGNAL(intervalSelected()), this, SLOT(intervalSelected()));
connect(mainWindow, SIGNAL(zonesChanged()), this, SLOT(zonesChanged()));
connect(mainWindow, SIGNAL(configChanged()), powerHist, SLOT(configChanged()));
connect(cComboSeason, SIGNAL(currentIndexChanged(int)), this, SLOT(seasonSelected(int)));
}
void
@@ -154,6 +159,47 @@ HistogramWindow::zonesChanged()
powerHist->replot();
}
void HistogramWindow::seasonSelected(int index)
{
if (index > 0) {
index--; // it is now an index into the season array
// Set data from BESTS
Season season = seasons.at(index);
} else if (!index) {
// Set data from RIDE
}
}
void HistogramWindow::addSeasons()
{
QFile seasonFile(mainWindow->home.absolutePath() + "/seasons.xml");
QXmlInputSource source( &seasonFile );
QXmlSimpleReader xmlReader;
SeasonParser( handler );
xmlReader.setContentHandler(&handler);
xmlReader.setErrorHandler(&handler);
bool ok = xmlReader.parse( source );
if(!ok)
qWarning("Failed to parse seasons.xml");
seasons = handler.getSeasons();
Season season;
season.setName(tr("All Seasons"));
seasons.insert(0,season);
cComboSeason->addItem("Selected Ride");
foreach (Season season, seasons)
cComboSeason->addItem(season.getName());
if (!seasons.empty()) {
cComboSeason->setCurrentIndex(cComboSeason->count() - 1);
Season season = seasons.last();
// set default parameters here
// XXX todo
}
}
void
HistogramWindow::setBinWidthFromSlider()
{