HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2147:d6a1a8d186a0

Adds title examples to chartviewer

Michal Klocek -

r2147:d6a1a8d186a0

parent child

Context file:

r2147:d6a1a8d186a0

demos/chartviewer/charts/axis/barcategoryaxisx.cpp +14 0

@@ -63,4 +63,18 public:
63	}	63	}
64	};	64	};
65		65
		66	class BarCategoryAxisXTitle: public BarCategoryAxisX
		67	{
		68	QString name() { return "AxisX Title"; }
		69	QChart *createChart(const DataTable &table)
		70	{
		71	QChart *chart = BarCategoryAxisX::createChart(table);
		72	chart->axisX()->setTitle("Axis X");
		73	chart->axisY()->setTitle("Axis Y");
		74	chart->setTitle(" BarCateogry X , Value Y, title");
		75	return chart;
		76	}
		77	};
		78
66	DECLARE_CHART(BarCategoryAxisX);	79	DECLARE_CHART(BarCategoryAxisX);
		80	DECLARE_CHART(BarCategoryAxisXTitle);

demos/chartviewer/charts/axis/barcategoryaxisy.cpp +19 0

@@ -62,4 +62,23 public:
62	}	62	}
63	};	63	};
64		64
		65	class BarCategoryAxisYTitle: public BarCategoryAxisY
		66	{
		67	public:
		68	QString name()
		69	{
		70	return "AxisY Title";
		71	}
		72
		73	QChart *createChart(const DataTable &table)
		74	{
		75	QChart *chart = BarCategoryAxisY::createChart(table);
		76	chart->axisX()->setTitle("Axis X");
		77	chart->axisY()->setTitle("Axis Y");
		78	chart->setTitle(" BarCateogry Y , Value X, title");
		79	return chart;
		80	}
		81	};
		82
65	DECLARE_CHART(BarCategoryAxisY);	83	DECLARE_CHART(BarCategoryAxisY);
		84	DECLARE_CHART(BarCategoryAxisYTitle);

demos/chartviewer/charts/axis/categoryaxis.cpp +17 -2

@@ -30,7 +30,7 public:
30	QString category() { return QObject::tr("Axis"); }	30	QString category() { return QObject::tr("Axis"); }
31	QString subCategory() { return QString::null; }	31	QString subCategory() { return QString::null; }
32		32
33	QChart *createChart(const DataTable &table)	33	QChart *createChart(const DataTable &table)
34	{	34	{
35	QChart *chart = new QChart();	35	QChart *chart = new QChart();
36	chart->setTitle("Category X , Category Y ");	36	chart->setTitle("Category X , Category Y ");
@@ -64,5 +64,20 public:
64	}	64	}
65	};	65	};
66		66
67	DECLARE_CHART(CategoryLineChart)	67	class CategoryLineChartTitle: public CategoryLineChart
		68	{
		69	public:
		70	QString name() { return QObject::tr("CategoryAxis, Title"); }
68		71
		72	QChart *createChart(const DataTable &table)
		73	{
		74	QChart *chart = CategoryLineChart::createChart(table);
		75	chart->axisX()->setTitle("Axis X");
		76	chart->axisY()->setTitle("Axis Y");
		77	chart->setTitle("Category X , Category Y,title ");
		78	return chart;
		79	}
		80	};
		81
		82	DECLARE_CHART(CategoryLineChart)
		83	DECLARE_CHART(CategoryLineChartTitle)

demos/chartviewer/charts/axis/datetimeaxisx.cpp +17 0

@@ -59,4 +59,21 public:
59	}	59	}
60	};	60	};
61		61
		62	class DateTimeAxisXTitle: public DateTimeAxisX
		63	{
		64	public:
		65	QString name() { return "AxisX Title"; }
		66
		67	QChart *createChart(const DataTable &table)
		68	{
		69	QChart *chart = DateTimeAxisX::createChart(table);
		70	chart->axisX()->setTitle("Axis X");
		71	chart->axisY()->setTitle("Axis Y");
		72	chart->setTitle("DateTime X , Value Y, Title");
		73	return chart;
		74	}
		75	};
		76
		77
62	DECLARE_CHART(DateTimeAxisX);	78	DECLARE_CHART(DateTimeAxisX);
		79	DECLARE_CHART(DateTimeAxisXTitle);

demos/chartviewer/charts/axis/datetimeaxisy.cpp +16 0

@@ -59,4 +59,20 public:
59	}	59	}
60	};	60	};
61		61
		62	class DateTimeAxisYTitle: public DateTimeAxisY
		63	{
		64	public:
		65	QString name() { return "AxisY Title"; }
		66
		67	QChart *createChart(const DataTable &table)
		68	{
		69	QChart *chart = DateTimeAxisY::createChart(table);
		70	chart->axisX()->setTitle("Axis X");
		71	chart->axisY()->setTitle("Axis Y");
		72	chart->setTitle("Value X , DateTime Y, Title");
		73	return chart;
		74	}
		75	};
		76
62	DECLARE_CHART(DateTimeAxisY);	77	DECLARE_CHART(DateTimeAxisY);
		78	DECLARE_CHART(DateTimeAxisYTitle);

demos/chartviewer/charts/axis/valueaxis.cpp +16 0

@@ -56,4 +56,20 public:
56	}	56	}
57	};	57	};
58		58
		59	class ValueAxisTitle: public ValueAxis
		60	{
		61	public:
		62	QString name() { return "ValueAxis Title"; }
		63
		64	QChart *createChart(const DataTable &table)
		65	{
		66	QChart *chart = ValueAxis::createChart(table);
		67	chart->axisX()->setTitle("Axis X");
		68	chart->axisY()->setTitle("Axis Y");
		69	chart->setTitle("Value X , Value Y, title");
		70	return chart;
		71	}
		72	};
		73
59	DECLARE_CHART(ValueAxis);	74	DECLARE_CHART(ValueAxis);
		75	DECLARE_CHART(ValueAxisTitle);

demos/chartviewer/charts/charts.pri 0 -6

                 axis/barcategoryaxisy.cpp \
                 axis/datetimeaxisx.cpp \
                 axis/datetimeaxisy.cpp \
-                axis/valueaxis2.cpp \
-                axis/categoryaxis2.cpp \
-                axis/barcategoryaxisx2.cpp \
-                axis/barcategoryaxisy2.cpp \
-                axis/datetimeaxisx2.cpp \
-                axis/datetimeaxisy2.cpp \
                 multiaxis/multivalueaxis.cpp \
                 multiaxis/multivalueaxis2.cpp \
                 multiaxis/multivalueaxis3.cpp \

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages