diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-10 10:01:44 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-10 10:06:58 +0300 |
| commit | 2701838af046b68e4bae225b2c707d7870e435f0 (patch) | |
| tree | c39fe3ce5aeb09c38e8bd8ff2973f028600c7a25 | |
| parent | 690af005c131a1179bf36f64b7cba752db819842 (diff) | |
Mac compilation fixes
Change-Id: I050b25f0921dfb12cb064002b3d020d499d4c953
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
| -rw-r--r-- | src/datavisualization/engine/surface3drenderer.cpp | 2 | ||||
| -rw-r--r-- | src/datavisualization/utils/surfaceobject_p.h | 1 | ||||
| -rw-r--r-- | src/datavisualization/utils/utils.cpp | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index 5b771684..b12cb78e 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -279,7 +279,7 @@ void Surface3DRenderer::updateSliceDataModel(int selectionId) sliceRow = new QSurfaceDataRow(src->size()); for (int i = 0; i < sliceRow->size(); i++) (*sliceRow)[i].setPosition(QVector3D(src->at(i).x(), src->at(i).y() + adjust, -1.0)); - } else if (m_cachedSelectionMode == QDataVis::SelectionModeSliceColumn) { + } else { sliceRow = new QSurfaceDataRow(m_sampleSpace.height()); for (int i = 0; i < m_sampleSpace.height(); i++) { (*sliceRow)[i].setPosition(QVector3D(m_dataArray.at(i)->at(column).z(), diff --git a/src/datavisualization/utils/surfaceobject_p.h b/src/datavisualization/utils/surfaceobject_p.h index 5100bb2c..4f30f7c0 100644 --- a/src/datavisualization/utils/surfaceobject_p.h +++ b/src/datavisualization/utils/surfaceobject_p.h @@ -66,7 +66,6 @@ private: int m_surfaceType; int m_columns; int m_rows; - GLfloat m_yRange; GLuint m_gridElementbuffer; GLuint m_gridIndexCount; QVector<QVector3D> m_vertices; diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp index da7e94f5..947dbfba 100644 --- a/src/datavisualization/utils/utils.cpp +++ b/src/datavisualization/utils/utils.cpp @@ -130,8 +130,8 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo labelColor.setAlphaF(1.0); painter.setBrush(QBrush(labelColor)); if (borders) { - painter.setPen(QPen(QBrush(txtColor), 7.5, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin)); - painter.drawRect(7.5, 7.5, labelSize.width() - 15, labelSize.height() - 15); + painter.setPen(QPen(QBrush(txtColor), 7, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin)); + painter.drawRect(7, 7, labelSize.width() - 14, labelSize.height() - 14); } else { painter.setPen(labelColor); painter.drawRect(0, 0, labelSize.width(), labelSize.height()); |