| @@ -921,8 +921,8 QAbstractAxisPrivate::QAbstractAxisPrivate(QAbstractAxis *q) | |||
|
|
921 | 921 | m_titleBrush(QChartPrivate::defaultBrush()), |
|
|
922 | 922 | m_titleFont(QChartPrivate::defaultFont()), |
|
|
923 | 923 | m_shadesVisible(false), |
|
|
924 | m_shadesBrush(QChartPrivate::defaultBrush()), | |
|
|
925 | 924 | m_shadesPen(QChartPrivate::defaultPen()), |
|
|
925 | m_shadesBrush(QChartPrivate::defaultBrush()), | |
|
|
926 | 926 | m_shadesOpacity(1.0), |
|
|
927 | 927 | m_dirty(false) |
|
|
928 | 928 | { |
| @@ -40,7 +40,12 | |||
|
|
40 | 40 | #endif |
|
|
41 | 41 | |
|
|
42 | 42 | #ifndef DEVELOPMENT_BUILD |
|
|
43 | #ifdef Q_OS_ANDROID | |
|
|
44 | // Android builds do not have __DATE__ | |
|
|
45 | const char *buildTime = __TIME__; | |
|
|
46 | #else | |
|
|
43 | 47 | const char *buildTime = __TIME__" "__DATE__; |
|
|
48 | #endif | |
|
|
44 | 49 | const char *gitHead = "unknown"; |
|
|
45 | 50 | #else |
|
|
46 | 51 | #include "qchartversion_p.h" |
| @@ -49,8 +49,8 public: | |||
|
|
49 | 49 | |
|
|
50 | 50 | protected: |
|
|
51 | 51 | explicit ChartTheme(QChart::ChartTheme id = QChart::ChartThemeLight):m_id(id), |
|
|
52 | m_backgroundShades(BackgroundShadesNone), | |
|
|
53 | 52 | m_backgroundShadesBrush(Qt::SolidPattern), |
|
|
53 | m_backgroundShades(BackgroundShadesNone), | |
|
|
54 | 54 | m_backgroundDropShadowEnabled(false) |
|
|
55 | 55 | {}; |
|
|
56 | 56 | public: |
| @@ -73,20 +73,20 MainWindow::MainWindow(QWidget *parent) : | |||
|
|
73 | 73 | m_angularTitle(QString("Angular Title")), |
|
|
74 | 74 | m_radialTitle(QString("Radial Title")), |
|
|
75 | 75 | m_base(2.0), |
|
|
76 | m_dateFormat(QString("mm-ss-zzz")), | |
|
|
76 | 77 | m_chart(0), |
|
|
77 | 78 | m_angularAxis(0), |
|
|
78 | 79 | m_radialAxis(0), |
|
|
79 | 80 | m_angularAxisMode(AxisModeNone), |
|
|
80 | 81 | m_radialAxisMode(AxisModeNone), |
|
|
82 | m_moreCategories(false), | |
|
|
81 | 83 | m_series1(0), |
|
|
82 | 84 | m_series2(0), |
|
|
83 | 85 | m_series3(0), |
|
|
84 | 86 | m_series4(0), |
|
|
85 | 87 | m_series5(0), |
|
|
86 | 88 | m_series6(0), |
|
|
87 |
m_series7(0) |
|
|
|
88 | m_dateFormat(QString("mm-ss-zzz")), | |
|
|
89 | m_moreCategories(false) | |
|
|
89 | m_series7(0) | |
|
|
90 | 90 | { |
|
|
91 | 91 | ui->setupUi(this); |
|
|
92 | 92 | |
| @@ -913,17 +913,17 void MainWindow::arrowIndexChanged(int index) | |||
|
|
913 | 913 | |
|
|
914 | 914 | void MainWindow::angularRangeChanged(qreal min, qreal max) |
|
|
915 | 915 | { |
|
|
916 | if (!qFuzzyCompare(ui->angularMinSpin->value(), min)) | |
|
|
916 | if (!qFuzzyCompare(qreal(ui->angularMinSpin->value()), min)) | |
|
|
917 | 917 | ui->angularMinSpin->setValue(min); |
|
|
918 | if (!qFuzzyCompare(ui->angularMaxSpin->value(), max)) | |
|
|
918 | if (!qFuzzyCompare(qreal(ui->angularMaxSpin->value()), max)) | |
|
|
919 | 919 | ui->angularMaxSpin->setValue(max); |
|
|
920 | 920 | } |
|
|
921 | 921 | |
|
|
922 | 922 | void MainWindow::radialRangeChanged(qreal min, qreal max) |
|
|
923 | 923 | { |
|
|
924 | if (!qFuzzyCompare(ui->radialMinSpin->value(), min)) | |
|
|
924 | if (!qFuzzyCompare(qreal(ui->radialMinSpin->value()), min)) | |
|
|
925 | 925 | ui->radialMinSpin->setValue(min); |
|
|
926 | if (!qFuzzyCompare(ui->radialMaxSpin->value(), max)) | |
|
|
926 | if (!qFuzzyCompare(qreal(ui->radialMaxSpin->value()), max)) | |
|
|
927 | 927 | ui->radialMaxSpin->setValue(max); |
|
|
928 | 928 | } |
|
|
929 | 929 | |
General Comments 0
You need to be logged in to leave comments.
Login now