From 5238f1b4589b58cfd52ea9f7a415949f2a4761f9 2012-02-15 16:17:28 From: Michal Klocek Date: 2012-02-15 16:17:28 Subject: [PATCH] Adds font handling for chart's titile * adds setChartTitleFont * renames setChartTitle --- diff --git a/example/axischart/main.cpp b/example/axischart/main.cpp index abdb7c3..e135383 100644 --- a/example/axischart/main.cpp +++ b/example/axischart/main.cpp @@ -35,7 +35,7 @@ int main(int argc, char *argv[]) QChartView* chartView = new QChartView(&window); chartView->setRenderHint(QPainter::Antialiasing); - chartView->setTitle("Basic line chart example"); + chartView->setChartTitle("This is custom axis chart example"); chartView->addSeries(series0); chartView->addSeries(series1); diff --git a/example/colorlinechart/main.cpp b/example/colorlinechart/main.cpp index 0628875..f26b674 100644 --- a/example/colorlinechart/main.cpp +++ b/example/colorlinechart/main.cpp @@ -33,7 +33,11 @@ int main(int argc, char *argv[]) QChartView* chartView = new QChartView(&window); chartView->setRenderHint(QPainter::Antialiasing); - chartView->setTitle("Custom color line chart example"); + + QFont font; + font.setPixelSize(18); + chartView->setChartTitleFont(font); + chartView->setChartTitle("Custom color line chart example"); chartView->addSeries(series0); chartView->addSeries(series1); diff --git a/example/dynamiclinechart/main.cpp b/example/dynamiclinechart/main.cpp index 92f9041..a968731 100644 --- a/example/dynamiclinechart/main.cpp +++ b/example/dynamiclinechart/main.cpp @@ -28,7 +28,7 @@ int main(int argc, char *argv[]) chartView->setViewport( new QGLWidget() ); chartView->setRenderHint(QPainter::Antialiasing); - chartView->setTitle("This is wave generator buahha."); + chartView->setChartTitle("This is wave generator buahha."); chartView->addSeries(series0); chartView->addSeries(series1); diff --git a/example/linechart/main.cpp b/example/linechart/main.cpp index ede0db5..83521a0 100644 --- a/example/linechart/main.cpp +++ b/example/linechart/main.cpp @@ -34,7 +34,7 @@ int main(int argc, char *argv[]) QChartView* chartView = new QChartView(&window); chartView->setRenderHint(QPainter::Antialiasing); - chartView->setTitle("Basic line chart example"); + chartView->setChartTitle("Basic line chart example"); chartView->addSeries(series0); chartView->addSeries(series1); diff --git a/example/zoomlinechart/main.cpp b/example/zoomlinechart/main.cpp index 1e3082a..a34cb6c 100644 --- a/example/zoomlinechart/main.cpp +++ b/example/zoomlinechart/main.cpp @@ -32,7 +32,7 @@ int main(int argc, char *argv[]) ChartWidget* chartWidget = new ChartWidget(&window); chartWidget->setRenderHint(QPainter::Antialiasing); - chartWidget->setTitle("Zoom in/out line chart example"); + chartWidget->setChartTitle("Zoom in/out line chart example"); chartWidget->addSeries(series0); chartWidget->addSeries(series1); diff --git a/src/qchart.cpp b/src/qchart.cpp index 1b36eb0..87dc813 100644 --- a/src/qchart.cpp +++ b/src/qchart.cpp @@ -96,10 +96,15 @@ void QChart::setChartBackgroundPen(const QPen& pen) m_backgroundItem->update(); } -void QChart::setTitle(const QString& title,const QFont& font) +void QChart::setChartTitle(const QString& title) { if(!m_titleItem) m_titleItem = new QGraphicsTextItem(this); m_titleItem->setPlainText(title); +} + +void QChart::setChartTitleFont(const QFont& font) +{ + if(!m_titleItem) m_titleItem = new QGraphicsTextItem(this); m_titleItem->setFont(font); } diff --git a/src/qchart.h b/src/qchart.h index b13dd8e..bba1092 100644 --- a/src/qchart.h +++ b/src/qchart.h @@ -58,7 +58,8 @@ public: void setChartTheme(QChart::ChartTheme theme); QChart::ChartTheme chartTheme() const; - void setTitle(const QString& title,const QFont& font = QFont()); + void setChartTitle(const QString& title); + void setChartTitleFont(const QFont& font); void setChartBackgroundBrush(const QBrush& brush); void setChartBackgroundPen(const QPen& pen); diff --git a/src/qchartview.cpp b/src/qchartview.cpp index 805b910..d1ba37b 100644 --- a/src/qchartview.cpp +++ b/src/qchartview.cpp @@ -67,9 +67,14 @@ int QChartView::margin() const return m_chart->margin(); } -void QChartView::setTitle(const QString& title) +void QChartView::setChartTitle(const QString& title) { - m_chart->setTitle(title); + m_chart->setChartTitle(title); +} + +void QChartView::setChartTitleFont(const QFont& font) +{ + m_chart->setChartTitleFont(font); } void QChartView::setChartBackgroundBrush(const QBrush& brush) diff --git a/src/qchartview.h b/src/qchartview.h index 2d5e481..44fd94f 100644 --- a/src/qchartview.h +++ b/src/qchartview.h @@ -31,7 +31,8 @@ public: int margin() const; - void setTitle(const QString& title); + void setChartTitle(const QString& title); + void setChartTitleFont(const QFont& font); void setChartBackgroundBrush(const QBrush& brush); void setChartBackgroundPen(const QPen& pen);