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

361 - Y axis is still unclear

Browse Source
This commit is contained in:
Andy Bryson
2012-11-30 08:17:15 +00:00
parent 4286123ff2
commit d254c41a15
2 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/AllPlot.cpp
View File

@@ -852,14 +852,7 @@ AllPlot::setYMax()
int step = 100;
while( ( qCeil(maxY / step) * labelWidth ) > axisHeight )
{
if( step == 100 || step == 150 )
{
step += 50;
}
else
{
step += 100;
}
nextStep(step);
}
QwtValueList xytick[QwtScaleDiv::NTickTypes];
@@ -952,7 +945,24 @@ AllPlot::setYMax()
ymin = referencePlot->altCurve->minYValue();
ymax = qMax(ymin + 100, 1.05 * referencePlot->altCurve->maxYValue());
}
setAxisScale(yRight2, ymin, ymax);
ymin = ( qRound(ymin) / 100 ) * 100;
int axisHeight = qRound( plotLayout()->canvasRect().height() );
QFontMetrics labelWidthMetric = QFontMetrics( QwtPlot::axisFont(yLeft) );
int labelWidth = labelWidthMetric.width( (ymax > 1000) ? " 8888 " : " 888 " );
int step = 10;
while( ( qCeil( (ymax - ymin ) / step) * labelWidth ) > axisHeight )
{
nextStep(step);
}
QwtValueList xytick[QwtScaleDiv::NTickTypes];
for (int i=ymin;i<ymax;i+=step)
xytick[QwtScaleDiv::MajorTick]<<i;
//setAxisScale(yRight2, ymin, ymax);
setAxisScaleDiv(yRight2,QwtScaleDiv(ymin,ymax,xytick));
setAxisLabelRotation(yRight2,90);
setAxisLabelAlignment(yRight2,Qt::AlignVCenter);
altCurve->setBaseline(ymin);
@@ -1614,3 +1624,28 @@ AllPlot::pointHover(QwtPlotCurve *curve, int index)
tooltip->setText("");
}
}
void
AllPlot::nextStep( int& step )
{
if( step < 50 )
{
step += 10;
}
else if( step == 50 )
{
step = 100;
}
else if( step >= 100 && step < 1000 )
{
step += 100;
}
else if( step >= 1000 && step < 5000)
{
step += 500;
}
else
{
step += 1000;
}
}

2
src/AllPlot.h
View File

@@ -172,6 +172,8 @@ class AllPlot : public QwtPlot
AllPlotWindow *parent;
LTMToolTip *tooltip;
LTMCanvasPicker *_canvasPicker; // allow point selection/hover
static void nextStep( int& step );
};
#endif // _GC_AllPlot_h