Add XData UNITS support Part 2 of 2

.. added to DataFilter XDATA_UNITS("..", "...") returns the units as
   a string.

.. added to the various dialogs in RideEditor, to enable units and
   series name to be set and edited by the user.
This commit is contained in:
Mark Liversedge
2016-08-26 11:37:34 +01:00
parent d654d91538
commit 0bcfd6e52c
7 changed files with 83 additions and 24 deletions

View File

@@ -137,9 +137,9 @@ RideFileCommand::addXData(XDataSeries *series)
}
void
RideFileCommand::addXDataSeries(QString xdata, QString name)
RideFileCommand::addXDataSeries(QString xdata, QString name, QString unit)
{
AddXDataSeriesCommand *cmd = new AddXDataSeriesCommand(ride, xdata, name);
AddXDataSeriesCommand *cmd = new AddXDataSeriesCommand(ride, xdata, name, unit);
doCommand(cmd);
}
@@ -584,7 +584,7 @@ RemoveXDataSeriesCommand::undoCommand()
}
AddXDataSeriesCommand::AddXDataSeriesCommand(RideFile *ride, QString xdata, QString name) : RideCommand(ride), xdata(xdata), name(name) {
AddXDataSeriesCommand::AddXDataSeriesCommand(RideFile *ride, QString xdata, QString name, QString unit) : RideCommand(ride), xdata(xdata), name(name), unit(unit) {
type = RideCommand::AddXDataSeries;
description = tr("Add XData Series");
}
@@ -597,6 +597,7 @@ AddXDataSeriesCommand::doCommand()
if (series == NULL) return false;
series->valuename.append(name);
series->unitname.append(unit);
int index = series->valuename.indexOf(name);
if (index == -1) return false;