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

Merge branch 'master' of github.com:/GoldenCheetah/GoldenCheetah

Browse Source
This commit is contained in:
Mark Liversedge
2012-12-20 13:34:38 +00:00
parent d2ebedac20 48ca23b6c9
commit 437f65ba85
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/AllPlot.cpp
View File

@@ -847,7 +847,7 @@ AllPlot::setYMax()
int axisHeight = qRound( plotLayout()->canvasRect().height() );
QFontMetrics labelWidthMetric = QFontMetrics( QwtPlot::axisFont(yLeft) );
int labelWidth = labelWidthMetric.width( (maxY > 1000) ? "8888 " : "888 " );
int labelWidth = labelWidthMetric.width( (maxY > 1000) ? " 8,888 " : " 888 " );
int step = 100;
while( ( qCeil(maxY / step) * labelWidth ) > axisHeight )
@@ -896,8 +896,24 @@ AllPlot::setYMax()
balanceLCurve->setBaseline(50);
balanceRCurve->setBaseline(50);
}
int axisHeight = qRound( plotLayout()->canvasRect().height() );
QFontMetrics labelWidthMetric = QFontMetrics( QwtPlot::axisFont(yLeft) );
int labelWidth = labelWidthMetric.width( "888 " );
ymax *= 1.05;
int step = 10;
while( ( qCeil(ymax / step) * labelWidth ) > axisHeight )
{
nextStep(step);
}
QwtValueList xytick[QwtScaleDiv::NTickTypes];
for (int i=0;i<ymax;i+=step)
xytick[QwtScaleDiv::MajorTick]<<i;
setAxisTitle(yLeft2, labels.join(" / "));
setAxisScale(yLeft2, 0.0, 1.05 * ymax);
setAxisScaleDiv(yLeft2,QwtScaleDiv(0, ymax, xytick));
setAxisLabelRotation(yLeft2,270);
setAxisLabelAlignment(yLeft2,Qt::AlignVCenter);
}

12
src/AllPlotWindow.cpp
View File

@@ -1474,17 +1474,7 @@ AllPlotWindow::setupStackPlots()
_allPlot->setDataFromPlot(fullPlot, startIndex, stopIndex);
_allPlot->setAxisScale(QwtPlot::xBottom, _stackWidth*i, _stackWidth*(i+1), 15/stackWidth);
if (i==0){
// First plot view title and legend
//_allPlot->setTitle(allPlot->title());
//_allPlot->plotLayout()->setLegendPosition(QwtPlot::TopLegend);
_allPlot->setFixedHeight(120+stackWidth*2+50);
}
else {
_allPlot->setTitle("");
//_allPlot->insertLegend(NULL);
_allPlot->setFixedHeight(120+stackWidth*2);
}
_allPlot->setFixedHeight(120+stackWidth*2);
// No x axis titles
_allPlot->setAxisTitle(QwtPlot::xBottom,NULL);