Remove 'None' option from 3d

The none option for data selection on the 3d plot is a
misnomer. It suggests that dimensions can be removed. For
example plotting x/y only. In reality, the 3d libs and the
code for managing the plot go to great lengths to ensure a
plot is rendered across all dimensions.

The None option has been removed for this reason. A 2d
scatter plot with user selectable data series should be
coded specifically to render 2d scatter plots.

fixes #30
This commit is contained in:
Mark Liversedge
2010-02-28 12:34:41 +00:00
committed by Sean Rhea
parent a217243456
commit 883dbb448f

View File

@@ -30,7 +30,6 @@
void
ModelWindow::addStandardChannels(QComboBox *box)
{
box->addItem(tr("None"), MODEL_NONE);
box->addItem(tr("Power"), MODEL_POWER);
box->addItem(tr("Cadence"), MODEL_CADENCE);
box->addItem(tr("Heartrate"), MODEL_HEARTRATE);
@@ -72,22 +71,22 @@ ModelWindow::ModelWindow(MainWindow *parent, const QDir &home) :
// selectors
xSelector = new QComboBox;
addStandardChannels(xSelector);
xSelector->setCurrentIndex(1); // power
xSelector->setCurrentIndex(0); // power
ySelector = new QComboBox;
addStandardChannels(ySelector);
ySelector->setCurrentIndex(2); // cadence
ySelector->setCurrentIndex(1); // cadence
zSelector = new QComboBox;
addStandardChannels(zSelector);
zSelector->addItem(tr("Time at X&Y"), MODEL_XYTIME);
zSelector->setCurrentIndex(11); // time at xy
zSelector->setCurrentIndex(10); // time at xy
colorSelector = new QComboBox;
addStandardChannels(colorSelector);
colorSelector->addItem(tr("Power Zone"), MODEL_POWERZONE);
colorSelector->addItem(tr("Time at X&Y"), MODEL_XYTIME);
colorSelector->setCurrentIndex(11); // power zone
colorSelector->setCurrentIndex(10); // power zone
styleSelector = new QComboBox;
styleSelector->addItem(tr("Bar"));
@@ -308,9 +307,9 @@ static struct preset {
} presets[] = {
{ "User Defined", 0, 0, 0, 0, true, 20 },
{ "Natural Cadence Selection", 1, 2, 11, 11, false, 5 }, // don't ignore zero for cadences!
{ "Power Fatigue", 10, 1, 11, 11, true, 5 },
{ "Impact of Altitude", 5, 3, 1, 11, true, 10 },
{ "Natural Cadence Selection", 0, 1, 10, 10, false, 5 }, // don't ignore zero for cadences!
{ "Power Fatigue", 9, 0, 10, 10, true, 5 },
{ "Impact of Altitude", 4, 2, 0, 10, true, 10 },
{ "", 0, 0, 0, 0, false, 0 }
};