@@ -56,7 +56,7 win32:{ | |||||
56 | } |
|
56 | } | |
57 |
|
57 | |||
58 | mac: { |
|
58 | mac: { | |
59 |
# T |
|
59 | # The following qmake flags are a work-around to make QtCommercial Charts compile on | |
60 | # QtCommercial 4.8. On the other hand Charts builds successfully with Qt open source 4.8 |
|
60 | # QtCommercial 4.8. On the other hand Charts builds successfully with Qt open source 4.8 | |
61 | # without these definitions, so this is probably a configuration issue on QtCommercial 4.8; |
|
61 | # without these definitions, so this is probably a configuration issue on QtCommercial 4.8; | |
62 | # it should probably define the minimum OSX version to be 10.5... |
|
62 | # it should probably define the minimum OSX version to be 10.5... |
@@ -212,8 +212,6 QChart* ThemeWidget::createBarChart(int valueCount) const | |||||
212 | { |
|
212 | { | |
213 | Q_UNUSED(valueCount); |
|
213 | Q_UNUSED(valueCount); | |
214 | QChart* chart = new QChart(); |
|
214 | QChart* chart = new QChart(); | |
215 | //TODO: chart->axisX()->setNiceNumbersEnabled(true); |
|
|||
216 | //TODO: chart->axisY()->setNiceNumbersEnabled(true); |
|
|||
217 | chart->setTitle("Bar chart"); |
|
215 | chart->setTitle("Bar chart"); | |
218 |
|
216 | |||
219 | QStackedBarSeries* series = new QStackedBarSeries(chart); |
|
217 | QStackedBarSeries* series = new QStackedBarSeries(chart); | |
@@ -232,8 +230,6 QChart* ThemeWidget::createBarChart(int valueCount) const | |||||
232 | QChart* ThemeWidget::createLineChart() const |
|
230 | QChart* ThemeWidget::createLineChart() const | |
233 | { |
|
231 | { | |
234 | QChart* chart = new QChart(); |
|
232 | QChart* chart = new QChart(); | |
235 | //TODO: chart->axisX()->setNiceNumbersEnabled(true); |
|
|||
236 | //TODO: chart->axisY()->setNiceNumbersEnabled(true); |
|
|||
237 | chart->setTitle("Line chart"); |
|
233 | chart->setTitle("Line chart"); | |
238 |
|
234 | |||
239 | QString name("Series "); |
|
235 | QString name("Series "); | |
@@ -279,8 +275,6 QChart* ThemeWidget::createPieChart() const | |||||
279 | QChart* ThemeWidget::createSplineChart() const |
|
275 | QChart* ThemeWidget::createSplineChart() const | |
280 | { // spine chart |
|
276 | { // spine chart | |
281 | QChart* chart = new QChart(); |
|
277 | QChart* chart = new QChart(); | |
282 | //TODO: chart->axisX()->setNiceNumbersEnabled(true); |
|
|||
283 | //TODO: chart->axisY()->setNiceNumbersEnabled(true); |
|
|||
284 | chart->setTitle("Spline chart"); |
|
278 | chart->setTitle("Spline chart"); | |
285 | QString name("Series "); |
|
279 | QString name("Series "); | |
286 | int nameIndex = 0; |
|
280 | int nameIndex = 0; | |
@@ -299,8 +293,6 QChart* ThemeWidget::createSplineChart() const | |||||
299 | QChart* ThemeWidget::createScatterChart() const |
|
293 | QChart* ThemeWidget::createScatterChart() const | |
300 | { // scatter chart |
|
294 | { // scatter chart | |
301 | QChart* chart = new QChart(); |
|
295 | QChart* chart = new QChart(); | |
302 | //TODO: chart->axisX()->setNiceNumbersEnabled(true); |
|
|||
303 | //TODO: chart->axisY()->setNiceNumbersEnabled(true); |
|
|||
304 | chart->setTitle("Scatter chart"); |
|
296 | chart->setTitle("Scatter chart"); | |
305 | QString name("Series "); |
|
297 | QString name("Series "); | |
306 | int nameIndex = 0; |
|
298 | int nameIndex = 0; |
@@ -132,7 +132,6 void MainWidget::createSeries() | |||||
132 | m_chart->legend()->setAlignment(Qt::AlignBottom); |
|
132 | m_chart->legend()->setAlignment(Qt::AlignBottom); | |
133 | //![1] |
|
133 | //![1] | |
134 |
|
134 | |||
135 | //TODO:m_chart->axisY()->setNiceNumbersEnabled(true); |
|
|||
136 | m_chartView->setRenderHint(QPainter::Antialiasing); |
|
135 | m_chartView->setRenderHint(QPainter::Antialiasing); | |
137 | } |
|
136 | } | |
138 |
|
137 |
@@ -27,8 +27,6 int main(int argc, char *argv[]) | |||||
27 | QApplication a(argc, argv); |
|
27 | QApplication a(argc, argv); | |
28 | QMainWindow window; |
|
28 | QMainWindow window; | |
29 | QChart* chart = new QChart(); |
|
29 | QChart* chart = new QChart(); | |
30 | //TODO: chart->axisX()->setNiceNumbersEnabled(true); |
|
|||
31 | //TODO: chart->axisY()->setNiceNumbersEnabled(true); |
|
|||
32 | ChartView chartView(chart,&window); |
|
30 | ChartView chartView(chart,&window); | |
33 | chartView.setRenderHint(QPainter::Antialiasing); |
|
31 | chartView.setRenderHint(QPainter::Antialiasing); | |
34 | chart->setAnimationOptions(QChart::SeriesAnimations); |
|
32 | chart->setAnimationOptions(QChart::SeriesAnimations); |
@@ -100,7 +100,6 int main(int argc, char *argv[]) | |||||
100 |
|
100 | |||
101 | //! [6] |
|
101 | //! [6] | |
102 | drilldownChart->axisX()->setGridLineVisible(false); |
|
102 | drilldownChart->axisX()->setGridLineVisible(false); | |
103 | //TODO: drilldownChart->axisY()->setNiceNumbersEnabled(true); |
|
|||
104 | drilldownChart->legend()->setVisible(true); |
|
103 | drilldownChart->legend()->setVisible(true); | |
105 | drilldownChart->legend()->setAlignment(Qt::AlignBottom); |
|
104 | drilldownChart->legend()->setAlignment(Qt::AlignBottom); | |
106 | //! [6] |
|
105 | //! [6] |
@@ -179,7 +179,6 void PieSliceItem::updateGeometry() | |||||
179 | break; |
|
179 | break; | |
180 | } |
|
180 | } | |
181 | case QPieSlice::LabelInsideNormal:{ |
|
181 | case QPieSlice::LabelInsideNormal:{ | |
182 | // TODO: align the label text to the slice arc insead of half the radius |
|
|||
183 | QPointF textCenter; |
|
182 | QPointF textCenter; | |
184 | if (m_data.m_holeRadius > 0) |
|
183 | if (m_data.m_holeRadius > 0) | |
185 | textCenter = m_data.m_center + offset(centerAngle, m_data.m_holeRadius + (m_data.m_radius - m_data.m_holeRadius) / 2); |
|
184 | textCenter = m_data.m_center + offset(centerAngle, m_data.m_holeRadius + (m_data.m_radius - m_data.m_holeRadius) / 2); |
@@ -84,9 +84,8 MOC_DIR = $$CHART_BUILD_DIR/lib | |||||
84 | UI_DIR = $$CHART_BUILD_DIR/lib |
|
84 | UI_DIR = $$CHART_BUILD_DIR/lib | |
85 | RCC_DIR = $$CHART_BUILD_DIR/lib |
|
85 | RCC_DIR = $$CHART_BUILD_DIR/lib | |
86 |
|
86 | |||
87 | ############################# PUBLIC HEADERS GENERTOR ########################################## |
|
87 | ############################# PUBLIC HEADERS GENERATOR ########################################## | |
88 |
|
88 | |||
89 | #this is very primitive and lame parser , TODO: make perl script insted |
|
|||
90 | !exists($$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal) |
|
89 | !exists($$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal) | |
91 | { |
|
90 | { | |
92 | system($$QMAKE_MKDIR $$CHART_BUILD_PUBLIC_HEADER_DIR) |
|
91 | system($$QMAKE_MKDIR $$CHART_BUILD_PUBLIC_HEADER_DIR) |
General Comments 0
You need to be logged in to leave comments.
Login now