summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorMichal Klocek <Michal.Klocek@digia.com>2012-11-16 13:21:46 +0200
committerMichal Klocek <Michal.Klocek@digia.com>2012-11-26 14:58:47 +0200
commit1c49aa901cb25b0bbdeb4922784fec273b97e781 (patch)
tree21469c4bf6070f109cb4dc12472f641c37644674 /demos
parentb1616762bd1e13608c1040c543e909698670b519 (diff)
Refactors internals
* rewrite axisUpdated signal handling * create handlers for each property of axis * decouple chartdataset, presenter, theme * adds theme manager * adds axis add/remove/attach/detach handling * refactors createGraphics * add initializers (graphics,domain,theme,animations) * refactor the way the charts are constructed (decouple form presenter) * fix initialization issues with qchart * refactor domain logic to handle also geometry size for charts * delegate xyseries geometry calculation to domian * fix lazy initialization of animations * remove hadnleGeomoetryChanged * add shared pointers to handle reference count for domain * moves nice number algorithm to domain * adds applyNiceNumbers(), depreciate setNiceNumbers * refactor multiple charts handling * domain is shared object * each domain can have multiple axis for controlling * multiple charts share now the same domain
Diffstat (limited to 'demos')
-rw-r--r--demos/audio/widget.cpp6
-rw-r--r--demos/chartthemes/themewidget.cpp2
-rw-r--r--demos/chartviewer/charts/axis/barcategoryaxisx.cpp4
-rw-r--r--demos/chartviewer/charts/axis/barcategoryaxisy.cpp4
-rw-r--r--demos/chartviewer/charts/axis/categoryaxis.cpp4
-rw-r--r--demos/chartviewer/charts/axis/datetimeaxisx.cpp4
-rw-r--r--demos/chartviewer/charts/axis/datetimeaxisy.cpp4
-rw-r--r--demos/chartviewer/charts/axis/valueaxis.cpp4
-rw-r--r--demos/chartviewer/charts/barseries/verticalpercentbarchart.cpp2
-rw-r--r--demos/chartviewer/charts/font/font.cpp4
-rw-r--r--demos/chartviewer/charts/multiaxis/multivalueaxis.cpp14
-rw-r--r--demos/chartviewer/charts/multiaxis/multivalueaxis2.cpp16
-rw-r--r--demos/chartviewer/charts/multiaxis/multivalueaxis3.cpp21
-rw-r--r--demos/chartviewer/charts/multiaxis/multivalueaxis4.cpp19
-rw-r--r--demos/chartviewer/charts/multiaxis/multivaluebaraxis.cpp22
15 files changed, 47 insertions, 83 deletions
diff --git a/demos/audio/widget.cpp b/demos/audio/widget.cpp
index 0d16b9dd..9bca1821 100644
--- a/demos/audio/widget.cpp
+++ b/demos/audio/widget.cpp
@@ -25,11 +25,11 @@ Widget::Widget(QWidget *parent)
QValueAxis *axisX = new QValueAxis;
axisX->setRange(0, 2000);
axisX->setLabelFormat("%g");
- axisX->setTitle("Samples");
+ axisX->setTitleText("Samples");
QValueAxis *axisY = new QValueAxis;
axisY->setRange(-1, 1);
- axisY->setTitle("Audio level");
- m_chart->setAxisX(axisX, m_series);
+ axisY->setTitleText("Audio level");
+ m_chart->setAxisX(axisX, m_series);
m_chart->setAxisY(axisY, m_series);
m_chart->legend()->hide();
m_chart->setTitle("Data from the microphone");
diff --git a/demos/chartthemes/themewidget.cpp b/demos/chartthemes/themewidget.cpp
index e5a07b8f..031a55e5 100644
--- a/demos/chartthemes/themewidget.cpp
+++ b/demos/chartthemes/themewidget.cpp
@@ -179,8 +179,6 @@ QComboBox *ThemeWidget::createLegendBox() const
QChart *ThemeWidget::createAreaChart() const
{
QChart *chart = new QChart();
-// chart->axisX()->setNiceNumbersEnabled(true);
-// chart->axisY()->setNiceNumbersEnabled(true);
chart->setTitle("Area chart");
// The lower series initialized to zero values
diff --git a/demos/chartviewer/charts/axis/barcategoryaxisx.cpp b/demos/chartviewer/charts/axis/barcategoryaxisx.cpp
index 787d1952..ce8cff36 100644
--- a/demos/chartviewer/charts/axis/barcategoryaxisx.cpp
+++ b/demos/chartviewer/charts/axis/barcategoryaxisx.cpp
@@ -69,8 +69,8 @@ class BarCategoryAxisXTitle: public BarCategoryAxisX
QChart *createChart(const DataTable &table)
{
QChart *chart = BarCategoryAxisX::createChart(table);
- chart->axisX()->setTitle("Axis X");
- chart->axisY()->setTitle("Axis Y");
+ chart->axisX()->setTitleText("Axis X");
+ chart->axisY()->setTitleText("Axis Y");
chart->setTitle(" BarCateogry X , Value Y, title");
return chart;
}
diff --git a/demos/chartviewer/charts/axis/barcategoryaxisy.cpp b/demos/chartviewer/charts/axis/barcategoryaxisy.cpp
index 8952a6a1..ad1859c0 100644
--- a/demos/chartviewer/charts/axis/barcategoryaxisy.cpp
+++ b/demos/chartviewer/charts/axis/barcategoryaxisy.cpp
@@ -73,8 +73,8 @@ public:
QChart *createChart(const DataTable &table)
{
QChart *chart = BarCategoryAxisY::createChart(table);
- chart->axisX()->setTitle("Axis X");
- chart->axisY()->setTitle("Axis Y");
+ chart->axisX()->setTitleText("Axis X");
+ chart->axisY()->setTitleText("Axis Y");
chart->setTitle(" BarCateogry Y , Value X, title");
return chart;
}
diff --git a/demos/chartviewer/charts/axis/categoryaxis.cpp b/demos/chartviewer/charts/axis/categoryaxis.cpp
index c77836b9..68997225 100644
--- a/demos/chartviewer/charts/axis/categoryaxis.cpp
+++ b/demos/chartviewer/charts/axis/categoryaxis.cpp
@@ -72,8 +72,8 @@ public:
QChart *createChart(const DataTable &table)
{
QChart *chart = CategoryLineChart::createChart(table);
- chart->axisX()->setTitle("Axis X");
- chart->axisY()->setTitle("Axis Y");
+ chart->axisX()->setTitleText("Axis X");
+ chart->axisY()->setTitleText("Axis Y");
chart->setTitle("Category X , Category Y,title ");
return chart;
}
diff --git a/demos/chartviewer/charts/axis/datetimeaxisx.cpp b/demos/chartviewer/charts/axis/datetimeaxisx.cpp
index cca9efd1..2306467e 100644
--- a/demos/chartviewer/charts/axis/datetimeaxisx.cpp
+++ b/demos/chartviewer/charts/axis/datetimeaxisx.cpp
@@ -69,8 +69,8 @@ public:
QChart *createChart(const DataTable &table)
{
QChart *chart = DateTimeAxisX::createChart(table);
- chart->axisX()->setTitle("Axis X");
- chart->axisY()->setTitle("Axis Y");
+ chart->axisX()->setTitleText("Axis X");
+ chart->axisY()->setTitleText("Axis Y");
chart->setTitle("DateTime X , Value Y, Title");
return chart;
}
diff --git a/demos/chartviewer/charts/axis/datetimeaxisy.cpp b/demos/chartviewer/charts/axis/datetimeaxisy.cpp
index b2b0cb75..04d1fee3 100644
--- a/demos/chartviewer/charts/axis/datetimeaxisy.cpp
+++ b/demos/chartviewer/charts/axis/datetimeaxisy.cpp
@@ -69,8 +69,8 @@ public:
QChart *createChart(const DataTable &table)
{
QChart *chart = DateTimeAxisY::createChart(table);
- chart->axisX()->setTitle("Axis X");
- chart->axisY()->setTitle("Axis Y");
+ chart->axisX()->setTitleText("Axis X");
+ chart->axisY()->setTitleText("Axis Y");
chart->setTitle("Value X , DateTime Y, Title");
return chart;
}
diff --git a/demos/chartviewer/charts/axis/valueaxis.cpp b/demos/chartviewer/charts/axis/valueaxis.cpp
index 5ea95638..b37608cd 100644
--- a/demos/chartviewer/charts/axis/valueaxis.cpp
+++ b/demos/chartviewer/charts/axis/valueaxis.cpp
@@ -64,8 +64,8 @@ public:
QChart *createChart(const DataTable &table)
{
QChart *chart = ValueAxis::createChart(table);
- chart->axisX()->setTitle("Axis X");
- chart->axisY()->setTitle("Axis Y");
+ chart->axisX()->setTitleText("Axis X");
+ chart->axisY()->setTitleText("Axis Y");
chart->setTitle("Value X , Value Y, title");
return chart;
}
diff --git a/demos/chartviewer/charts/barseries/verticalpercentbarchart.cpp b/demos/chartviewer/charts/barseries/verticalpercentbarchart.cpp
index ddb5c96f..a2710b09 100644
--- a/demos/chartviewer/charts/barseries/verticalpercentbarchart.cpp
+++ b/demos/chartviewer/charts/barseries/verticalpercentbarchart.cpp
@@ -33,7 +33,7 @@ public:
QChart *createChart(const DataTable &table)
{
QChart *chart = new QChart();
- chart->setTitle("Stacked bar chart");
+ chart->setTitle("Percent bar chart");
QPercentBarSeries *series = new QPercentBarSeries(chart);
for (int i(0); i < table.count(); i++) {
QBarSet *set = new QBarSet("Bar set " + QString::number(i));
diff --git a/demos/chartviewer/charts/font/font.cpp b/demos/chartviewer/charts/font/font.cpp
index 8b8ad265..d8a100fc 100644
--- a/demos/chartviewer/charts/font/font.cpp
+++ b/demos/chartviewer/charts/font/font.cpp
@@ -50,8 +50,8 @@ public:
chart->setTitleFont(font);
chart->axisX()->setLabelsFont(font);
chart->axisY()->setLabelsFont(font);
- chart->axisX()->setTitle("Axis X");
- chart->axisY()->setTitle("Axis Y");
+ chart->axisX()->setTitleText("Axis X");
+ chart->axisY()->setTitleText("Axis Y");
chart->axisX()->setTitleFont(font);
chart->axisY()->setTitleFont(font);
return chart;
diff --git a/demos/chartviewer/charts/multiaxis/multivalueaxis.cpp b/demos/chartviewer/charts/multiaxis/multivalueaxis.cpp
index a128f590..6e5ead28 100644
--- a/demos/chartviewer/charts/multiaxis/multivalueaxis.cpp
+++ b/demos/chartviewer/charts/multiaxis/multivalueaxis.cpp
@@ -59,20 +59,14 @@ public:
chart->addSeries(series);
axisX = new QValueAxis();
axisX->setLinePenColor(series->pen().color());
- if (nameIndex % 2)
- axisX->setAlignment(Qt::AlignTop);
- else
- axisX->setAlignment(Qt::AlignBottom);
axisY = new QValueAxis();
axisY->setLinePenColor(series->pen().color());
- if (nameIndex % 2)
- axisY->setAlignment(Qt::AlignRight);
- else
- axisY->setAlignment(Qt::AlignLeft);
+ chart->addAxis(axisX,nameIndex % 2?Qt::AlignTop:Qt::AlignBottom);
+ chart->addAxis(axisY,nameIndex % 2?Qt::AlignRight:Qt::AlignLeft);
+ series->attachAxis(axisX);
+ series->attachAxis(axisY);
- chart->setAxisX(axisX, series);
- chart->setAxisY(axisY, series);
nameIndex++;
}
diff --git a/demos/chartviewer/charts/multiaxis/multivalueaxis2.cpp b/demos/chartviewer/charts/multiaxis/multivalueaxis2.cpp
index 907545cc..16c55d4b 100644
--- a/demos/chartviewer/charts/multiaxis/multivalueaxis2.cpp
+++ b/demos/chartviewer/charts/multiaxis/multivalueaxis2.cpp
@@ -59,20 +59,14 @@ public:
chart->addSeries(series);
axisX = new QValueAxis();
axisX->setLinePenColor(series->pen().color());
- if (nameIndex % 2)
- axisX->setAlignment(Qt::AlignTop);
- else
- axisX->setAlignment(Qt::AlignBottom);
+
axisY = new QValueAxis();
axisY->setLinePenColor(series->pen().color());
- if (nameIndex % 2)
- axisY->setAlignment(Qt::AlignRight);
- else
- axisY->setAlignment(Qt::AlignLeft);
-
- chart->setAxisX(axisX, series);
- chart->setAxisY(axisY, series);
+ chart->addAxis(axisX, nameIndex % 2?Qt::AlignTop:Qt::AlignBottom);
+ chart->addAxis(axisY, nameIndex % 2?Qt::AlignRight:Qt::AlignLeft);
+ series->attachAxis(axisX);
+ series->attachAxis(axisY);
nameIndex++;
}
diff --git a/demos/chartviewer/charts/multiaxis/multivalueaxis3.cpp b/demos/chartviewer/charts/multiaxis/multivalueaxis3.cpp
index 1fa5dfa0..b4cd80dd 100644
--- a/demos/chartviewer/charts/multiaxis/multivalueaxis3.cpp
+++ b/demos/chartviewer/charts/multiaxis/multivalueaxis3.cpp
@@ -59,25 +59,16 @@ public:
chart->addSeries(series);
axisX = new QValueAxis();
axisX->setLinePenColor(series->pen().color());
- if (nameIndex % 2){
- axisX->setAlignment(Qt::AlignTop);
- } else{
- axisX->setAlignment(Qt::AlignBottom);
- }
- axisX->setTitle("ValueAxis for series" + QString::number(nameIndex));
+ axisX->setTitleText("ValueAxis for series" + QString::number(nameIndex));
axisY = new QValueAxis();
axisY->setLinePenColor(series->pen().color());
+ axisY->setTitleText("ValueAxis for series" + QString::number(nameIndex));
- if (nameIndex % 2){
- axisY->setAlignment(Qt::AlignRight);
- }else{
- axisY->setAlignment(Qt::AlignLeft);
- }
- axisY->setTitle("ValueAxis for series" + QString::number(nameIndex));
-
- chart->setAxisX(axisX, series);
- chart->setAxisY(axisY, series);
+ chart->addAxis(axisX, nameIndex % 2?Qt::AlignTop:Qt::AlignBottom);
+ chart->addAxis(axisY, nameIndex % 2?Qt::AlignRight:Qt::AlignLeft);
+ series->attachAxis(axisX);
+ series->attachAxis(axisY);
nameIndex++;
}
diff --git a/demos/chartviewer/charts/multiaxis/multivalueaxis4.cpp b/demos/chartviewer/charts/multiaxis/multivalueaxis4.cpp
index 5ab36d13..c35370c7 100644
--- a/demos/chartviewer/charts/multiaxis/multivalueaxis4.cpp
+++ b/demos/chartviewer/charts/multiaxis/multivalueaxis4.cpp
@@ -59,22 +59,15 @@ public:
chart->addSeries(series);
axisX = new QValueAxis();
axisX->setLinePenColor(series->pen().color());
- axisX->setTitle("ValueAxis for series" + QString::number(nameIndex));
- if (nameIndex % 2)
- axisX->setAlignment(Qt::AlignTop);
- else
- axisX->setAlignment(Qt::AlignBottom);
+ axisX->setTitleText("ValueAxis for series" + QString::number(nameIndex));
axisY = new QValueAxis();
axisY->setLinePenColor(series->pen().color());
- axisY->setTitle("ValueAxis for series" + QString::number(nameIndex));
+ axisY->setTitleText("ValueAxis for series" + QString::number(nameIndex));
- if (nameIndex % 2)
- axisY->setAlignment(Qt::AlignRight);
- else
- axisY->setAlignment(Qt::AlignLeft);
-
- chart->setAxisX(axisX, series);
- chart->setAxisY(axisY, series);
+ chart->addAxis(axisX, nameIndex % 2?Qt::AlignTop:Qt::AlignBottom);
+ chart->addAxis(axisY, nameIndex % 2?Qt::AlignRight:Qt::AlignLeft);
+ series->attachAxis(axisX);
+ series->attachAxis(axisY);
nameIndex++;
}
diff --git a/demos/chartviewer/charts/multiaxis/multivaluebaraxis.cpp b/demos/chartviewer/charts/multiaxis/multivaluebaraxis.cpp
index 8dc7de7c..09bfba11 100644
--- a/demos/chartviewer/charts/multiaxis/multivaluebaraxis.cpp
+++ b/demos/chartviewer/charts/multiaxis/multivaluebaraxis.cpp
@@ -64,22 +64,16 @@ public:
chart->addSeries(series);
axisX = new QValueAxis();
axisX->setLinePenColor(series->pen().color());
- axisX->setTitle("ValueAxis for series" + QString::number(nameIndex));
- if (nameIndex % 2)
- axisX->setAlignment(Qt::AlignTop);
- else
- axisX->setAlignment(Qt::AlignBottom);
+ axisX->setTitleText("ValueAxis for series" + QString::number(nameIndex));
+
axisY = new QValueAxis();
axisY->setLinePenColor(series->pen().color());
- axisY->setTitle("ValueAxis for series" + QString::number(nameIndex));
-
- if (nameIndex % 2)
- axisY->setAlignment(Qt::AlignRight);
- else
- axisY->setAlignment(Qt::AlignLeft);
+ axisY->setTitleText("ValueAxis for series" + QString::number(nameIndex));
- chart->setAxisX(axisX, series);
- chart->setAxisY(axisY, series);
+ chart->addAxis(axisX, nameIndex % 2?Qt::AlignTop:Qt::AlignBottom);
+ chart->addAxis(axisY, nameIndex % 2?Qt::AlignRight:Qt::AlignLeft);
+ series->attachAxis(axisX);
+ series->attachAxis(axisY);
nameIndex++;
}
@@ -96,7 +90,7 @@ public:
barcategory->setLinePen(set->brush().color());
barcategory->setGridLinePen(set->brush().color());
- barcategory->setTitle("BarCategoryAxis Title");
+ barcategory->setTitleText("BarCategoryAxis Title");
chart->setAxisX(barcategory, series);