summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/utils/utils_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/datavisualization/utils/utils_p.h')
-rw-r--r--src/datavisualization/utils/utils_p.h15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/datavisualization/utils/utils_p.h b/src/datavisualization/utils/utils_p.h
index d7187c16..1a46c731 100644
--- a/src/datavisualization/utils/utils_p.h
+++ b/src/datavisualization/utils/utils_p.h
@@ -45,7 +45,7 @@ public:
ParamTypeReal
};
- static GLuint getNearestPowerOfTwo(GLuint value, GLuint &padding);
+ static GLuint getNearestPowerOfTwo(GLuint value);
static QVector4D vectorFromColor(const QColor &color);
static QColor colorFromVector(const QVector3D &colorVector);
static QColor colorFromVector(const QVector4D &colorVector);
@@ -57,17 +57,22 @@ public:
bool borders = false,
int maxLabelWidth = 0);
static QVector4D getSelection(QPoint mousepos, int height);
- static QImage getGradientImage(const QLinearGradient &gradient);
+ static QImage getGradientImage(QLinearGradient &gradient);
- static ParamType findFormatParamType(const QString &format);
- static QString formatLabel(const QByteArray &format, ParamType paramType, qreal value);
+ static ParamType preParseFormat(const QString &format, QString &preStr, QString &postStr,
+ int &precision, char &formatSpec);
+ static QString formatLabelSprintf(const QByteArray &format, ParamType paramType, qreal value);
+ static QString formatLabelLocalized(ParamType paramType, qreal value,
+ const QLocale &locale, const QString &preStr, const QString &postStr,
+ int precision, char formatSpec, const QByteArray &format);
static QString defaultLabelFormat();
static float wrapValue(float value, float min, float max);
static QQuaternion calculateRotation(const QVector3D &xyzRotations);
+ static bool isOpenGLES();
private:
- static ParamType mapFormatCharToParamType(const QChar &formatChar);
+ static ParamType mapFormatCharToParamType(char formatSpec);
};
QT_END_NAMESPACE_DATAVISUALIZATION