nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Overlay to AllPlot

Browse Source 
.. show interval details when hovering over them on the ride
   plot using the new overlay widget
This commit is contained in:
Mark Liversedge
2014-05-18 13:11:51 +01:00
parent 52c274c82e
commit 008d64e618
2 changed files with 52 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/AllPlotWindow.cpp
View File

@@ -53,10 +53,14 @@
// tooltip
#include "LTMWindow.h"
// overlay helper
#include "GcOverlayWidget.h"
#include "IntervalSummaryWindow.h"
static const int stackZoomWidth[8] = { 5, 10, 15, 20, 30, 45, 60, 120 };
AllPlotWindow::AllPlotWindow(Context *context) :
GcChartWindow(context), current(NULL), context(context), active(false), stale(true), setupStack(false), setupSeriesStack(false), compareStale(true)
GcChartWindow(context), current(NULL), context(context), active(false), stale(true), setupStack(false), setupSeriesStack(false), compareStale(true), firstShow(true)
{
QWidget *c = new QWidget;
QVBoxLayout *clv = new QVBoxLayout(c);
@@ -94,6 +98,7 @@ AllPlotWindow::AllPlotWindow(Context *context) :
rStack = new QCheckBox(tr("Stacked"));
rBySeries = new QCheckBox(tr("by series"));
rFull = new QCheckBox(tr("Fullplot"));
rHelp = new QCheckBox(tr("Overlay"));
// layout reveal controls
QHBoxLayout *r = new QHBoxLayout;
@@ -104,10 +109,13 @@ AllPlotWindow::AllPlotWindow(Context *context) :
r->addWidget(rSmoothSlider);
QVBoxLayout *v = new QVBoxLayout;
QHBoxLayout *s = new QHBoxLayout;
QHBoxLayout *t = new QHBoxLayout;
s->addWidget(rStack);
s->addWidget(rBySeries);
v->addLayout(s);
v->addWidget(rFull);
t->addWidget(rFull);
t->addWidget(rHelp);
v->addLayout(t);
r->addSpacing(20);
r->addLayout(v);
r->addStretch();
@@ -141,6 +149,10 @@ AllPlotWindow::AllPlotWindow(Context *context) :
showFull->setCheckState(Qt::Checked);
cl1->addRow(new QLabel(""), showFull);
showHelp = new QCheckBox(tr("Show Overlay"), this);
showHelp->setCheckState(Qt::Unchecked);
cl1->addRow(new QLabel(""), showHelp);
paintBrush = new QCheckBox(tr("Fill Curves"), this);
paintBrush->setCheckState(Qt::Unchecked);
cl1->addRow(new QLabel(""), paintBrush);
@@ -496,6 +508,9 @@ AllPlotWindow::AllPlotWindow(Context *context) :
vlayout->addWidget(stackFrame);
vlayout->setSpacing(1);
// put a helper on the screen for mouse over intervals...
addHelper(tr("Intervals"), new IntervalSummaryWindow(context));
//mainLayout->addLayout(vlayout,0,0);
//mainLayout->addWidget(revealBackground,0,0, Qt::AlignTop);
//mainLayout->addWidget(revealControls,0,0, Qt::AlignTop);
@@ -528,11 +543,13 @@ AllPlotWindow::AllPlotWindow(Context *context) :
connect(showTE, SIGNAL(stateChanged(int)), this, SLOT(setShowTE(int)));
connect(showGrid, SIGNAL(stateChanged(int)), this, SLOT(setShowGrid(int)));
connect(showFull, SIGNAL(stateChanged(int)), this, SLOT(setShowFull(int)));
connect(showHelp, SIGNAL(stateChanged(int)), this, SLOT(setShowHelp(int)));
connect(showStack, SIGNAL(stateChanged(int)), this, SLOT(showStackChanged(int)));
connect(rStack, SIGNAL(stateChanged(int)), this, SLOT(showStackChanged(int)));
connect(showBySeries, SIGNAL(stateChanged(int)), this, SLOT(showBySeriesChanged(int)));
connect(rBySeries, SIGNAL(stateChanged(int)), this, SLOT(showBySeriesChanged(int)));
connect(rFull, SIGNAL(stateChanged(int)), this, SLOT(setShowFull(int)));
connect(rHelp, SIGNAL(stateChanged(int)), this, SLOT(setShowHelp(int)));
connect(paintBrush, SIGNAL(stateChanged(int)), this, SLOT(setPaintBrush(int)));
connect(comboDistance, SIGNAL(currentIndexChanged(int)), this, SLOT(setByDistance(int)));
connect(smoothSlider, SIGNAL(valueChanged(int)), this, SLOT(setSmoothingFromSlider()));
@@ -662,6 +679,23 @@ AllPlotWindow::configChanged()
}
}
bool
AllPlotWindow::event(QEvent *event)
{
// nasty nasty nasty hack to move widgets as soon as the widget geometry
// is set properly by the layout system, by default the width is 100 and
// we wait for it to be set properly then put our helper widget on the RHS
if (event->type() == QEvent::Resize && geometry().width() != 100 && firstShow) {
firstShow = false;
helperWidget()->move(mainWidget()->geometry().width()-275, 50);
helperWidget()->raise();
if (isShowHelp()) helperWidget()->show();
else helperWidget()->hide();
}
return QWidget::event(event);
}
void
AllPlotWindow::compareChanged()
{
@@ -2282,6 +2316,15 @@ AllPlotWindow::setShowTE(int value)
}
void
AllPlotWindow::setShowHelp(int value)
{
rHelp->setChecked(value);
showHelp->setChecked(value);
if (showHelp->isChecked()) helperWidget()->show();
else helperWidget()->hide();
}
void
AllPlotWindow::setShowFull(int value)
{

8
src/AllPlotWindow.h
View File

@@ -58,6 +58,7 @@ class AllPlotWindow : public GcChartWindow
Q_PROPERTY(int stackWidth READ _stackWidth WRITE setStackWidth USER true)
Q_PROPERTY(int showGrid READ isShowGrid WRITE setShowGrid USER true)
Q_PROPERTY(int showFull READ isShowFull WRITE setShowFull USER true)
Q_PROPERTY(int showHelp READ isShowHelp WRITE setShowHelp USER true)
Q_PROPERTY(int showATISS READ isShowATISS WRITE setShowATISS USER true)
Q_PROPERTY(int showANTISS READ isShowANTISS WRITE setShowANTISS USER true)
Q_PROPERTY(int showNP READ isShowNP WRITE setShowNP USER true)
@@ -103,6 +104,7 @@ class AllPlotWindow : public GcChartWindow
int _stackWidth() const { return stackWidth; }
int isShowGrid() const { return showGrid->checkState(); }
int isShowFull() const { return showFull->checkState(); }
int isShowHelp() const { return showHelp->checkState(); }
int isShowATISS() const { return showATISS->checkState(); }
int isShowANTISS() const { return showANTISS->checkState(); }
int isShowNP() const { return showNP->checkState(); }
@@ -169,6 +171,7 @@ class AllPlotWindow : public GcChartWindow
void setShowGrid(int state);
void setPaintBrush(int state);
void setShowFull(int state);
void setShowHelp(int state);
void setSmoothing(int value);
void setByDistance(int value);
void setStacked(int value);
@@ -197,6 +200,7 @@ class AllPlotWindow : public GcChartWindow
friend class AllPlot;
void setAllPlotWidgets(RideItem *rideItem);
bool event(QEvent *event);
// cached state
RideItem *current;
@@ -244,6 +248,7 @@ class AllPlotWindow : public GcChartWindow
QCheckBox *showBySeries;
QCheckBox *showGrid;
QCheckBox *showFull;
QCheckBox *showHelp;
QCheckBox *paintBrush;
QCheckBox *showAlt;
QCheckBox *showATISS;
@@ -277,7 +282,7 @@ class AllPlotWindow : public GcChartWindow
QLabel *rSmooth;
QSlider *rSmoothSlider;
QLineEdit *rSmoothEdit;
QCheckBox *rStack, *rBySeries, *rFull;
QCheckBox *rStack, *rBySeries, *rFull, *rHelp;
QStackedWidget *allPlotStack;
// comparing
@@ -301,6 +306,7 @@ class AllPlotWindow : public GcChartWindow
bool setupStack; // we optimise this out, its costly
bool setupSeriesStack; // we optimise this out, its costly
bool compareStale; // compare init one off setup
bool firstShow;
private slots: