mirror of
https://github.com/flutter/samples.git
synced 2025-11-09 22:38:42 +00:00
web/chart: fix sample (#909)
This commit is contained in:
Brett Morgan
GitHub
@@ -23,35 +23,35 @@ import 'scatter_plot_line.dart';
|
||||
|
||||
List<GalleryScaffold> buildGallery() {
|
||||
return [
|
||||
new GalleryScaffold(
|
||||
listTileIcon: new Icon(Icons.insert_chart),
|
||||
GalleryScaffold(
|
||||
listTileIcon: const Icon(Icons.insert_chart),
|
||||
title: 'Ordinal Combo Chart',
|
||||
subtitle: 'Ordinal combo chart with bars and lines',
|
||||
childBuilder: () => new OrdinalComboBarLineChart.withRandomData(),
|
||||
childBuilder: () => OrdinalComboBarLineChart.withRandomData(),
|
||||
),
|
||||
new GalleryScaffold(
|
||||
listTileIcon: new Icon(Icons.show_chart),
|
||||
GalleryScaffold(
|
||||
listTileIcon: const Icon(Icons.show_chart),
|
||||
title: 'Numeric Line Bar Combo Chart',
|
||||
subtitle: 'Numeric combo chart with lines and bars',
|
||||
childBuilder: () => new NumericComboLineBarChart.withRandomData(),
|
||||
childBuilder: () => NumericComboLineBarChart.withRandomData(),
|
||||
),
|
||||
new GalleryScaffold(
|
||||
listTileIcon: new Icon(Icons.show_chart),
|
||||
GalleryScaffold(
|
||||
listTileIcon: const Icon(Icons.show_chart),
|
||||
title: 'Numeric Line Points Combo Chart',
|
||||
subtitle: 'Numeric combo chart with lines and points',
|
||||
childBuilder: () => new NumericComboLinePointChart.withRandomData(),
|
||||
childBuilder: () => NumericComboLinePointChart.withRandomData(),
|
||||
),
|
||||
new GalleryScaffold(
|
||||
listTileIcon: new Icon(Icons.show_chart),
|
||||
GalleryScaffold(
|
||||
listTileIcon: const Icon(Icons.show_chart),
|
||||
title: 'Time Series Combo Chart',
|
||||
subtitle: 'Time series combo chart with lines and points',
|
||||
childBuilder: () => new DateTimeComboLinePointChart.withRandomData(),
|
||||
childBuilder: () => DateTimeComboLinePointChart.withRandomData(),
|
||||
),
|
||||
new GalleryScaffold(
|
||||
listTileIcon: new Icon(Icons.scatter_plot),
|
||||
GalleryScaffold(
|
||||
listTileIcon: const Icon(Icons.scatter_plot),
|
||||
title: 'Scatter Plot Combo Chart',
|
||||
subtitle: 'Scatter plot combo chart with a line',
|
||||
childBuilder: () => new ScatterPlotComboLineChart.withRandomData(),
|
||||
childBuilder: () => ScatterPlotComboLineChart.withRandomData(),
|
||||
),
|
||||
];
|
||||
}
|
||||
|
||||
@@ -30,11 +30,12 @@ class DateTimeComboLinePointChart extends StatelessWidget {
|
||||
final List<charts.Series> seriesList;
|
||||
final bool animate;
|
||||
|
||||
DateTimeComboLinePointChart(this.seriesList, {this.animate});
|
||||
const DateTimeComboLinePointChart(this.seriesList, {this.animate, Key key})
|
||||
: super(key: key);
|
||||
|
||||
/// Creates a [TimeSeriesChart] with sample data and no transition.
|
||||
factory DateTimeComboLinePointChart.withSampleData() {
|
||||
return new DateTimeComboLinePointChart(
|
||||
return DateTimeComboLinePointChart(
|
||||
_createSampleData(),
|
||||
// Disable animations for image tests.
|
||||
animate: false,
|
||||
@@ -46,50 +47,50 @@ class DateTimeComboLinePointChart extends StatelessWidget {
|
||||
// It is used for creating random series data to demonstrate animation in
|
||||
// the example app only.
|
||||
factory DateTimeComboLinePointChart.withRandomData() {
|
||||
return new DateTimeComboLinePointChart(_createRandomData());
|
||||
return DateTimeComboLinePointChart(_createRandomData());
|
||||
}
|
||||
|
||||
/// Create random data.
|
||||
static List<charts.Series<TimeSeriesSales, DateTime>> _createRandomData() {
|
||||
final random = new Random();
|
||||
final random = Random();
|
||||
|
||||
final desktopSalesData = [
|
||||
new TimeSeriesSales(new DateTime(2017, 9, 19), random.nextInt(100)),
|
||||
new TimeSeriesSales(new DateTime(2017, 9, 26), random.nextInt(100)),
|
||||
new TimeSeriesSales(new DateTime(2017, 10, 3), random.nextInt(100)),
|
||||
new TimeSeriesSales(new DateTime(2017, 10, 10), random.nextInt(100)),
|
||||
TimeSeriesSales(DateTime(2017, 9, 19), random.nextInt(100)),
|
||||
TimeSeriesSales(DateTime(2017, 9, 26), random.nextInt(100)),
|
||||
TimeSeriesSales(DateTime(2017, 10, 3), random.nextInt(100)),
|
||||
TimeSeriesSales(DateTime(2017, 10, 10), random.nextInt(100)),
|
||||
];
|
||||
|
||||
final tableSalesData = [
|
||||
new TimeSeriesSales(new DateTime(2017, 9, 19), random.nextInt(100)),
|
||||
new TimeSeriesSales(new DateTime(2017, 9, 26), random.nextInt(100)),
|
||||
new TimeSeriesSales(new DateTime(2017, 10, 3), random.nextInt(100)),
|
||||
new TimeSeriesSales(new DateTime(2017, 10, 10), random.nextInt(100)),
|
||||
TimeSeriesSales(DateTime(2017, 9, 19), random.nextInt(100)),
|
||||
TimeSeriesSales(DateTime(2017, 9, 26), random.nextInt(100)),
|
||||
TimeSeriesSales(DateTime(2017, 10, 3), random.nextInt(100)),
|
||||
TimeSeriesSales(DateTime(2017, 10, 10), random.nextInt(100)),
|
||||
];
|
||||
|
||||
final mobileSalesData = [
|
||||
new TimeSeriesSales(new DateTime(2017, 9, 19), tableSalesData[0].sales),
|
||||
new TimeSeriesSales(new DateTime(2017, 9, 26), tableSalesData[1].sales),
|
||||
new TimeSeriesSales(new DateTime(2017, 10, 3), tableSalesData[2].sales),
|
||||
new TimeSeriesSales(new DateTime(2017, 10, 10), tableSalesData[3].sales),
|
||||
TimeSeriesSales(DateTime(2017, 9, 19), tableSalesData[0].sales),
|
||||
TimeSeriesSales(DateTime(2017, 9, 26), tableSalesData[1].sales),
|
||||
TimeSeriesSales(DateTime(2017, 10, 3), tableSalesData[2].sales),
|
||||
TimeSeriesSales(DateTime(2017, 10, 10), tableSalesData[3].sales),
|
||||
];
|
||||
|
||||
return [
|
||||
new charts.Series<TimeSeriesSales, DateTime>(
|
||||
charts.Series<TimeSeriesSales, DateTime>(
|
||||
id: 'Desktop',
|
||||
colorFn: (_, __) => charts.MaterialPalette.blue.shadeDefault,
|
||||
domainFn: (TimeSeriesSales sales, _) => sales.time,
|
||||
measureFn: (TimeSeriesSales sales, _) => sales.sales,
|
||||
data: desktopSalesData,
|
||||
),
|
||||
new charts.Series<TimeSeriesSales, DateTime>(
|
||||
charts.Series<TimeSeriesSales, DateTime>(
|
||||
id: 'Tablet',
|
||||
colorFn: (_, __) => charts.MaterialPalette.red.shadeDefault,
|
||||
domainFn: (TimeSeriesSales sales, _) => sales.time,
|
||||
measureFn: (TimeSeriesSales sales, _) => sales.sales,
|
||||
data: tableSalesData,
|
||||
),
|
||||
new charts.Series<TimeSeriesSales, DateTime>(
|
||||
charts.Series<TimeSeriesSales, DateTime>(
|
||||
id: 'Mobile',
|
||||
colorFn: (_, __) => charts.MaterialPalette.green.shadeDefault,
|
||||
domainFn: (TimeSeriesSales sales, _) => sales.time,
|
||||
@@ -103,17 +104,17 @@ class DateTimeComboLinePointChart extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return new charts.TimeSeriesChart(
|
||||
return charts.TimeSeriesChart(
|
||||
seriesList,
|
||||
animate: animate,
|
||||
// Configure the default renderer as a line renderer. This will be used
|
||||
// for any series that does not define a rendererIdKey.
|
||||
//
|
||||
// This is the default configuration, but is shown here for illustration.
|
||||
defaultRenderer: new charts.LineRendererConfig(),
|
||||
defaultRenderer: charts.LineRendererConfig(),
|
||||
// Custom renderer configuration for the point series.
|
||||
customSeriesRenderers: [
|
||||
new charts.PointRendererConfig(
|
||||
charts.PointRendererConfig(
|
||||
// ID used to link series to this renderer.
|
||||
customRendererId: 'customPoint')
|
||||
],
|
||||
@@ -127,42 +128,42 @@ class DateTimeComboLinePointChart extends StatelessWidget {
|
||||
/// Create one series with sample hard coded data.
|
||||
static List<charts.Series<TimeSeriesSales, DateTime>> _createSampleData() {
|
||||
final desktopSalesData = [
|
||||
new TimeSeriesSales(new DateTime(2017, 9, 19), 5),
|
||||
new TimeSeriesSales(new DateTime(2017, 9, 26), 25),
|
||||
new TimeSeriesSales(new DateTime(2017, 10, 3), 100),
|
||||
new TimeSeriesSales(new DateTime(2017, 10, 10), 75),
|
||||
TimeSeriesSales(DateTime(2017, 9, 19), 5),
|
||||
TimeSeriesSales(DateTime(2017, 9, 26), 25),
|
||||
TimeSeriesSales(DateTime(2017, 10, 3), 100),
|
||||
TimeSeriesSales(DateTime(2017, 10, 10), 75),
|
||||
];
|
||||
|
||||
final tableSalesData = [
|
||||
new TimeSeriesSales(new DateTime(2017, 9, 19), 10),
|
||||
new TimeSeriesSales(new DateTime(2017, 9, 26), 50),
|
||||
new TimeSeriesSales(new DateTime(2017, 10, 3), 200),
|
||||
new TimeSeriesSales(new DateTime(2017, 10, 10), 150),
|
||||
TimeSeriesSales(DateTime(2017, 9, 19), 10),
|
||||
TimeSeriesSales(DateTime(2017, 9, 26), 50),
|
||||
TimeSeriesSales(DateTime(2017, 10, 3), 200),
|
||||
TimeSeriesSales(DateTime(2017, 10, 10), 150),
|
||||
];
|
||||
|
||||
final mobileSalesData = [
|
||||
new TimeSeriesSales(new DateTime(2017, 9, 19), 10),
|
||||
new TimeSeriesSales(new DateTime(2017, 9, 26), 50),
|
||||
new TimeSeriesSales(new DateTime(2017, 10, 3), 200),
|
||||
new TimeSeriesSales(new DateTime(2017, 10, 10), 150),
|
||||
TimeSeriesSales(DateTime(2017, 9, 19), 10),
|
||||
TimeSeriesSales(DateTime(2017, 9, 26), 50),
|
||||
TimeSeriesSales(DateTime(2017, 10, 3), 200),
|
||||
TimeSeriesSales(DateTime(2017, 10, 10), 150),
|
||||
];
|
||||
|
||||
return [
|
||||
new charts.Series<TimeSeriesSales, DateTime>(
|
||||
charts.Series<TimeSeriesSales, DateTime>(
|
||||
id: 'Desktop',
|
||||
colorFn: (_, __) => charts.MaterialPalette.blue.shadeDefault,
|
||||
domainFn: (TimeSeriesSales sales, _) => sales.time,
|
||||
measureFn: (TimeSeriesSales sales, _) => sales.sales,
|
||||
data: desktopSalesData,
|
||||
),
|
||||
new charts.Series<TimeSeriesSales, DateTime>(
|
||||
charts.Series<TimeSeriesSales, DateTime>(
|
||||
id: 'Tablet',
|
||||
colorFn: (_, __) => charts.MaterialPalette.red.shadeDefault,
|
||||
domainFn: (TimeSeriesSales sales, _) => sales.time,
|
||||
measureFn: (TimeSeriesSales sales, _) => sales.sales,
|
||||
data: tableSalesData,
|
||||
),
|
||||
new charts.Series<TimeSeriesSales, DateTime>(
|
||||
charts.Series<TimeSeriesSales, DateTime>(
|
||||
id: 'Mobile',
|
||||
colorFn: (_, __) => charts.MaterialPalette.green.shadeDefault,
|
||||
domainFn: (TimeSeriesSales sales, _) => sales.time,
|
||||
|
||||
@@ -25,11 +25,12 @@ class NumericComboLineBarChart extends StatelessWidget {
|
||||
final List<charts.Series> seriesList;
|
||||
final bool animate;
|
||||
|
||||
NumericComboLineBarChart(this.seriesList, {this.animate});
|
||||
const NumericComboLineBarChart(this.seriesList, {this.animate, Key key})
|
||||
: super(key: key);
|
||||
|
||||
/// Creates a [LineChart] with sample data and no transition.
|
||||
factory NumericComboLineBarChart.withSampleData() {
|
||||
return new NumericComboLineBarChart(
|
||||
return NumericComboLineBarChart(
|
||||
_createSampleData(),
|
||||
// Disable animations for image tests.
|
||||
animate: false,
|
||||
@@ -41,36 +42,36 @@ class NumericComboLineBarChart extends StatelessWidget {
|
||||
// It is used for creating random series data to demonstrate animation in
|
||||
// the example app only.
|
||||
factory NumericComboLineBarChart.withRandomData() {
|
||||
return new NumericComboLineBarChart(_createRandomData());
|
||||
return NumericComboLineBarChart(_createRandomData());
|
||||
}
|
||||
|
||||
/// Create random data.
|
||||
static List<charts.Series<LinearSales, num>> _createRandomData() {
|
||||
final random = new Random();
|
||||
final random = Random();
|
||||
|
||||
final desktopSalesData = [
|
||||
new LinearSales(0, random.nextInt(100)),
|
||||
new LinearSales(1, random.nextInt(100)),
|
||||
new LinearSales(2, random.nextInt(100)),
|
||||
new LinearSales(3, random.nextInt(100)),
|
||||
LinearSales(0, random.nextInt(100)),
|
||||
LinearSales(1, random.nextInt(100)),
|
||||
LinearSales(2, random.nextInt(100)),
|
||||
LinearSales(3, random.nextInt(100)),
|
||||
];
|
||||
|
||||
final tableSalesData = [
|
||||
new LinearSales(0, desktopSalesData[0].sales),
|
||||
new LinearSales(1, desktopSalesData[1].sales),
|
||||
new LinearSales(2, desktopSalesData[2].sales),
|
||||
new LinearSales(3, desktopSalesData[3].sales),
|
||||
LinearSales(0, desktopSalesData[0].sales),
|
||||
LinearSales(1, desktopSalesData[1].sales),
|
||||
LinearSales(2, desktopSalesData[2].sales),
|
||||
LinearSales(3, desktopSalesData[3].sales),
|
||||
];
|
||||
|
||||
final mobileSalesData = [
|
||||
new LinearSales(0, tableSalesData[0].sales * 2),
|
||||
new LinearSales(1, tableSalesData[1].sales * 2),
|
||||
new LinearSales(2, tableSalesData[2].sales * 2),
|
||||
new LinearSales(3, tableSalesData[3].sales * 2),
|
||||
LinearSales(0, tableSalesData[0].sales * 2),
|
||||
LinearSales(1, tableSalesData[1].sales * 2),
|
||||
LinearSales(2, tableSalesData[2].sales * 2),
|
||||
LinearSales(3, tableSalesData[3].sales * 2),
|
||||
];
|
||||
|
||||
return [
|
||||
new charts.Series<LinearSales, int>(
|
||||
charts.Series<LinearSales, int>(
|
||||
id: 'Desktop',
|
||||
colorFn: (_, __) => charts.MaterialPalette.blue.shadeDefault,
|
||||
domainFn: (LinearSales sales, _) => sales.year,
|
||||
@@ -79,7 +80,7 @@ class NumericComboLineBarChart extends StatelessWidget {
|
||||
)
|
||||
// Configure our custom bar renderer for this series.
|
||||
..setAttribute(charts.rendererIdKey, 'customBar'),
|
||||
new charts.Series<LinearSales, int>(
|
||||
charts.Series<LinearSales, int>(
|
||||
id: 'Tablet',
|
||||
colorFn: (_, __) => charts.MaterialPalette.red.shadeDefault,
|
||||
domainFn: (LinearSales sales, _) => sales.year,
|
||||
@@ -88,7 +89,7 @@ class NumericComboLineBarChart extends StatelessWidget {
|
||||
)
|
||||
// Configure our custom bar renderer for this series.
|
||||
..setAttribute(charts.rendererIdKey, 'customBar'),
|
||||
new charts.Series<LinearSales, int>(
|
||||
charts.Series<LinearSales, int>(
|
||||
id: 'Mobile',
|
||||
colorFn: (_, __) => charts.MaterialPalette.green.shadeDefault,
|
||||
domainFn: (LinearSales sales, _) => sales.year,
|
||||
@@ -100,14 +101,14 @@ class NumericComboLineBarChart extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return new charts.NumericComboChart(seriesList,
|
||||
return charts.NumericComboChart(seriesList,
|
||||
animate: animate,
|
||||
// Configure the default renderer as a line renderer. This will be used
|
||||
// for any series that does not define a rendererIdKey.
|
||||
defaultRenderer: new charts.LineRendererConfig(),
|
||||
defaultRenderer: charts.LineRendererConfig(),
|
||||
// Custom renderer configuration for the bar series.
|
||||
customSeriesRenderers: [
|
||||
new charts.BarRendererConfig(
|
||||
charts.BarRendererConfig(
|
||||
// ID used to link series to this renderer.
|
||||
customRendererId: 'customBar')
|
||||
]);
|
||||
@@ -116,28 +117,28 @@ class NumericComboLineBarChart extends StatelessWidget {
|
||||
/// Create one series with sample hard coded data.
|
||||
static List<charts.Series<LinearSales, int>> _createSampleData() {
|
||||
final desktopSalesData = [
|
||||
new LinearSales(0, 5),
|
||||
new LinearSales(1, 25),
|
||||
new LinearSales(2, 100),
|
||||
new LinearSales(3, 75),
|
||||
LinearSales(0, 5),
|
||||
LinearSales(1, 25),
|
||||
LinearSales(2, 100),
|
||||
LinearSales(3, 75),
|
||||
];
|
||||
|
||||
final tableSalesData = [
|
||||
new LinearSales(0, 5),
|
||||
new LinearSales(1, 25),
|
||||
new LinearSales(2, 100),
|
||||
new LinearSales(3, 75),
|
||||
LinearSales(0, 5),
|
||||
LinearSales(1, 25),
|
||||
LinearSales(2, 100),
|
||||
LinearSales(3, 75),
|
||||
];
|
||||
|
||||
final mobileSalesData = [
|
||||
new LinearSales(0, 10),
|
||||
new LinearSales(1, 50),
|
||||
new LinearSales(2, 200),
|
||||
new LinearSales(3, 150),
|
||||
LinearSales(0, 10),
|
||||
LinearSales(1, 50),
|
||||
LinearSales(2, 200),
|
||||
LinearSales(3, 150),
|
||||
];
|
||||
|
||||
return [
|
||||
new charts.Series<LinearSales, int>(
|
||||
charts.Series<LinearSales, int>(
|
||||
id: 'Desktop',
|
||||
colorFn: (_, __) => charts.MaterialPalette.blue.shadeDefault,
|
||||
domainFn: (LinearSales sales, _) => sales.year,
|
||||
@@ -146,7 +147,7 @@ class NumericComboLineBarChart extends StatelessWidget {
|
||||
)
|
||||
// Configure our custom bar renderer for this series.
|
||||
..setAttribute(charts.rendererIdKey, 'customBar'),
|
||||
new charts.Series<LinearSales, int>(
|
||||
charts.Series<LinearSales, int>(
|
||||
id: 'Tablet',
|
||||
colorFn: (_, __) => charts.MaterialPalette.red.shadeDefault,
|
||||
domainFn: (LinearSales sales, _) => sales.year,
|
||||
@@ -155,7 +156,7 @@ class NumericComboLineBarChart extends StatelessWidget {
|
||||
)
|
||||
// Configure our custom bar renderer for this series.
|
||||
..setAttribute(charts.rendererIdKey, 'customBar'),
|
||||
new charts.Series<LinearSales, int>(
|
||||
charts.Series<LinearSales, int>(
|
||||
id: 'Mobile',
|
||||
colorFn: (_, __) => charts.MaterialPalette.green.shadeDefault,
|
||||
domainFn: (LinearSales sales, _) => sales.year,
|
||||
|
||||
@@ -30,11 +30,12 @@ class NumericComboLinePointChart extends StatelessWidget {
|
||||
final List<charts.Series> seriesList;
|
||||
final bool animate;
|
||||
|
||||
NumericComboLinePointChart(this.seriesList, {this.animate});
|
||||
const NumericComboLinePointChart(this.seriesList, {this.animate, Key key})
|
||||
: super(key: key);
|
||||
|
||||
/// Creates a [LineChart] with sample data and no transition.
|
||||
factory NumericComboLinePointChart.withSampleData() {
|
||||
return new NumericComboLinePointChart(
|
||||
return NumericComboLinePointChart(
|
||||
_createSampleData(),
|
||||
// Disable animations for image tests.
|
||||
animate: false,
|
||||
@@ -46,50 +47,50 @@ class NumericComboLinePointChart extends StatelessWidget {
|
||||
// It is used for creating random series data to demonstrate animation in
|
||||
// the example app only.
|
||||
factory NumericComboLinePointChart.withRandomData() {
|
||||
return new NumericComboLinePointChart(_createRandomData());
|
||||
return NumericComboLinePointChart(_createRandomData());
|
||||
}
|
||||
|
||||
/// Create random data.
|
||||
static List<charts.Series<LinearSales, num>> _createRandomData() {
|
||||
final random = new Random();
|
||||
final random = Random();
|
||||
|
||||
final desktopSalesData = [
|
||||
new LinearSales(0, random.nextInt(100)),
|
||||
new LinearSales(1, random.nextInt(100)),
|
||||
new LinearSales(2, random.nextInt(100)),
|
||||
new LinearSales(3, random.nextInt(100)),
|
||||
LinearSales(0, random.nextInt(100)),
|
||||
LinearSales(1, random.nextInt(100)),
|
||||
LinearSales(2, random.nextInt(100)),
|
||||
LinearSales(3, random.nextInt(100)),
|
||||
];
|
||||
|
||||
final tableSalesData = [
|
||||
new LinearSales(0, random.nextInt(100)),
|
||||
new LinearSales(1, random.nextInt(100)),
|
||||
new LinearSales(2, random.nextInt(100)),
|
||||
new LinearSales(3, random.nextInt(100)),
|
||||
LinearSales(0, random.nextInt(100)),
|
||||
LinearSales(1, random.nextInt(100)),
|
||||
LinearSales(2, random.nextInt(100)),
|
||||
LinearSales(3, random.nextInt(100)),
|
||||
];
|
||||
|
||||
final mobileSalesData = [
|
||||
new LinearSales(0, tableSalesData[0].sales),
|
||||
new LinearSales(1, tableSalesData[1].sales),
|
||||
new LinearSales(2, tableSalesData[2].sales),
|
||||
new LinearSales(3, tableSalesData[3].sales),
|
||||
LinearSales(0, tableSalesData[0].sales),
|
||||
LinearSales(1, tableSalesData[1].sales),
|
||||
LinearSales(2, tableSalesData[2].sales),
|
||||
LinearSales(3, tableSalesData[3].sales),
|
||||
];
|
||||
|
||||
return [
|
||||
new charts.Series<LinearSales, int>(
|
||||
charts.Series<LinearSales, int>(
|
||||
id: 'Desktop',
|
||||
colorFn: (_, __) => charts.MaterialPalette.blue.shadeDefault,
|
||||
domainFn: (LinearSales sales, _) => sales.year,
|
||||
measureFn: (LinearSales sales, _) => sales.sales,
|
||||
data: desktopSalesData,
|
||||
),
|
||||
new charts.Series<LinearSales, int>(
|
||||
charts.Series<LinearSales, int>(
|
||||
id: 'Tablet',
|
||||
colorFn: (_, __) => charts.MaterialPalette.red.shadeDefault,
|
||||
domainFn: (LinearSales sales, _) => sales.year,
|
||||
measureFn: (LinearSales sales, _) => sales.sales,
|
||||
data: tableSalesData,
|
||||
),
|
||||
new charts.Series<LinearSales, int>(
|
||||
charts.Series<LinearSales, int>(
|
||||
id: 'Mobile',
|
||||
colorFn: (_, __) => charts.MaterialPalette.green.shadeDefault,
|
||||
domainFn: (LinearSales sales, _) => sales.year,
|
||||
@@ -103,14 +104,14 @@ class NumericComboLinePointChart extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return new charts.NumericComboChart(seriesList,
|
||||
return charts.NumericComboChart(seriesList,
|
||||
animate: animate,
|
||||
// Configure the default renderer as a line renderer. This will be used
|
||||
// for any series that does not define a rendererIdKey.
|
||||
defaultRenderer: new charts.LineRendererConfig(),
|
||||
defaultRenderer: charts.LineRendererConfig(),
|
||||
// Custom renderer configuration for the point series.
|
||||
customSeriesRenderers: [
|
||||
new charts.PointRendererConfig(
|
||||
charts.PointRendererConfig(
|
||||
// ID used to link series to this renderer.
|
||||
customRendererId: 'customPoint')
|
||||
]);
|
||||
@@ -119,42 +120,42 @@ class NumericComboLinePointChart extends StatelessWidget {
|
||||
/// Create one series with sample hard coded data.
|
||||
static List<charts.Series<LinearSales, int>> _createSampleData() {
|
||||
final desktopSalesData = [
|
||||
new LinearSales(0, 5),
|
||||
new LinearSales(1, 25),
|
||||
new LinearSales(2, 100),
|
||||
new LinearSales(3, 75),
|
||||
LinearSales(0, 5),
|
||||
LinearSales(1, 25),
|
||||
LinearSales(2, 100),
|
||||
LinearSales(3, 75),
|
||||
];
|
||||
|
||||
final tableSalesData = [
|
||||
new LinearSales(0, 10),
|
||||
new LinearSales(1, 50),
|
||||
new LinearSales(2, 200),
|
||||
new LinearSales(3, 150),
|
||||
LinearSales(0, 10),
|
||||
LinearSales(1, 50),
|
||||
LinearSales(2, 200),
|
||||
LinearSales(3, 150),
|
||||
];
|
||||
|
||||
final mobileSalesData = [
|
||||
new LinearSales(0, 10),
|
||||
new LinearSales(1, 50),
|
||||
new LinearSales(2, 200),
|
||||
new LinearSales(3, 150),
|
||||
LinearSales(0, 10),
|
||||
LinearSales(1, 50),
|
||||
LinearSales(2, 200),
|
||||
LinearSales(3, 150),
|
||||
];
|
||||
|
||||
return [
|
||||
new charts.Series<LinearSales, int>(
|
||||
charts.Series<LinearSales, int>(
|
||||
id: 'Desktop',
|
||||
colorFn: (_, __) => charts.MaterialPalette.blue.shadeDefault,
|
||||
domainFn: (LinearSales sales, _) => sales.year,
|
||||
measureFn: (LinearSales sales, _) => sales.sales,
|
||||
data: desktopSalesData,
|
||||
),
|
||||
new charts.Series<LinearSales, int>(
|
||||
charts.Series<LinearSales, int>(
|
||||
id: 'Tablet',
|
||||
colorFn: (_, __) => charts.MaterialPalette.red.shadeDefault,
|
||||
domainFn: (LinearSales sales, _) => sales.year,
|
||||
measureFn: (LinearSales sales, _) => sales.sales,
|
||||
data: tableSalesData,
|
||||
),
|
||||
new charts.Series<LinearSales, int>(
|
||||
charts.Series<LinearSales, int>(
|
||||
id: 'Mobile',
|
||||
colorFn: (_, __) => charts.MaterialPalette.green.shadeDefault,
|
||||
domainFn: (LinearSales sales, _) => sales.year,
|
||||
|
||||
@@ -25,10 +25,11 @@ class OrdinalComboBarLineChart extends StatelessWidget {
|
||||
final List<charts.Series> seriesList;
|
||||
final bool animate;
|
||||
|
||||
OrdinalComboBarLineChart(this.seriesList, {this.animate});
|
||||
const OrdinalComboBarLineChart(this.seriesList, {this.animate, Key key})
|
||||
: super(key: key);
|
||||
|
||||
factory OrdinalComboBarLineChart.withSampleData() {
|
||||
return new OrdinalComboBarLineChart(
|
||||
return OrdinalComboBarLineChart(
|
||||
_createSampleData(),
|
||||
// Disable animations for image tests.
|
||||
animate: false,
|
||||
@@ -40,48 +41,48 @@ class OrdinalComboBarLineChart extends StatelessWidget {
|
||||
// It is used for creating random series data to demonstrate animation in
|
||||
// the example app only.
|
||||
factory OrdinalComboBarLineChart.withRandomData() {
|
||||
return new OrdinalComboBarLineChart(_createRandomData());
|
||||
return OrdinalComboBarLineChart(_createRandomData());
|
||||
}
|
||||
|
||||
/// Create random data.
|
||||
static List<charts.Series<OrdinalSales, String>> _createRandomData() {
|
||||
final random = new Random();
|
||||
final random = Random();
|
||||
|
||||
final desktopSalesData = [
|
||||
new OrdinalSales('2014', random.nextInt(100)),
|
||||
new OrdinalSales('2015', random.nextInt(100)),
|
||||
new OrdinalSales('2016', random.nextInt(100)),
|
||||
new OrdinalSales('2017', random.nextInt(100)),
|
||||
OrdinalSales('2014', random.nextInt(100)),
|
||||
OrdinalSales('2015', random.nextInt(100)),
|
||||
OrdinalSales('2016', random.nextInt(100)),
|
||||
OrdinalSales('2017', random.nextInt(100)),
|
||||
];
|
||||
|
||||
final tableSalesData = [
|
||||
new OrdinalSales('2014', random.nextInt(100)),
|
||||
new OrdinalSales('2015', random.nextInt(100)),
|
||||
new OrdinalSales('2016', random.nextInt(100)),
|
||||
new OrdinalSales('2017', random.nextInt(100)),
|
||||
OrdinalSales('2014', random.nextInt(100)),
|
||||
OrdinalSales('2015', random.nextInt(100)),
|
||||
OrdinalSales('2016', random.nextInt(100)),
|
||||
OrdinalSales('2017', random.nextInt(100)),
|
||||
];
|
||||
|
||||
final mobileSalesData = [
|
||||
new OrdinalSales('2014', random.nextInt(100)),
|
||||
new OrdinalSales('2015', random.nextInt(100)),
|
||||
new OrdinalSales('2016', random.nextInt(100)),
|
||||
new OrdinalSales('2017', random.nextInt(100)),
|
||||
OrdinalSales('2014', random.nextInt(100)),
|
||||
OrdinalSales('2015', random.nextInt(100)),
|
||||
OrdinalSales('2016', random.nextInt(100)),
|
||||
OrdinalSales('2017', random.nextInt(100)),
|
||||
];
|
||||
|
||||
return [
|
||||
new charts.Series<OrdinalSales, String>(
|
||||
charts.Series<OrdinalSales, String>(
|
||||
id: 'Desktop',
|
||||
colorFn: (_, __) => charts.MaterialPalette.blue.shadeDefault,
|
||||
domainFn: (OrdinalSales sales, _) => sales.year,
|
||||
measureFn: (OrdinalSales sales, _) => sales.sales,
|
||||
data: desktopSalesData),
|
||||
new charts.Series<OrdinalSales, String>(
|
||||
charts.Series<OrdinalSales, String>(
|
||||
id: 'Tablet',
|
||||
colorFn: (_, __) => charts.MaterialPalette.red.shadeDefault,
|
||||
domainFn: (OrdinalSales sales, _) => sales.year,
|
||||
measureFn: (OrdinalSales sales, _) => sales.sales,
|
||||
data: tableSalesData),
|
||||
new charts.Series<OrdinalSales, String>(
|
||||
charts.Series<OrdinalSales, String>(
|
||||
id: 'Mobile',
|
||||
colorFn: (_, __) => charts.MaterialPalette.green.shadeDefault,
|
||||
domainFn: (OrdinalSales sales, _) => sales.year,
|
||||
@@ -95,15 +96,15 @@ class OrdinalComboBarLineChart extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return new charts.OrdinalComboChart(seriesList,
|
||||
return charts.OrdinalComboChart(seriesList,
|
||||
animate: animate,
|
||||
// Configure the default renderer as a bar renderer.
|
||||
defaultRenderer: new charts.BarRendererConfig(
|
||||
defaultRenderer: charts.BarRendererConfig(
|
||||
groupingType: charts.BarGroupingType.grouped),
|
||||
// Custom renderer configuration for the line series. This will be used for
|
||||
// any series that does not define a rendererIdKey.
|
||||
customSeriesRenderers: [
|
||||
new charts.LineRendererConfig(
|
||||
charts.LineRendererConfig(
|
||||
// ID used to link series to this renderer.
|
||||
customRendererId: 'customLine')
|
||||
]);
|
||||
@@ -112,40 +113,40 @@ class OrdinalComboBarLineChart extends StatelessWidget {
|
||||
/// Create series list with multiple series
|
||||
static List<charts.Series<OrdinalSales, String>> _createSampleData() {
|
||||
final desktopSalesData = [
|
||||
new OrdinalSales('2014', 5),
|
||||
new OrdinalSales('2015', 25),
|
||||
new OrdinalSales('2016', 100),
|
||||
new OrdinalSales('2017', 75),
|
||||
OrdinalSales('2014', 5),
|
||||
OrdinalSales('2015', 25),
|
||||
OrdinalSales('2016', 100),
|
||||
OrdinalSales('2017', 75),
|
||||
];
|
||||
|
||||
final tableSalesData = [
|
||||
new OrdinalSales('2014', 5),
|
||||
new OrdinalSales('2015', 25),
|
||||
new OrdinalSales('2016', 100),
|
||||
new OrdinalSales('2017', 75),
|
||||
OrdinalSales('2014', 5),
|
||||
OrdinalSales('2015', 25),
|
||||
OrdinalSales('2016', 100),
|
||||
OrdinalSales('2017', 75),
|
||||
];
|
||||
|
||||
final mobileSalesData = [
|
||||
new OrdinalSales('2014', 10),
|
||||
new OrdinalSales('2015', 50),
|
||||
new OrdinalSales('2016', 200),
|
||||
new OrdinalSales('2017', 150),
|
||||
OrdinalSales('2014', 10),
|
||||
OrdinalSales('2015', 50),
|
||||
OrdinalSales('2016', 200),
|
||||
OrdinalSales('2017', 150),
|
||||
];
|
||||
|
||||
return [
|
||||
new charts.Series<OrdinalSales, String>(
|
||||
charts.Series<OrdinalSales, String>(
|
||||
id: 'Desktop',
|
||||
colorFn: (_, __) => charts.MaterialPalette.blue.shadeDefault,
|
||||
domainFn: (OrdinalSales sales, _) => sales.year,
|
||||
measureFn: (OrdinalSales sales, _) => sales.sales,
|
||||
data: desktopSalesData),
|
||||
new charts.Series<OrdinalSales, String>(
|
||||
charts.Series<OrdinalSales, String>(
|
||||
id: 'Tablet',
|
||||
colorFn: (_, __) => charts.MaterialPalette.red.shadeDefault,
|
||||
domainFn: (OrdinalSales sales, _) => sales.year,
|
||||
measureFn: (OrdinalSales sales, _) => sales.sales,
|
||||
data: tableSalesData),
|
||||
new charts.Series<OrdinalSales, String>(
|
||||
charts.Series<OrdinalSales, String>(
|
||||
id: 'Mobile ',
|
||||
colorFn: (_, __) => charts.MaterialPalette.green.shadeDefault,
|
||||
domainFn: (OrdinalSales sales, _) => sales.year,
|
||||
|
||||
@@ -25,11 +25,12 @@ class ScatterPlotComboLineChart extends StatelessWidget {
|
||||
final List<charts.Series> seriesList;
|
||||
final bool animate;
|
||||
|
||||
ScatterPlotComboLineChart(this.seriesList, {this.animate});
|
||||
const ScatterPlotComboLineChart(this.seriesList, {this.animate, Key key})
|
||||
: super(key: key);
|
||||
|
||||
/// Creates a [ScatterPlotChart] with sample data and no transition.
|
||||
factory ScatterPlotComboLineChart.withSampleData() {
|
||||
return new ScatterPlotComboLineChart(
|
||||
return ScatterPlotComboLineChart(
|
||||
_createSampleData(),
|
||||
// Disable animations for image tests.
|
||||
animate: false,
|
||||
@@ -41,40 +42,40 @@ class ScatterPlotComboLineChart extends StatelessWidget {
|
||||
// It is used for creating random series data to demonstrate animation in
|
||||
// the example app only.
|
||||
factory ScatterPlotComboLineChart.withRandomData() {
|
||||
return new ScatterPlotComboLineChart(_createRandomData());
|
||||
return ScatterPlotComboLineChart(_createRandomData());
|
||||
}
|
||||
|
||||
/// Create random data.
|
||||
static List<charts.Series<LinearSales, num>> _createRandomData() {
|
||||
final random = new Random();
|
||||
final random = Random();
|
||||
|
||||
final makeRadius = (int value) => (random.nextInt(value) + 2).toDouble();
|
||||
makeRadius(int value) => (random.nextInt(value) + 2).toDouble();
|
||||
|
||||
final desktopSalesData = [
|
||||
new LinearSales(random.nextInt(100), random.nextInt(100), makeRadius(6)),
|
||||
new LinearSales(random.nextInt(100), random.nextInt(100), makeRadius(6)),
|
||||
new LinearSales(random.nextInt(100), random.nextInt(100), makeRadius(6)),
|
||||
new LinearSales(random.nextInt(100), random.nextInt(100), makeRadius(6)),
|
||||
new LinearSales(random.nextInt(100), random.nextInt(100), makeRadius(6)),
|
||||
new LinearSales(random.nextInt(100), random.nextInt(100), makeRadius(6)),
|
||||
new LinearSales(random.nextInt(100), random.nextInt(100), makeRadius(6)),
|
||||
new LinearSales(random.nextInt(100), random.nextInt(100), makeRadius(6)),
|
||||
new LinearSales(random.nextInt(100), random.nextInt(100), makeRadius(6)),
|
||||
new LinearSales(random.nextInt(100), random.nextInt(100), makeRadius(6)),
|
||||
new LinearSales(random.nextInt(100), random.nextInt(100), makeRadius(6)),
|
||||
new LinearSales(random.nextInt(100), random.nextInt(100), makeRadius(6)),
|
||||
LinearSales(random.nextInt(100), random.nextInt(100), makeRadius(6)),
|
||||
LinearSales(random.nextInt(100), random.nextInt(100), makeRadius(6)),
|
||||
LinearSales(random.nextInt(100), random.nextInt(100), makeRadius(6)),
|
||||
LinearSales(random.nextInt(100), random.nextInt(100), makeRadius(6)),
|
||||
LinearSales(random.nextInt(100), random.nextInt(100), makeRadius(6)),
|
||||
LinearSales(random.nextInt(100), random.nextInt(100), makeRadius(6)),
|
||||
LinearSales(random.nextInt(100), random.nextInt(100), makeRadius(6)),
|
||||
LinearSales(random.nextInt(100), random.nextInt(100), makeRadius(6)),
|
||||
LinearSales(random.nextInt(100), random.nextInt(100), makeRadius(6)),
|
||||
LinearSales(random.nextInt(100), random.nextInt(100), makeRadius(6)),
|
||||
LinearSales(random.nextInt(100), random.nextInt(100), makeRadius(6)),
|
||||
LinearSales(random.nextInt(100), random.nextInt(100), makeRadius(6)),
|
||||
];
|
||||
|
||||
var myRegressionData = [
|
||||
new LinearSales(0, desktopSalesData[0].sales, 3.5),
|
||||
new LinearSales(
|
||||
LinearSales(0, desktopSalesData[0].sales, 3.5),
|
||||
LinearSales(
|
||||
100, desktopSalesData[desktopSalesData.length - 1].sales, 7.5),
|
||||
];
|
||||
|
||||
final maxMeasure = 100;
|
||||
const maxMeasure = 100;
|
||||
|
||||
return [
|
||||
new charts.Series<LinearSales, int>(
|
||||
charts.Series<LinearSales, int>(
|
||||
id: 'Sales',
|
||||
// Providing a color function is optional.
|
||||
colorFn: (LinearSales sales, _) {
|
||||
@@ -95,7 +96,7 @@ class ScatterPlotComboLineChart extends StatelessWidget {
|
||||
radiusPxFn: (LinearSales sales, _) => sales.radius,
|
||||
data: desktopSalesData,
|
||||
),
|
||||
new charts.Series<LinearSales, int>(
|
||||
charts.Series<LinearSales, int>(
|
||||
id: 'Mobile',
|
||||
colorFn: (_, __) => charts.MaterialPalette.purple.shadeDefault,
|
||||
domainFn: (LinearSales sales, _) => sales.year,
|
||||
@@ -109,17 +110,17 @@ class ScatterPlotComboLineChart extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return new charts.ScatterPlotChart(seriesList,
|
||||
return charts.ScatterPlotChart(seriesList,
|
||||
animate: animate,
|
||||
// Configure the default renderer as a point renderer. This will be used
|
||||
// for any series that does not define a rendererIdKey.
|
||||
//
|
||||
// This is the default configuration, but is shown here for
|
||||
// illustration.
|
||||
defaultRenderer: new charts.PointRendererConfig(),
|
||||
defaultRenderer: charts.PointRendererConfig(),
|
||||
// Custom renderer configuration for the line series.
|
||||
customSeriesRenderers: [
|
||||
new charts.LineRendererConfig(
|
||||
charts.LineRendererConfig(
|
||||
// ID used to link series to this renderer.
|
||||
customRendererId: 'customLine',
|
||||
// Configure the regression line to be painted above the points.
|
||||
@@ -133,29 +134,29 @@ class ScatterPlotComboLineChart extends StatelessWidget {
|
||||
/// Create one series with sample hard coded data.
|
||||
static List<charts.Series<LinearSales, int>> _createSampleData() {
|
||||
final desktopSalesData = [
|
||||
new LinearSales(0, 5, 3.0),
|
||||
new LinearSales(10, 25, 5.0),
|
||||
new LinearSales(12, 75, 4.0),
|
||||
new LinearSales(13, 225, 5.0),
|
||||
new LinearSales(16, 50, 4.0),
|
||||
new LinearSales(24, 75, 3.0),
|
||||
new LinearSales(25, 100, 3.0),
|
||||
new LinearSales(34, 150, 5.0),
|
||||
new LinearSales(37, 10, 4.5),
|
||||
new LinearSales(45, 300, 8.0),
|
||||
new LinearSales(52, 15, 4.0),
|
||||
new LinearSales(56, 200, 7.0),
|
||||
LinearSales(0, 5, 3.0),
|
||||
LinearSales(10, 25, 5.0),
|
||||
LinearSales(12, 75, 4.0),
|
||||
LinearSales(13, 225, 5.0),
|
||||
LinearSales(16, 50, 4.0),
|
||||
LinearSales(24, 75, 3.0),
|
||||
LinearSales(25, 100, 3.0),
|
||||
LinearSales(34, 150, 5.0),
|
||||
LinearSales(37, 10, 4.5),
|
||||
LinearSales(45, 300, 8.0),
|
||||
LinearSales(52, 15, 4.0),
|
||||
LinearSales(56, 200, 7.0),
|
||||
];
|
||||
|
||||
var myRegressionData = [
|
||||
new LinearSales(0, 5, 3.5),
|
||||
new LinearSales(56, 240, 3.5),
|
||||
LinearSales(0, 5, 3.5),
|
||||
LinearSales(56, 240, 3.5),
|
||||
];
|
||||
|
||||
final maxMeasure = 300;
|
||||
const maxMeasure = 300;
|
||||
|
||||
return [
|
||||
new charts.Series<LinearSales, int>(
|
||||
charts.Series<LinearSales, int>(
|
||||
id: 'Sales',
|
||||
// Providing a color function is optional.
|
||||
colorFn: (LinearSales sales, _) {
|
||||
@@ -176,7 +177,7 @@ class ScatterPlotComboLineChart extends StatelessWidget {
|
||||
radiusPxFn: (LinearSales sales, _) => sales.radius,
|
||||
data: desktopSalesData,
|
||||
),
|
||||
new charts.Series<LinearSales, int>(
|
||||
charts.Series<LinearSales, int>(
|
||||
id: 'Mobile',
|
||||
colorFn: (_, __) => charts.MaterialPalette.purple.shadeDefault,
|
||||
domainFn: (LinearSales sales, _) => sales.year,
|
||||
|
||||
Reference in New Issue
Block a user