diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-08-26 09:43:12 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-08-26 10:10:03 +0300 |
| commit | 2e4631ece7f7860947165d4cf9019b6d383d492d (patch) | |
| tree | 688176a72f2b14df0f1a65f55719c0c61195efcf /examples | |
| parent | 46b118845dbc45e53f7b145f226b5405797693c7 (diff) | |
Removed setfontsize
Task-number: QTRD-2211
Change-Id: I33b363749ccfbd4d4e9ce3faa909eeaf46acb33a
Change-Id: I33b363749ccfbd4d4e9ce3faa909eeaf46acb33a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/mapdata/mapdata.cpp | 9 | ||||
| -rw-r--r-- | examples/qmlscatter/qml/qmlscatter/main.qml | 3 | ||||
| -rw-r--r-- | examples/scatterchart/scatterchart.cpp | 8 | ||||
| -rw-r--r-- | examples/widget/chart.cpp | 5 |
4 files changed, 17 insertions, 8 deletions
diff --git a/examples/mapdata/mapdata.cpp b/examples/mapdata/mapdata.cpp index cf94c5da..744de129 100644 --- a/examples/mapdata/mapdata.cpp +++ b/examples/mapdata/mapdata.cpp @@ -32,7 +32,9 @@ MapsModifier::MapsModifier(Q3DMaps *maps) QImage image = QImage(QStringLiteral(":/images/finland")); m_imageRect = image.rect(); m_chart->setAreaSpecs(m_imageRect, image); - m_chart->setFontSize(m_fontSize); + QFont font = m_chart->font(); + font.setPointSize(m_fontSize); + m_chart->setFont(font); #if 0 m_chart->setBarSpecs(m_barSpecs, Q3DMaps::AdjustHeight); @@ -296,14 +298,15 @@ void MapsModifier::changeFont(const QFont &font) { QFont newFont = font; newFont.setPointSizeF(m_fontSize); - //qDebug() << newFont << newFont.style(); m_chart->setFont(newFont); } void MapsModifier::changeFontSize(int fontsize) { m_fontSize = fontsize; - m_chart->setFontSize((GLfloat)m_fontSize); + QFont font = m_chart->font(); + font.setPointSize(m_fontSize); + m_chart->setFont(font); } void MapsModifier::changeShadowQuality(int quality) diff --git a/examples/qmlscatter/qml/qmlscatter/main.qml b/examples/qmlscatter/qml/qmlscatter/main.qml index 33ee6303..fd2c6e2e 100644 --- a/examples/qmlscatter/qml/qmlscatter/main.qml +++ b/examples/qmlscatter/qml/qmlscatter/main.qml @@ -74,7 +74,8 @@ Item { id: testscatter width: dataView.width height: dataView.height - fontSize: 30.0 + font.family: "Times New Roman" + font.pointSize: 40 mapping: scatterMapping shadowQuality: Scatter3D.ShadowNone selectionMode: Scatter3D.ModeItem diff --git a/examples/scatterchart/scatterchart.cpp b/examples/scatterchart/scatterchart.cpp index 8655898b..5e1935b8 100644 --- a/examples/scatterchart/scatterchart.cpp +++ b/examples/scatterchart/scatterchart.cpp @@ -30,7 +30,9 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) : m_chart(scatter), m_fontSize(30.0f) { - m_chart->setFontSize(m_fontSize); + QFont font = m_chart->font(); + font.setPointSize(m_fontSize); + m_chart->setFont(font); m_chart->setObjectType(QDataVis::Spheres, true); m_chart->setTheme(QDataVis::ThemeBrownSand); m_chart->setShadowQuality(QDataVis::ShadowHigh); @@ -147,7 +149,9 @@ void ScatterDataModifier::changeFont(const QFont &font) void ScatterDataModifier::changeFontSize(int fontsize) { m_fontSize = fontsize; - m_chart->setFontSize((GLfloat)m_fontSize); + QFont font = m_chart->font(); + font.setPointSize(m_fontSize); + m_chart->setFont(font); } void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq) diff --git a/examples/widget/chart.cpp b/examples/widget/chart.cpp index 6cbe6201..32985ada 100644 --- a/examples/widget/chart.cpp +++ b/examples/widget/chart.cpp @@ -348,14 +348,15 @@ void ChartModifier::changeFont(const QFont &font) { QFont newFont = font; newFont.setPointSize(m_fontSize); - //qDebug() << newFont << newFont.style(); m_chart->setFont(newFont); } void ChartModifier::changeFontSize(int fontsize) { m_fontSize = fontsize; - m_chart->setFontSize((GLfloat)m_fontSize); + QFont font = m_chart->font(); + font.setPointSize(m_fontSize); + m_chart->setFont(font); } void ChartModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq) |