diff options
Diffstat (limited to 'src/datavisualization/global')
| -rw-r--r-- | src/datavisualization/global/datavisualizationglobal_p.h | 14 | ||||
| -rw-r--r-- | src/datavisualization/global/qdatavisualizationglobal.h | 4 |
2 files changed, 14 insertions, 4 deletions
diff --git a/src/datavisualization/global/datavisualizationglobal_p.h b/src/datavisualization/global/datavisualizationglobal_p.h index e448c1cb..abdac998 100644 --- a/src/datavisualization/global/datavisualizationglobal_p.h +++ b/src/datavisualization/global/datavisualizationglobal_p.h @@ -43,7 +43,11 @@ static const GLfloat cameraDistance = 6.0f; // Size of font to be used in label texture rendering. Doesn't affect the actual font size. static const int textureFontSize = 50; static const GLfloat defaultRatio = 1.0f / 1.6f; // default aspect ratio 16:10 +#if !(defined QT_OPENGL_ES) static const float gridLineOffset = 0.0001f; // Offset for lifting grid lines off background +#else +static const float gridLineOffset = 0.0035f; // Offset for lifting grid lines off background +#endif // Default light position. To have shadows working correctly, light should be as far as camera, or a bit further // y position is added to the minimum height (or can be thought to be that much above or below the camera) static const QVector3D defaultLightPos = QVector3D(0.0f, 0.5f, 0.0f); @@ -53,12 +57,18 @@ static const QVector3D cameraDistanceVector = QVector3D(0.0f, 0.0f, cameraDistan static const QQuaternion identityQuaternion; // Skip color == selection texture's background color -static const QVector3D selectionSkipColor = QVector3D(255.0f, 255.0f, 255.0f); -static const QVector3D invalidColorVector = QVector3D(-1.0f, -1.0f, -1.0f); +static const QVector4D selectionSkipColor = QVector4D(255.0f, 255.0f, 255.0f, 255.0f); +static const QVector4D invalidColorVector = QVector4D(-1.0f, -1.0f, -1.0f, -1.0f); +static const GLfloat itemAlpha = 0.0f; +static const GLfloat customItemAlpha = 252.0f; +static const GLfloat labelValueAlpha = 253.0f; +static const GLfloat labelRowAlpha = 254.0f; +static const GLfloat labelColumnAlpha = 255.0f; static const GLfloat gradientTextureHeight = 1024.0f; static const GLfloat gradientTextureWidth = 2.0f; static const GLfloat uniformTextureHeight = 64.0f; static const GLfloat uniformTextureWidth = 2.0f; +static const GLfloat labelMargin = 0.05f; QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h index 186db94c..e84d03c0 100644 --- a/src/datavisualization/global/qdatavisualizationglobal.h +++ b/src/datavisualization/global/qdatavisualizationglobal.h @@ -21,11 +21,11 @@ #include <QtCore/qglobal.h> -#define QT_DATAVISUALIZATION_VERSION_STR "1.0.0" +#define QT_DATAVISUALIZATION_VERSION_STR "1.1.0" /* QT_DATAVISUALIZATION_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QT_DATAVISUALIZATION_VERSION 0x010000 +#define QT_DATAVISUALIZATION_VERSION 0x010100 /* can be used like #if (QT_DATAVISUALIZATION_VERSION >= QT_DATAVISUALIZATION_VERSION_CHECK(1, 0, 0)) */ |