diff --git a/apps/demos/Demos/Charts/Area/Angular/app/app.component.html b/apps/demos/Demos/Charts/Area/Angular/app/app.component.html index 0810ffc171a4..128d3f02c215 100644 --- a/apps/demos/Demos/Charts/Area/Angular/app/app.component.html +++ b/apps/demos/Demos/Charts/Area/Angular/app/app.component.html @@ -1,6 +1,6 @@
diff --git a/apps/demos/Demos/Charts/Area/Angular/app/app.service.ts b/apps/demos/Demos/Charts/Area/Angular/app/app.service.ts index 35bde5375240..836cd56675d2 100644 --- a/apps/demos/Demos/Charts/Area/Angular/app/app.service.ts +++ b/apps/demos/Demos/Charts/Area/Angular/app/app.service.ts @@ -11,35 +11,30 @@ export class Population { } const populationData: Population[] = [{ - country: 'China', - y014: 233866959, - y1564: 1170914102, - y65: 171774113, -}, { country: 'India', - y014: 373419115, - y1564: 882520945, - y65: 76063757, + y014: 351600000, + y1564: 974800000, + y65: 101500000, }, { country: 'United States', - y014: 60554755, - y1564: 213172625, - y65: 54835293, + y014: 58600000, + y1564: 219300000, + y65: 60700000, }, { - country: 'Indonesia', - y014: 65715705, - y1564: 177014815, - y65: 18053690, + country: 'United Kingdom', + y014: 11900000, + y1564: 44200000, + y65: 12000000, }, { country: 'Brazil', - y014: 45278034, - y1564: 144391494, - y65: 17190842, + y014: 43200000, + y1564: 151600000, + y65: 24100000, }, { - country: 'Russia', - y014: 24465156, - y1564: 96123777, - y65: 20412243, + country: 'Canada', + y014: 6000000, + y1564: 26000000, + y65: 7900000, }]; @Injectable() diff --git a/apps/demos/Demos/Charts/Area/React/App.tsx b/apps/demos/Demos/Charts/Area/React/App.tsx index 22d432e425d9..0b6a8a3aa812 100644 --- a/apps/demos/Demos/Charts/Area/React/App.tsx +++ b/apps/demos/Demos/Charts/Area/React/App.tsx @@ -26,7 +26,7 @@ function App() {
{ margin: { bottom: 20, }, - title: 'Population: Age Structure (2018)', + title: 'Population: Age Structure (2024)', argumentAxis: { valueMarginsEnabled: false, }, diff --git a/apps/demos/Demos/Charts/BarColorCustomization/Angular/app/app.component.html b/apps/demos/Demos/Charts/BarColorCustomization/Angular/app/app.component.html index 4dedbe7ab4bf..f27c6a16dee7 100644 --- a/apps/demos/Demos/Charts/BarColorCustomization/Angular/app/app.component.html +++ b/apps/demos/Demos/Charts/BarColorCustomization/Angular/app/app.component.html @@ -1,7 +1,7 @@ </Chart> ); diff --git a/apps/demos/Demos/Charts/BarColorCustomization/ReactJs/App.js b/apps/demos/Demos/Charts/BarColorCustomization/ReactJs/App.js index 866140b81286..08679ad94f78 100644 --- a/apps/demos/Demos/Charts/BarColorCustomization/ReactJs/App.js +++ b/apps/demos/Demos/Charts/BarColorCustomization/ReactJs/App.js @@ -20,7 +20,7 @@ function App() { <SeriesTemplate nameField="age" /> <Title text="Age Breakdown of Facebook Users in the U.S." - subtitle="as of January 2017" + subtitle="as of January 2024" /> </Chart> ); diff --git a/apps/demos/Demos/Charts/BarColorCustomization/Vue/App.vue b/apps/demos/Demos/Charts/BarColorCustomization/Vue/App.vue index 8eba6b845940..3a892d507c73 100644 --- a/apps/demos/Demos/Charts/BarColorCustomization/Vue/App.vue +++ b/apps/demos/Demos/Charts/BarColorCustomization/Vue/App.vue @@ -13,7 +13,7 @@ <DxSeriesTemplate name-field="age"/> <DxTitle text="Age Breakdown of Facebook Users in the U.S." - subtitle="as of January 2017" + subtitle="as of January 2024" /> </DxChart> </template> diff --git a/apps/demos/Demos/Charts/BarColorCustomization/jQuery/index.js b/apps/demos/Demos/Charts/BarColorCustomization/jQuery/index.js index b996dff1b89d..4ed1e4776f2b 100644 --- a/apps/demos/Demos/Charts/BarColorCustomization/jQuery/index.js +++ b/apps/demos/Demos/Charts/BarColorCustomization/jQuery/index.js @@ -4,7 +4,7 @@ $(() => { palette: 'soft', title: { text: 'Age Breakdown of Facebook Users in the U.S.', - subtitle: 'as of January 2017', + subtitle: 'as of January 2024', }, commonSeriesSettings: { type: 'bar', diff --git a/apps/demos/Demos/Charts/BiDirectionalBarChart/Angular/app/app.component.html b/apps/demos/Demos/Charts/BiDirectionalBarChart/Angular/app/app.component.html index fe7ec5f5339a..8a405dcf9bbc 100644 --- a/apps/demos/Demos/Charts/BiDirectionalBarChart/Angular/app/app.component.html +++ b/apps/demos/Demos/Charts/BiDirectionalBarChart/Angular/app/app.component.html @@ -3,7 +3,7 @@ [dataSource]="populationData" [rotated]="true" [barGroupWidth]="18" - title="Population Pyramid For Norway 2016" + title="Population Pyramid For Norway 2024" > <dxo-chart-common-series-settings argumentField="age" type="stackedbar"> </dxo-chart-common-series-settings> diff --git a/apps/demos/Demos/Charts/BiDirectionalBarChart/Angular/app/app.service.ts b/apps/demos/Demos/Charts/BiDirectionalBarChart/Angular/app/app.service.ts index 9fbf95e1c2bf..ab3ffa2c599e 100644 --- a/apps/demos/Demos/Charts/BiDirectionalBarChart/Angular/app/app.service.ts +++ b/apps/demos/Demos/Charts/BiDirectionalBarChart/Angular/app/app.service.ts @@ -10,84 +10,76 @@ export class Population { const populationData: Population[] = [{ age: '0-4', - male: -3.1, - female: 2.9, + male: -2.99, + female: 2.83, }, { age: '5-9', - male: -3.1, - female: 3.0, + male: -2.93, + female: 2.77, }, { age: '10-14', - male: -3.0, - female: 2.9, + male: -3.04, + female: 2.88, }, { age: '15-19', - male: -3.2, - female: 3.0, + male: -3.24, + female: 3.09, }, { age: '20-24', - male: -3.5, - female: 3.3, + male: -3.24, + female: 3.09, }, { age: '25-29', - male: -3.5, - female: 3.4, + male: -3.15, + female: 3, }, { age: '30-34', - male: -3.5, - female: 3.3, + male: -3.19, + female: 3.04, }, { age: '35-39', - male: -3.3, - female: 3.1, + male: -3.38, + female: 3.24, }, { age: '40-44', - male: -3.7, - female: 3.4, + male: -3.58, + female: 3.42, }, { age: '45-49', - male: -3.8, - female: 3.5, + male: -3.38, + female: 3.22, }, { age: '50-54', - male: -3.4, - female: 3.2, + male: -3.1, + female: 2.97, }, { age: '55-59', - male: -3.1, - female: 3.0, + male: -2.9, + female: 2.83, }, { age: '60-64', - male: -2.7, - female: 2.7, + male: -2.72, + female: 2.66, }, { age: '65-69', - male: -2.9, - female: 2.9, + male: -2.34, + female: 2.44, }, { age: '70-74', - male: -2, - female: 2.1, + male: -1.51, + female: 1.68, }, { age: '75-79', - male: -1.2, - female: 1.4, + male: -1.11, + female: 1.38, }, { age: '80-84', - male: -0.8, - female: 1.2, -}, { - age: '85-89', - male: -0.5, - female: 0.8, -}, { - age: '90-94', - male: -0.2, - female: 0.5, + male: -0.84, + female: 1.22, }, { - age: '95+', - male: 0, - female: 0.1, + age: '85+', + male: -0.48, + female: 1.39, }]; @Injectable() diff --git a/apps/demos/Demos/Charts/BiDirectionalBarChart/React/App.tsx b/apps/demos/Demos/Charts/BiDirectionalBarChart/React/App.tsx index dc236d61a832..ac397d2faea2 100644 --- a/apps/demos/Demos/Charts/BiDirectionalBarChart/React/App.tsx +++ b/apps/demos/Demos/Charts/BiDirectionalBarChart/React/App.tsx @@ -22,7 +22,7 @@ function customizeLabel(e: { value: Date | number | string }) { function App() { return ( <Chart - title="Population Pyramid For Norway 2016" + title="Population Pyramid For Norway 2024" dataSource={dataSource} id="chart" rotated={true} diff --git a/apps/demos/Demos/Charts/BiDirectionalBarChart/React/data.ts b/apps/demos/Demos/Charts/BiDirectionalBarChart/React/data.ts index 8c6d7404fd90..d512a2879529 100644 --- a/apps/demos/Demos/Charts/BiDirectionalBarChart/React/data.ts +++ b/apps/demos/Demos/Charts/BiDirectionalBarChart/React/data.ts @@ -1,81 +1,73 @@ export const dataSource = [{ age: '0-4', - male: -3.1, - female: 2.9, + male: -2.99, + female: 2.83, }, { age: '5-9', - male: -3.1, - female: 3.0, + male: -2.93, + female: 2.77, }, { age: '10-14', - male: -3.0, - female: 2.9, + male: -3.04, + female: 2.88, }, { age: '15-19', - male: -3.2, - female: 3.0, + male: -3.24, + female: 3.09, }, { age: '20-24', - male: -3.5, - female: 3.3, + male: -3.24, + female: 3.09, }, { age: '25-29', - male: -3.5, - female: 3.4, + male: -3.15, + female: 3, }, { age: '30-34', - male: -3.5, - female: 3.3, + male: -3.19, + female: 3.04, }, { age: '35-39', - male: -3.3, - female: 3.1, + male: -3.38, + female: 3.24, }, { age: '40-44', - male: -3.7, - female: 3.4, + male: -3.58, + female: 3.42, }, { age: '45-49', - male: -3.8, - female: 3.5, + male: -3.38, + female: 3.22, }, { age: '50-54', - male: -3.4, - female: 3.2, + male: -3.1, + female: 2.97, }, { age: '55-59', - male: -3.1, - female: 3.0, + male: -2.9, + female: 2.83, }, { age: '60-64', - male: -2.7, - female: 2.7, + male: -2.72, + female: 2.66, }, { age: '65-69', - male: -2.9, - female: 2.9, + male: -2.34, + female: 2.44, }, { age: '70-74', - male: -2, - female: 2.1, + male: -1.51, + female: 1.68, }, { age: '75-79', - male: -1.2, - female: 1.4, + male: -1.11, + female: 1.38, }, { age: '80-84', - male: -0.8, - female: 1.2, -}, { - age: '85-89', - male: -0.5, - female: 0.8, -}, { - age: '90-94', - male: -0.2, - female: 0.5, + male: -0.84, + female: 1.22, }, { - age: '95+', - male: 0, - female: 0.1, + age: '85+', + male: -0.48, + female: 1.39, }]; diff --git a/apps/demos/Demos/Charts/BiDirectionalBarChart/ReactJs/App.js b/apps/demos/Demos/Charts/BiDirectionalBarChart/ReactJs/App.js index d70aacbdb440..cb89bbaff500 100644 --- a/apps/demos/Demos/Charts/BiDirectionalBarChart/ReactJs/App.js +++ b/apps/demos/Demos/Charts/BiDirectionalBarChart/ReactJs/App.js @@ -19,7 +19,7 @@ function customizeLabel(e) { function App() { return ( <Chart - title="Population Pyramid For Norway 2016" + title="Population Pyramid For Norway 2024" dataSource={dataSource} id="chart" rotated={true} diff --git a/apps/demos/Demos/Charts/BiDirectionalBarChart/ReactJs/data.js b/apps/demos/Demos/Charts/BiDirectionalBarChart/ReactJs/data.js index 1e0be04d292e..919845ae3a99 100644 --- a/apps/demos/Demos/Charts/BiDirectionalBarChart/ReactJs/data.js +++ b/apps/demos/Demos/Charts/BiDirectionalBarChart/ReactJs/data.js @@ -1,102 +1,92 @@ export const dataSource = [ { age: '0-4', - male: -3.1, - female: 2.9, + male: -2.99, + female: 2.83, }, { age: '5-9', - male: -3.1, - female: 3.0, + male: -2.93, + female: 2.77, }, { age: '10-14', - male: -3.0, - female: 2.9, + male: -3.04, + female: 2.88, }, { age: '15-19', - male: -3.2, - female: 3.0, + male: -3.24, + female: 3.09, }, { age: '20-24', - male: -3.5, - female: 3.3, + male: -3.24, + female: 3.09, }, { age: '25-29', - male: -3.5, - female: 3.4, + male: -3.15, + female: 3, }, { age: '30-34', - male: -3.5, - female: 3.3, + male: -3.19, + female: 3.04, }, { age: '35-39', - male: -3.3, - female: 3.1, + male: -3.38, + female: 3.24, }, { age: '40-44', - male: -3.7, - female: 3.4, + male: -3.58, + female: 3.42, }, { age: '45-49', - male: -3.8, - female: 3.5, + male: -3.38, + female: 3.22, }, { age: '50-54', - male: -3.4, - female: 3.2, + male: -3.1, + female: 2.97, }, { age: '55-59', - male: -3.1, - female: 3.0, + male: -2.9, + female: 2.83, }, { age: '60-64', - male: -2.7, - female: 2.7, + male: -2.72, + female: 2.66, }, { age: '65-69', - male: -2.9, - female: 2.9, + male: -2.34, + female: 2.44, }, { age: '70-74', - male: -2, - female: 2.1, + male: -1.51, + female: 1.68, }, { age: '75-79', - male: -1.2, - female: 1.4, + male: -1.11, + female: 1.38, }, { age: '80-84', - male: -0.8, - female: 1.2, - }, - { - age: '85-89', - male: -0.5, - female: 0.8, - }, - { - age: '90-94', - male: -0.2, - female: 0.5, + male: -0.84, + female: 1.22, }, { - age: '95+', - male: 0, - female: 0.1, + age: '85+', + male: -0.48, + female: 1.39, }, ]; diff --git a/apps/demos/Demos/Charts/BiDirectionalBarChart/Vue/App.vue b/apps/demos/Demos/Charts/BiDirectionalBarChart/Vue/App.vue index f7b78d41fe09..d793512aecbd 100644 --- a/apps/demos/Demos/Charts/BiDirectionalBarChart/Vue/App.vue +++ b/apps/demos/Demos/Charts/BiDirectionalBarChart/Vue/App.vue @@ -4,7 +4,7 @@ :data-source="dataSource" :rotated="true" :bar-group-width="18" - title="Population Pyramid For Norway 2016" + title="Population Pyramid For Norway 2024" > <DxCommonSeriesSettings argument-field="age" diff --git a/apps/demos/Demos/Charts/BiDirectionalBarChart/Vue/data.ts b/apps/demos/Demos/Charts/BiDirectionalBarChart/Vue/data.ts index 41f95f43c691..1033f7a04a5a 100644 --- a/apps/demos/Demos/Charts/BiDirectionalBarChart/Vue/data.ts +++ b/apps/demos/Demos/Charts/BiDirectionalBarChart/Vue/data.ts @@ -1,83 +1,75 @@ export const dataSource = [ { age: '0-4', - male: -3.1, - female: 2.9, + male: -2.99, + female: 2.83, }, { age: '5-9', - male: -3.1, - female: 3.0, + male: -2.93, + female: 2.77, }, { age: '10-14', - male: -3.0, - female: 2.9, + male: -3.04, + female: 2.88, }, { age: '15-19', - male: -3.2, - female: 3.0, + male: -3.24, + female: 3.09, }, { age: '20-24', - male: -3.5, - female: 3.3, + male: -3.24, + female: 3.09, }, { age: '25-29', - male: -3.5, - female: 3.4, + male: -3.15, + female: 3, }, { age: '30-34', - male: -3.5, - female: 3.3, + male: -3.19, + female: 3.04, }, { age: '35-39', - male: -3.3, - female: 3.1, + male: -3.38, + female: 3.24, }, { age: '40-44', - male: -3.7, - female: 3.4, + male: -3.58, + female: 3.42, }, { age: '45-49', - male: -3.8, - female: 3.5, + male: -3.38, + female: 3.22, }, { age: '50-54', - male: -3.4, - female: 3.2, + male: -3.1, + female: 2.97, }, { age: '55-59', - male: -3.1, - female: 3.0, + male: -2.9, + female: 2.83, }, { age: '60-64', - male: -2.7, - female: 2.7, + male: -2.72, + female: 2.66, }, { age: '65-69', - male: -2.9, - female: 2.9, + male: -2.34, + female: 2.44, }, { age: '70-74', - male: -2, - female: 2.1, + male: -1.51, + female: 1.68, }, { age: '75-79', - male: -1.2, - female: 1.4, + male: -1.11, + female: 1.38, }, { age: '80-84', - male: -0.8, - female: 1.2, - }, { - age: '85-89', - male: -0.5, - female: 0.8, - }, { - age: '90-94', - male: -0.2, - female: 0.5, + male: -0.84, + female: 1.22, }, { - age: '95+', - male: 0, - female: 0.1, + age: '85+', + male: -0.48, + female: 1.39, }, ]; diff --git a/apps/demos/Demos/Charts/BiDirectionalBarChart/jQuery/data.js b/apps/demos/Demos/Charts/BiDirectionalBarChart/jQuery/data.js index fb9e57df8498..2a3fb313bf4b 100644 --- a/apps/demos/Demos/Charts/BiDirectionalBarChart/jQuery/data.js +++ b/apps/demos/Demos/Charts/BiDirectionalBarChart/jQuery/data.js @@ -1,81 +1,73 @@ const dataSource = [{ age: '0-4', - male: -3.1, - female: 2.9, + male: -2.99, + female: 2.83, }, { age: '5-9', - male: -3.1, - female: 3.0, + male: -2.93, + female: 2.77, }, { age: '10-14', - male: -3.0, - female: 2.9, + male: -3.04, + female: 2.88, }, { age: '15-19', - male: -3.2, - female: 3.0, + male: -3.24, + female: 3.09, }, { age: '20-24', - male: -3.5, - female: 3.3, + male: -3.24, + female: 3.09, }, { age: '25-29', - male: -3.5, - female: 3.4, + male: -3.15, + female: 3, }, { age: '30-34', - male: -3.5, - female: 3.3, + male: -3.19, + female: 3.04, }, { age: '35-39', - male: -3.3, - female: 3.1, + male: -3.38, + female: 3.24, }, { age: '40-44', - male: -3.7, - female: 3.4, + male: -3.58, + female: 3.42, }, { age: '45-49', - male: -3.8, - female: 3.5, + male: -3.38, + female: 3.22, }, { age: '50-54', - male: -3.4, - female: 3.2, + male: -3.1, + female: 2.97, }, { age: '55-59', - male: -3.1, - female: 3.0, + male: -2.9, + female: 2.83, }, { age: '60-64', - male: -2.7, - female: 2.7, + male: -2.72, + female: 2.66, }, { age: '65-69', - male: -2.9, - female: 2.9, + male: -2.34, + female: 2.44, }, { age: '70-74', - male: -2, - female: 2.1, + male: -1.51, + female: 1.68, }, { age: '75-79', - male: -1.2, - female: 1.4, + male: -1.11, + female: 1.38, }, { age: '80-84', - male: -0.8, - female: 1.2, -}, { - age: '85-89', - male: -0.5, - female: 0.8, -}, { - age: '90-94', - male: -0.2, - female: 0.5, + male: -0.84, + female: 1.22, }, { - age: '95+', - male: 0, - female: 0.1, + age: '85+', + male: -0.48, + female: 1.39, }]; diff --git a/apps/demos/Demos/Charts/BiDirectionalBarChart/jQuery/index.js b/apps/demos/Demos/Charts/BiDirectionalBarChart/jQuery/index.js index 48196eba62e9..d0999a6af118 100644 --- a/apps/demos/Demos/Charts/BiDirectionalBarChart/jQuery/index.js +++ b/apps/demos/Demos/Charts/BiDirectionalBarChart/jQuery/index.js @@ -1,6 +1,6 @@ $(() => { $('#chart').dxChart({ - title: 'Population Pyramid For Norway 2016', + title: 'Population Pyramid For Norway 2024', dataSource, rotated: true, barGroupWidth: 18, diff --git a/apps/demos/Demos/Charts/CenterLabelCustomization/Angular/app/app.component.html b/apps/demos/Demos/Charts/CenterLabelCustomization/Angular/app/app.component.html index 537ffbb40d2f..4658d7b7db09 100644 --- a/apps/demos/Demos/Charts/CenterLabelCustomization/Angular/app/app.component.html +++ b/apps/demos/Demos/Charts/CenterLabelCustomization/Angular/app/app.component.html @@ -1,5 +1,5 @@ <div> - <div class="long-title"><h3>Energy Production (GWh, 2016)</h3></div> + <div class="long-title"><h3>Energy Production (GWh, 2024)</h3></div> <div class="pies-container"> @for(country of countries; track country) { <dx-pie-chart diff --git a/apps/demos/Demos/Charts/CenterLabelCustomization/Angular/app/app.service.ts b/apps/demos/Demos/Charts/CenterLabelCustomization/Angular/app/app.service.ts index ae58f14383f9..4596108f81fd 100644 --- a/apps/demos/Demos/Charts/CenterLabelCustomization/Angular/app/app.service.ts +++ b/apps/demos/Demos/Charts/CenterLabelCustomization/Angular/app/app.service.ts @@ -10,15 +10,16 @@ export class DataItem { total: number; } const data: DataItem[] = [ - { country: 'France', commodity: 'Nuclear', total: 413278 }, - { country: 'Germany', commodity: 'Nuclear', total: 76536 }, - { country: 'France', commodity: 'Thermal', total: 47594 }, - { country: 'Germany', commodity: 'Thermal', total: 375809 }, - { country: 'France', commodity: 'Wind', total: 21033 }, - { country: 'Germany', commodity: 'Wind', total: 58228 }, - { country: 'France', commodity: 'Solar', total: 7274 }, - { country: 'Germany', commodity: 'Solar', total: 37520 }, - { country: 'France', commodity: 'Tidal, Wave', total: 618 }, + { country: 'France', commodity: 'Nuclear', total: 360000 }, + { country: 'France', commodity: 'Thermal', total: 52000 }, + { country: 'Germany', commodity: 'Thermal', total: 210000 }, + { country: 'France', commodity: 'Wind', total: 50000 }, + { country: 'Germany', commodity: 'Wind', total: 140000 }, + { country: 'France', commodity: 'Solar', total: 23000 }, + { country: 'Germany', commodity: 'Solar', total: 70000 }, + { country: 'Germany', commodity: 'Hydro', total: 20000 }, + { country: 'France', commodity: 'Hydro', total: 65000 }, + { country: 'Germany', commodity: 'Biomass', total: 45000 }, ]; const cache = {}; diff --git a/apps/demos/Demos/Charts/CenterLabelCustomization/React/App.tsx b/apps/demos/Demos/Charts/CenterLabelCustomization/React/App.tsx index 9f85d9dceadd..6676a1208c48 100644 --- a/apps/demos/Demos/Charts/CenterLabelCustomization/React/App.tsx +++ b/apps/demos/Demos/Charts/CenterLabelCustomization/React/App.tsx @@ -45,7 +45,7 @@ function App() { return ( <div> - <div className="long-title"><h3>Energy Production (GWh, 2016)</h3></div> + <div className="long-title"><h3>Energy Production (GWh, 2024)</h3></div> <div className="pies-container"> {pies} </div> diff --git a/apps/demos/Demos/Charts/CenterLabelCustomization/React/data.ts b/apps/demos/Demos/Charts/CenterLabelCustomization/React/data.ts index 17555541a3c8..e8e8448f8b29 100644 --- a/apps/demos/Demos/Charts/CenterLabelCustomization/React/data.ts +++ b/apps/demos/Demos/Charts/CenterLabelCustomization/React/data.ts @@ -1,13 +1,14 @@ import type { CountryData } from './types.ts'; export const data: CountryData[] = [ - { country: 'France', commodity: 'Nuclear', total: 413278 }, - { country: 'Germany', commodity: 'Nuclear', total: 76536 }, - { country: 'France', commodity: 'Thermal', total: 47594 }, - { country: 'Germany', commodity: 'Thermal', total: 375809 }, - { country: 'France', commodity: 'Wind', total: 21033 }, - { country: 'Germany', commodity: 'Wind', total: 58228 }, - { country: 'France', commodity: 'Solar', total: 7274 }, - { country: 'Germany', commodity: 'Solar', total: 37520 }, - { country: 'France', commodity: 'Tidal, Wave', total: 618 }, + { country: 'France', commodity: 'Nuclear', total: 360000 }, + { country: 'France', commodity: 'Thermal', total: 52000 }, + { country: 'Germany', commodity: 'Thermal', total: 210000 }, + { country: 'France', commodity: 'Wind', total: 50000 }, + { country: 'Germany', commodity: 'Wind', total: 140000 }, + { country: 'France', commodity: 'Solar', total: 23000 }, + { country: 'Germany', commodity: 'Solar', total: 70000 }, + { country: 'Germany', commodity: 'Hydro', total: 20000 }, + { country: 'France', commodity: 'Hydro', total: 65000 }, + { country: 'Germany', commodity: 'Biomass', total: 45000 }, ]; diff --git a/apps/demos/Demos/Charts/CenterLabelCustomization/ReactJs/App.js b/apps/demos/Demos/Charts/CenterLabelCustomization/ReactJs/App.js index 7228e817a83f..00e239b6598c 100644 --- a/apps/demos/Demos/Charts/CenterLabelCustomization/ReactJs/App.js +++ b/apps/demos/Demos/Charts/CenterLabelCustomization/ReactJs/App.js @@ -38,7 +38,7 @@ function App() { return ( <div> <div className="long-title"> - <h3>Energy Production (GWh, 2016)</h3> + <h3>Energy Production (GWh, 2024)</h3> </div> <div className="pies-container">{pies}</div> </div> diff --git a/apps/demos/Demos/Charts/CenterLabelCustomization/ReactJs/data.js b/apps/demos/Demos/Charts/CenterLabelCustomization/ReactJs/data.js index 3f65242c4184..4c099919045e 100644 --- a/apps/demos/Demos/Charts/CenterLabelCustomization/ReactJs/data.js +++ b/apps/demos/Demos/Charts/CenterLabelCustomization/ReactJs/data.js @@ -1,11 +1,12 @@ export const data = [ - { country: 'France', commodity: 'Nuclear', total: 413278 }, - { country: 'Germany', commodity: 'Nuclear', total: 76536 }, - { country: 'France', commodity: 'Thermal', total: 47594 }, - { country: 'Germany', commodity: 'Thermal', total: 375809 }, - { country: 'France', commodity: 'Wind', total: 21033 }, - { country: 'Germany', commodity: 'Wind', total: 58228 }, - { country: 'France', commodity: 'Solar', total: 7274 }, - { country: 'Germany', commodity: 'Solar', total: 37520 }, - { country: 'France', commodity: 'Tidal, Wave', total: 618 }, + { country: 'France', commodity: 'Nuclear', total: 360000 }, + { country: 'France', commodity: 'Thermal', total: 52000 }, + { country: 'Germany', commodity: 'Thermal', total: 210000 }, + { country: 'France', commodity: 'Wind', total: 50000 }, + { country: 'Germany', commodity: 'Wind', total: 140000 }, + { country: 'France', commodity: 'Solar', total: 23000 }, + { country: 'Germany', commodity: 'Solar', total: 70000 }, + { country: 'Germany', commodity: 'Hydro', total: 20000 }, + { country: 'France', commodity: 'Hydro', total: 65000 }, + { country: 'Germany', commodity: 'Biomass', total: 45000 }, ]; diff --git a/apps/demos/Demos/Charts/CenterLabelCustomization/Vue/App.vue b/apps/demos/Demos/Charts/CenterLabelCustomization/Vue/App.vue index 16a71842f52d..729142b9df6c 100644 --- a/apps/demos/Demos/Charts/CenterLabelCustomization/Vue/App.vue +++ b/apps/demos/Demos/Charts/CenterLabelCustomization/Vue/App.vue @@ -1,6 +1,6 @@ <template> <div> - <div class="long-title"><h3>Energy Production (GWh, 2016)</h3></div> + <div class="long-title"><h3>Energy Production (GWh, 2024)</h3></div> <div class="pies-container"> <DxPieChart v-for="country in countries" diff --git a/apps/demos/Demos/Charts/CenterLabelCustomization/Vue/data.ts b/apps/demos/Demos/Charts/CenterLabelCustomization/Vue/data.ts index 3f65242c4184..4c099919045e 100644 --- a/apps/demos/Demos/Charts/CenterLabelCustomization/Vue/data.ts +++ b/apps/demos/Demos/Charts/CenterLabelCustomization/Vue/data.ts @@ -1,11 +1,12 @@ export const data = [ - { country: 'France', commodity: 'Nuclear', total: 413278 }, - { country: 'Germany', commodity: 'Nuclear', total: 76536 }, - { country: 'France', commodity: 'Thermal', total: 47594 }, - { country: 'Germany', commodity: 'Thermal', total: 375809 }, - { country: 'France', commodity: 'Wind', total: 21033 }, - { country: 'Germany', commodity: 'Wind', total: 58228 }, - { country: 'France', commodity: 'Solar', total: 7274 }, - { country: 'Germany', commodity: 'Solar', total: 37520 }, - { country: 'France', commodity: 'Tidal, Wave', total: 618 }, + { country: 'France', commodity: 'Nuclear', total: 360000 }, + { country: 'France', commodity: 'Thermal', total: 52000 }, + { country: 'Germany', commodity: 'Thermal', total: 210000 }, + { country: 'France', commodity: 'Wind', total: 50000 }, + { country: 'Germany', commodity: 'Wind', total: 140000 }, + { country: 'France', commodity: 'Solar', total: 23000 }, + { country: 'Germany', commodity: 'Solar', total: 70000 }, + { country: 'Germany', commodity: 'Hydro', total: 20000 }, + { country: 'France', commodity: 'Hydro', total: 65000 }, + { country: 'Germany', commodity: 'Biomass', total: 45000 }, ]; diff --git a/apps/demos/Demos/Charts/CenterLabelCustomization/jQuery/data.js b/apps/demos/Demos/Charts/CenterLabelCustomization/jQuery/data.js index 721ad4a93943..3de9010fba34 100644 --- a/apps/demos/Demos/Charts/CenterLabelCustomization/jQuery/data.js +++ b/apps/demos/Demos/Charts/CenterLabelCustomization/jQuery/data.js @@ -1,11 +1,12 @@ const data = [ - { country: 'France', commodity: 'Nuclear', total: 413278 }, - { country: 'Germany', commodity: 'Nuclear', total: 76536 }, - { country: 'France', commodity: 'Thermal', total: 47594 }, - { country: 'Germany', commodity: 'Thermal', total: 375809 }, - { country: 'France', commodity: 'Wind', total: 21033 }, - { country: 'Germany', commodity: 'Wind', total: 58228 }, - { country: 'France', commodity: 'Solar', total: 7274 }, - { country: 'Germany', commodity: 'Solar', total: 37520 }, - { country: 'France', commodity: 'Tidal, Wave', total: 618 }, + { country: 'France', commodity: 'Nuclear', total: 360000 }, + { country: 'France', commodity: 'Thermal', total: 52000 }, + { country: 'Germany', commodity: 'Thermal', total: 210000 }, + { country: 'France', commodity: 'Wind', total: 50000 }, + { country: 'Germany', commodity: 'Wind', total: 140000 }, + { country: 'France', commodity: 'Solar', total: 23000 }, + { country: 'Germany', commodity: 'Solar', total: 70000 }, + { country: 'Germany', commodity: 'Hydro', total: 20000 }, + { country: 'France', commodity: 'Hydro', total: 65000 }, + { country: 'Germany', commodity: 'Biomass', total: 45000 }, ]; diff --git a/apps/demos/Demos/Charts/CenterLabelCustomization/jQuery/index.html b/apps/demos/Demos/Charts/CenterLabelCustomization/jQuery/index.html index 78668786f826..ccd29b7bbf20 100644 --- a/apps/demos/Demos/Charts/CenterLabelCustomization/jQuery/index.html +++ b/apps/demos/Demos/Charts/CenterLabelCustomization/jQuery/index.html @@ -14,7 +14,7 @@ </head> <body class="dx-viewport"> <div class="demo-container"> - <div class="long-title"><h3>Energy Production (GWh, 2016)</h3></div> + <div class="long-title"><h3>Energy Production (GWh, 2024)</h3></div> <div class="pies-container"> <div id="countries"></div> <div id="waterLandRatio"></div> diff --git a/apps/demos/Demos/Charts/CustomBarWidth/Angular/app/app.component.html b/apps/demos/Demos/Charts/CustomBarWidth/Angular/app/app.component.html index da18095a2e96..f1ed74e1348f 100644 --- a/apps/demos/Demos/Charts/CustomBarWidth/Angular/app/app.component.html +++ b/apps/demos/Demos/Charts/CustomBarWidth/Angular/app/app.component.html @@ -1,10 +1,10 @@ <dx-chart id="chart" [dataSource]="oilProductionData" palette="soft"> - <dxi-chart-series valueField="year1970" name="1970"></dxi-chart-series> - <dxi-chart-series valueField="year1980" name="1980"></dxi-chart-series> <dxi-chart-series valueField="year1990" name="1990"></dxi-chart-series> <dxi-chart-series valueField="year2000" name="2000"></dxi-chart-series> - <dxi-chart-series valueField="year2008" name="2008"></dxi-chart-series> - <dxi-chart-series valueField="year2009" name="2009"></dxi-chart-series> + <dxi-chart-series valueField="year2010" name="2010"></dxi-chart-series> + <dxi-chart-series valueField="year2020" name="2020"></dxi-chart-series> + <dxi-chart-series valueField="year2021" name="2021"></dxi-chart-series> + <dxi-chart-series valueField="year2022" name="2022"></dxi-chart-series> <dxo-chart-common-series-settings argumentField="state" type="bar" diff --git a/apps/demos/Demos/Charts/CustomBarWidth/Angular/app/app.service.ts b/apps/demos/Demos/Charts/CustomBarWidth/Angular/app/app.service.ts index c2d5517aeb00..7067b5567de4 100644 --- a/apps/demos/Demos/Charts/CustomBarWidth/Angular/app/app.service.ts +++ b/apps/demos/Demos/Charts/CustomBarWidth/Angular/app/app.service.ts @@ -3,59 +3,59 @@ import { Injectable } from '@angular/core'; export class OilProduction { state: string; - year1970: number; - - year1980: number; - year1990: number; year2000: number; - year2008: number; + year2010: number; + + year2020: number; - year2009: number; + year2021: number; + + year2022: number; } const oilProductionData: OilProduction[] = [{ state: 'Saudi Arabia', - year1970: 186.7, - year1980: 480.4, - year1990: 319.6, - year2000: 465, - year2008: 549.7, - year2009: 428.4, + year1990: 339, + year2000: 404, + year2010: 462, + year2020: 498, + year2021: 515, + year2022: 602, }, { state: 'USA', - year1970: 557.8, - year1980: 423.2, - year1990: 340.1, - year2000: 282.9, - year2008: 280, - year2009: 298.9, -}, { - state: 'China', - year1970: 32.7, - year1980: 87.7, - year1990: 165.1, - year2000: 126.6, - year2008: 191.3, - year2009: 181.1, + year1990: 410, + year2000: 303, + year2010: 333, + year2020: 712, + year2021: 711, + year2022: 762, }, { state: 'Canada', - year1970: 87.5, - year1980: 78.1, - year1990: 69.3, - year2000: 145.7, - year2008: 148.5, - year2009: 182.2, + year1990: 92, + year2000: 126, + year2010: 161, + year2020: 252, + year2021: 267, + year2022: 274, }, { state: 'Mexico', - year1970: 24.7, - year1980: 109.2, - year1990: 145.3, - year2000: 148.3, - year2008: 132.1, - year2009: 121.6, + year1990: 151, + year2000: 172, + year2010: 146, + year2020: 85, + year2021: 97, + year2022: 95, +}, { + state: 'Brazil', + year1990: 33, + year2000: 63, + year2010: 109, + year2020: 155, + year2021: 153, + year2022: 165, }]; @Injectable() diff --git a/apps/demos/Demos/Charts/CustomBarWidth/React/App.tsx b/apps/demos/Demos/Charts/CustomBarWidth/React/App.tsx index b351fa4c60f7..003ecf84762d 100644 --- a/apps/demos/Demos/Charts/CustomBarWidth/React/App.tsx +++ b/apps/demos/Demos/Charts/CustomBarWidth/React/App.tsx @@ -16,12 +16,12 @@ function App() { type="bar" barPadding={0.5} /> - <Series valueField="year1970" name="1970" /> - <Series valueField="year1980" name="1980" /> <Series valueField="year1990" name="1990" /> <Series valueField="year2000" name="2000" /> - <Series valueField="year2008" name="2008" /> - <Series valueField="year2009" name="2009" /> + <Series valueField="year2010" name="2010" /> + <Series valueField="year2020" name="2020" /> + <Series valueField="year2021" name="2021" /> + <Series valueField="year2022" name="2022" /> <Legend verticalAlignment="bottom" horizontalAlignment="center" diff --git a/apps/demos/Demos/Charts/CustomBarWidth/React/data.ts b/apps/demos/Demos/Charts/CustomBarWidth/React/data.ts index 2a460513eb7b..6bbf4db6a31b 100644 --- a/apps/demos/Demos/Charts/CustomBarWidth/React/data.ts +++ b/apps/demos/Demos/Charts/CustomBarWidth/React/data.ts @@ -1,41 +1,41 @@ export const dataSource = [{ state: 'Saudi Arabia', - year1970: 186.7, - year1980: 480.4, - year1990: 319.6, - year2000: 465, - year2008: 549.7, - year2009: 428.4, + year1990: 339, + year2000: 404, + year2010: 462, + year2020: 498, + year2021: 515, + year2022: 602, }, { state: 'USA', - year1970: 557.8, - year1980: 423.2, - year1990: 340.1, - year2000: 282.9, - year2008: 280, - year2009: 298.9, -}, { - state: 'China', - year1970: 32.7, - year1980: 87.7, - year1990: 165.1, - year2000: 126.6, - year2008: 191.3, - year2009: 181.1, + year1990: 410, + year2000: 303, + year2010: 333, + year2020: 712, + year2021: 711, + year2022: 762, }, { state: 'Canada', - year1970: 87.5, - year1980: 78.1, - year1990: 69.3, - year2000: 145.7, - year2008: 148.5, - year2009: 182.2, + year1990: 92, + year2000: 126, + year2010: 161, + year2020: 252, + year2021: 267, + year2022: 274, }, { state: 'Mexico', - year1970: 24.7, - year1980: 109.2, - year1990: 145.3, - year2000: 148.3, - year2008: 132.1, - year2009: 121.6, + year1990: 151, + year2000: 172, + year2010: 146, + year2020: 85, + year2021: 97, + year2022: 95, +}, { + state: 'Brazil', + year1990: 33, + year2000: 63, + year2010: 109, + year2020: 155, + year2021: 153, + year2022: 165, }]; diff --git a/apps/demos/Demos/Charts/CustomBarWidth/ReactJs/App.js b/apps/demos/Demos/Charts/CustomBarWidth/ReactJs/App.js index d51962320192..8105a4c39070 100644 --- a/apps/demos/Demos/Charts/CustomBarWidth/ReactJs/App.js +++ b/apps/demos/Demos/Charts/CustomBarWidth/ReactJs/App.js @@ -16,14 +16,6 @@ function App() { type="bar" barPadding={0.5} /> - <Series - valueField="year1970" - name="1970" - /> - <Series - valueField="year1980" - name="1980" - /> <Series valueField="year1990" name="1990" @@ -33,12 +25,20 @@ function App() { name="2000" /> <Series - valueField="year2008" - name="2008" + valueField="year2010" + name="2010" + /> + <Series + valueField="year2020" + name="2020" + /> + <Series + valueField="year2021" + name="2021" /> <Series - valueField="year2009" - name="2009" + valueField="year2022" + name="2022" /> <Legend verticalAlignment="bottom" diff --git a/apps/demos/Demos/Charts/CustomBarWidth/ReactJs/data.js b/apps/demos/Demos/Charts/CustomBarWidth/ReactJs/data.js index c0227914b61e..435336bd348e 100644 --- a/apps/demos/Demos/Charts/CustomBarWidth/ReactJs/data.js +++ b/apps/demos/Demos/Charts/CustomBarWidth/ReactJs/data.js @@ -1,47 +1,47 @@ export const dataSource = [ { state: 'Saudi Arabia', - year1970: 186.7, - year1980: 480.4, - year1990: 319.6, - year2000: 465, - year2008: 549.7, - year2009: 428.4, + year1990: 339, + year2000: 404, + year2010: 462, + year2020: 498, + year2021: 515, + year2022: 602, }, { state: 'USA', - year1970: 557.8, - year1980: 423.2, - year1990: 340.1, - year2000: 282.9, - year2008: 280, - year2009: 298.9, - }, - { - state: 'China', - year1970: 32.7, - year1980: 87.7, - year1990: 165.1, - year2000: 126.6, - year2008: 191.3, - year2009: 181.1, + year1990: 410, + year2000: 303, + year2010: 333, + year2020: 712, + year2021: 711, + year2022: 762, }, { state: 'Canada', - year1970: 87.5, - year1980: 78.1, - year1990: 69.3, - year2000: 145.7, - year2008: 148.5, - year2009: 182.2, + year1990: 92, + year2000: 126, + year2010: 161, + year2020: 252, + year2021: 267, + year2022: 274, }, { state: 'Mexico', - year1970: 24.7, - year1980: 109.2, - year1990: 145.3, - year2000: 148.3, - year2008: 132.1, - year2009: 121.6, + year1990: 151, + year2000: 172, + year2010: 146, + year2020: 85, + year2021: 97, + year2022: 95, + }, + { + state: 'Brazil', + year1990: 33, + year2000: 63, + year2010: 109, + year2020: 155, + year2021: 153, + year2022: 165, }, ]; diff --git a/apps/demos/Demos/Charts/CustomBarWidth/Vue/App.vue b/apps/demos/Demos/Charts/CustomBarWidth/Vue/App.vue index 6072c4ffea78..9c5f3d2f56f6 100644 --- a/apps/demos/Demos/Charts/CustomBarWidth/Vue/App.vue +++ b/apps/demos/Demos/Charts/CustomBarWidth/Vue/App.vue @@ -9,14 +9,6 @@ argument-field="state" type="bar" /> - <DxSeries - value-field="year1970" - name="1970" - /> - <DxSeries - value-field="year1980" - name="1980" - /> <DxSeries value-field="year1990" name="1990" @@ -26,12 +18,20 @@ name="2000" /> <DxSeries - value-field="year2008" - name="2008" + value-field="year2010" + name="2010" + /> + <DxSeries + value-field="year2020" + name="2020" + /> + <DxSeries + value-field="year2021" + name="2021" /> <DxSeries - value-field="year2009" - name="2009" + value-field="year2022" + name="2022" /> <DxLegend vertical-alignment="bottom" diff --git a/apps/demos/Demos/Charts/CustomBarWidth/Vue/data.ts b/apps/demos/Demos/Charts/CustomBarWidth/Vue/data.ts index 2a460513eb7b..6bbf4db6a31b 100644 --- a/apps/demos/Demos/Charts/CustomBarWidth/Vue/data.ts +++ b/apps/demos/Demos/Charts/CustomBarWidth/Vue/data.ts @@ -1,41 +1,41 @@ export const dataSource = [{ state: 'Saudi Arabia', - year1970: 186.7, - year1980: 480.4, - year1990: 319.6, - year2000: 465, - year2008: 549.7, - year2009: 428.4, + year1990: 339, + year2000: 404, + year2010: 462, + year2020: 498, + year2021: 515, + year2022: 602, }, { state: 'USA', - year1970: 557.8, - year1980: 423.2, - year1990: 340.1, - year2000: 282.9, - year2008: 280, - year2009: 298.9, -}, { - state: 'China', - year1970: 32.7, - year1980: 87.7, - year1990: 165.1, - year2000: 126.6, - year2008: 191.3, - year2009: 181.1, + year1990: 410, + year2000: 303, + year2010: 333, + year2020: 712, + year2021: 711, + year2022: 762, }, { state: 'Canada', - year1970: 87.5, - year1980: 78.1, - year1990: 69.3, - year2000: 145.7, - year2008: 148.5, - year2009: 182.2, + year1990: 92, + year2000: 126, + year2010: 161, + year2020: 252, + year2021: 267, + year2022: 274, }, { state: 'Mexico', - year1970: 24.7, - year1980: 109.2, - year1990: 145.3, - year2000: 148.3, - year2008: 132.1, - year2009: 121.6, + year1990: 151, + year2000: 172, + year2010: 146, + year2020: 85, + year2021: 97, + year2022: 95, +}, { + state: 'Brazil', + year1990: 33, + year2000: 63, + year2010: 109, + year2020: 155, + year2021: 153, + year2022: 165, }]; diff --git a/apps/demos/Demos/Charts/CustomBarWidth/jQuery/data.js b/apps/demos/Demos/Charts/CustomBarWidth/jQuery/data.js index 433a356cd710..a609e5d3eab4 100644 --- a/apps/demos/Demos/Charts/CustomBarWidth/jQuery/data.js +++ b/apps/demos/Demos/Charts/CustomBarWidth/jQuery/data.js @@ -1,41 +1,41 @@ const dataSource = [{ state: 'Saudi Arabia', - year1970: 186.7, - year1980: 480.4, - year1990: 319.6, - year2000: 465, - year2008: 549.7, - year2009: 428.4, + year1990: 339, + year2000: 404, + year2010: 462, + year2020: 498, + year2021: 515, + year2022: 602, }, { state: 'USA', - year1970: 557.8, - year1980: 423.2, - year1990: 340.1, - year2000: 282.9, - year2008: 280, - year2009: 298.9, -}, { - state: 'China', - year1970: 32.7, - year1980: 87.7, - year1990: 165.1, - year2000: 126.6, - year2008: 191.3, - year2009: 181.1, + year1990: 410, + year2000: 303, + year2010: 333, + year2020: 712, + year2021: 711, + year2022: 762, }, { state: 'Canada', - year1970: 87.5, - year1980: 78.1, - year1990: 69.3, - year2000: 145.7, - year2008: 148.5, - year2009: 182.2, + year1990: 92, + year2000: 126, + year2010: 161, + year2020: 252, + year2021: 267, + year2022: 274, }, { state: 'Mexico', - year1970: 24.7, - year1980: 109.2, - year1990: 145.3, - year2000: 148.3, - year2008: 132.1, - year2009: 121.6, + year1990: 151, + year2000: 172, + year2010: 146, + year2020: 85, + year2021: 97, + year2022: 95, +}, { + state: 'Brazil', + year1990: 33, + year2000: 63, + year2010: 109, + year2020: 155, + year2021: 153, + year2022: 165, }]; diff --git a/apps/demos/Demos/Charts/CustomBarWidth/jQuery/index.js b/apps/demos/Demos/Charts/CustomBarWidth/jQuery/index.js index 68c14c220a8b..0288a9a4fb17 100644 --- a/apps/demos/Demos/Charts/CustomBarWidth/jQuery/index.js +++ b/apps/demos/Demos/Charts/CustomBarWidth/jQuery/index.js @@ -8,12 +8,12 @@ $(() => { type: 'bar', }, series: [ - { valueField: 'year1970', name: '1970' }, - { valueField: 'year1980', name: '1980' }, { valueField: 'year1990', name: '1990' }, { valueField: 'year2000', name: '2000' }, - { valueField: 'year2008', name: '2008' }, - { valueField: 'year2009', name: '2009' }, + { valueField: 'year2010', name: '2010' }, + { valueField: 'year2020', name: '2020' }, + { valueField: 'year2021', name: '2021' }, + { valueField: 'year2022', name: '2022' }, ], legend: { verticalAlignment: 'bottom', diff --git a/apps/demos/Demos/Charts/ExportCustomMarkup/Angular/app/app.component.html b/apps/demos/Demos/Charts/ExportCustomMarkup/Angular/app/app.component.html index 4d669c49873f..8127821182d7 100644 --- a/apps/demos/Demos/Charts/ExportCustomMarkup/Angular/app/app.component.html +++ b/apps/demos/Demos/Charts/ExportCustomMarkup/Angular/app/app.component.html @@ -45,11 +45,11 @@ </svg> </div> <dx-chart id="chart" [dataSource]="oilProductionData" palette="Violet"> - <dxi-chart-series valueField="year1990" name="1990"></dxi-chart-series> <dxi-chart-series valueField="year2000" name="2000"></dxi-chart-series> <dxi-chart-series valueField="year2010" name="2010"></dxi-chart-series> - <dxi-chart-series valueField="year2016" name="2016"></dxi-chart-series> - <dxi-chart-series valueField="year2017" name="2017"></dxi-chart-series> + <dxi-chart-series valueField="year2020" name="2020"></dxi-chart-series> + <dxi-chart-series valueField="year2021" name="2021"></dxi-chart-series> + <dxi-chart-series valueField="year2022" name="2022"></dxi-chart-series> <dxo-chart-common-series-settings argumentField="state" type="bar" diff --git a/apps/demos/Demos/Charts/ExportCustomMarkup/Angular/app/app.service.ts b/apps/demos/Demos/Charts/ExportCustomMarkup/Angular/app/app.service.ts index 1619952c9975..a473bf00f6ec 100644 --- a/apps/demos/Demos/Charts/ExportCustomMarkup/Angular/app/app.service.ts +++ b/apps/demos/Demos/Charts/ExportCustomMarkup/Angular/app/app.service.ts @@ -3,38 +3,38 @@ import { Injectable } from '@angular/core'; export class OilProductionDataItem { state: string; - year1990: number; - year2000: number; year2010: number; - year2016: number; + year2020: number; + + year2021: number; - year2017: number; + year2022: number; } const oilProductionData: OilProductionDataItem[] = [{ state: 'Saudi Arabia', - year1990: 319.6, - year2000: 408.4, + year2000: 408, year2010: 407, - year2016: 523, - year2017: 496.6, + year2020: 498, + year2021: 515, + year2022: 602, }, { state: 'USA', - year1990: 362.8, - year2000: 287.9, - year2010: 270.2, - year2016: 438, - year2017: 461.4, + year2000: 288, + year2010: 270, + year2020: 713, + year2021: 711, + year2022: 762, }, { - state: 'China', - year1990: 138.3, - year2000: 163, - year2010: 203, - year2016: 199.7, - year2017: 191.5, + state: 'Mexico', + year2000: 150, + year2010: 146, + year2020: 101, + year2021: 97, + year2022: 95, }]; @Injectable() diff --git a/apps/demos/Demos/Charts/ExportCustomMarkup/React/App.tsx b/apps/demos/Demos/Charts/ExportCustomMarkup/React/App.tsx index c419d77ee303..d5c5232e8a09 100644 --- a/apps/demos/Demos/Charts/ExportCustomMarkup/React/App.tsx +++ b/apps/demos/Demos/Charts/ExportCustomMarkup/React/App.tsx @@ -77,11 +77,11 @@ function App() { palette="Violet" > <CommonSeriesSettings barPadding={barPadding} argumentField="state" type="bar" /> - <Series valueField="year1990" name="1990" /> <Series valueField="year2000" name="2000" /> <Series valueField="year2010" name="2010" /> - <Series valueField="year2016" name="2016" /> - <Series valueField="year2017" name="2017" /> + <Series valueField="year2020" name="2020" /> + <Series valueField="year2021" name="2021" /> + <Series valueField="year2022" name="2022" /> <Legend verticalAlignment="bottom" horizontalAlignment="center" /> <Title text="Oil Production"> <Subtitle text="(in millions tonnes)" /> diff --git a/apps/demos/Demos/Charts/ExportCustomMarkup/React/data.ts b/apps/demos/Demos/Charts/ExportCustomMarkup/React/data.ts index 09a00061fb2b..8f80ecb1f918 100644 --- a/apps/demos/Demos/Charts/ExportCustomMarkup/React/data.ts +++ b/apps/demos/Demos/Charts/ExportCustomMarkup/React/data.ts @@ -1,22 +1,22 @@ export const dataSource = [{ state: 'Saudi Arabia', - year1990: 319.6, - year2000: 408.4, + year2000: 408, year2010: 407, - year2016: 523, - year2017: 496.6, + year2020: 498, + year2021: 515, + year2022: 602, }, { state: 'USA', - year1990: 362.8, - year2000: 287.9, - year2010: 270.2, - year2016: 438, - year2017: 461.4, + year2000: 288, + year2010: 270, + year2020: 713, + year2021: 711, + year2022: 762, }, { - state: 'China', - year1990: 138.3, - year2000: 163, - year2010: 203, - year2016: 199.7, - year2017: 191.5, + state: 'Mexico', + year2000: 150, + year2010: 146, + year2020: 101, + year2021: 97, + year2022: 95, }]; diff --git a/apps/demos/Demos/Charts/ExportCustomMarkup/ReactJs/App.js b/apps/demos/Demos/Charts/ExportCustomMarkup/ReactJs/App.js index 0e8dfbf8e978..284f5e58e8fa 100644 --- a/apps/demos/Demos/Charts/ExportCustomMarkup/ReactJs/App.js +++ b/apps/demos/Demos/Charts/ExportCustomMarkup/ReactJs/App.js @@ -68,10 +68,6 @@ function App() { argumentField="state" type="bar" /> - <Series - valueField="year1990" - name="1990" - /> <Series valueField="year2000" name="2000" @@ -81,12 +77,16 @@ function App() { name="2010" /> <Series - valueField="year2016" - name="2016" + valueField="year2020" + name="2020" + /> + <Series + valueField="year2021" + name="2021" /> <Series - valueField="year2017" - name="2017" + valueField="year2022" + name="2022" /> <Legend verticalAlignment="bottom" diff --git a/apps/demos/Demos/Charts/ExportCustomMarkup/ReactJs/data.js b/apps/demos/Demos/Charts/ExportCustomMarkup/ReactJs/data.js index c0dd17b893fd..1e81b30eda75 100644 --- a/apps/demos/Demos/Charts/ExportCustomMarkup/ReactJs/data.js +++ b/apps/demos/Demos/Charts/ExportCustomMarkup/ReactJs/data.js @@ -1,26 +1,26 @@ export const dataSource = [ { state: 'Saudi Arabia', - year1990: 319.6, - year2000: 408.4, + year2000: 408, year2010: 407, - year2016: 523, - year2017: 496.6, + year2020: 498, + year2021: 515, + year2022: 602, }, { state: 'USA', - year1990: 362.8, - year2000: 287.9, - year2010: 270.2, - year2016: 438, - year2017: 461.4, + year2000: 288, + year2010: 270, + year2020: 713, + year2021: 711, + year2022: 762, }, { - state: 'China', - year1990: 138.3, - year2000: 163, - year2010: 203, - year2016: 199.7, - year2017: 191.5, + state: 'Mexico', + year2000: 150, + year2010: 146, + year2020: 101, + year2021: 97, + year2022: 95, }, ]; diff --git a/apps/demos/Demos/Charts/ExportCustomMarkup/Vue/App.vue b/apps/demos/Demos/Charts/ExportCustomMarkup/Vue/App.vue index bc1dbc8f195e..186fd755a301 100644 --- a/apps/demos/Demos/Charts/ExportCustomMarkup/Vue/App.vue +++ b/apps/demos/Demos/Charts/ExportCustomMarkup/Vue/App.vue @@ -13,10 +13,6 @@ argument-field="state" type="bar" /> - <DxSeries - value-field="year1990" - name="1990" - /> <DxSeries value-field="year2000" name="2000" @@ -26,12 +22,16 @@ name="2010" /> <DxSeries - value-field="year2016" - name="2016" + value-field="year2020" + name="2020" + /> + <DxSeries + value-field="year2021" + name="2021" /> <DxSeries - value-field="year2017" - name="2017" + value-field="year2022" + name="2022" /> <DxLegend vertical-alignment="bottom" diff --git a/apps/demos/Demos/Charts/ExportCustomMarkup/Vue/data.ts b/apps/demos/Demos/Charts/ExportCustomMarkup/Vue/data.ts index 09a00061fb2b..8f80ecb1f918 100644 --- a/apps/demos/Demos/Charts/ExportCustomMarkup/Vue/data.ts +++ b/apps/demos/Demos/Charts/ExportCustomMarkup/Vue/data.ts @@ -1,22 +1,22 @@ export const dataSource = [{ state: 'Saudi Arabia', - year1990: 319.6, - year2000: 408.4, + year2000: 408, year2010: 407, - year2016: 523, - year2017: 496.6, + year2020: 498, + year2021: 515, + year2022: 602, }, { state: 'USA', - year1990: 362.8, - year2000: 287.9, - year2010: 270.2, - year2016: 438, - year2017: 461.4, + year2000: 288, + year2010: 270, + year2020: 713, + year2021: 711, + year2022: 762, }, { - state: 'China', - year1990: 138.3, - year2000: 163, - year2010: 203, - year2016: 199.7, - year2017: 191.5, + state: 'Mexico', + year2000: 150, + year2010: 146, + year2020: 101, + year2021: 97, + year2022: 95, }]; diff --git a/apps/demos/Demos/Charts/ExportCustomMarkup/jQuery/data.js b/apps/demos/Demos/Charts/ExportCustomMarkup/jQuery/data.js index 7d988e592502..abb0c0a03b29 100644 --- a/apps/demos/Demos/Charts/ExportCustomMarkup/jQuery/data.js +++ b/apps/demos/Demos/Charts/ExportCustomMarkup/jQuery/data.js @@ -1,22 +1,22 @@ const dataSource = [{ state: 'Saudi Arabia', - year1990: 319.6, - year2000: 408.4, + year2000: 408, year2010: 407, - year2016: 523, - year2017: 496.6, + year2020: 498, + year2021: 515, + year2022: 602, }, { state: 'USA', - year1990: 362.8, - year2000: 287.9, - year2010: 270.2, - year2016: 438, - year2017: 461.4, + year2000: 288, + year2010: 270, + year2020: 713, + year2021: 711, + year2022: 762, }, { - state: 'China', - year1990: 138.3, - year2000: 163, - year2010: 203, - year2016: 199.7, - year2017: 191.5, + state: 'Mexico', + year2000: 150, + year2010: 146, + year2020: 101, + year2021: 97, + year2022: 95, }]; diff --git a/apps/demos/Demos/Charts/ExportCustomMarkup/jQuery/index.js b/apps/demos/Demos/Charts/ExportCustomMarkup/jQuery/index.js index 8e9a92b02b06..8b139c79a5ce 100644 --- a/apps/demos/Demos/Charts/ExportCustomMarkup/jQuery/index.js +++ b/apps/demos/Demos/Charts/ExportCustomMarkup/jQuery/index.js @@ -8,10 +8,6 @@ $(() => { type: 'bar', }, series: [ - { - valueField: 'year1990', - name: '1990', - }, { valueField: 'year2000', name: '2000', @@ -21,12 +17,16 @@ $(() => { name: '2010', }, { - valueField: 'year2016', - name: '2016', + valueField: 'year2020', + name: '2020', + }, + { + valueField: 'year2021', + name: '2021', }, { - valueField: 'year2017', - name: '2017', + valueField: 'year2022', + name: '2022', }, ], legend: { diff --git a/apps/demos/Demos/Charts/FullStackedBar/Angular/app/app.component.html b/apps/demos/Demos/Charts/FullStackedBar/Angular/app/app.component.html index 2b3370579308..2ab704acf620 100644 --- a/apps/demos/Demos/Charts/FullStackedBar/Angular/app/app.component.html +++ b/apps/demos/Demos/Charts/FullStackedBar/Angular/app/app.component.html @@ -15,7 +15,7 @@ itemTextPosition="right" > </dxo-chart-legend> - <dxo-chart-title text="Energy Consumption in 2004"> + <dxo-chart-title text="Energy Consumption in 2024"> <dxo-chart-subtitle text="(Millions of Tons, Oil Equivalent)" ></dxo-chart-subtitle> diff --git a/apps/demos/Demos/Charts/FullStackedBar/Angular/app/app.service.ts b/apps/demos/Demos/Charts/FullStackedBar/Angular/app/app.service.ts index 59f1912fa520..a021a32a8bb3 100644 --- a/apps/demos/Demos/Charts/FullStackedBar/Angular/app/app.service.ts +++ b/apps/demos/Demos/Charts/FullStackedBar/Angular/app/app.service.ts @@ -16,46 +16,46 @@ export class CountryInfo { const countriesInfo: CountryInfo[] = [{ country: 'USA', - hydro: 59.8, - oil: 937.6, - gas: 582, - coal: 564.3, - nuclear: 187.9, -}, { - country: 'China', - hydro: 74.2, - oil: 308.6, - gas: 35.1, - coal: 956.9, - nuclear: 11.3, -}, { - country: 'Russia', - hydro: 40, - oil: 128.5, - gas: 361.8, - coal: 105, - nuclear: 32.4, + hydro: 60, + oil: 940, + gas: 910, + coal: 210, + nuclear: 230, }, { country: 'Japan', - hydro: 22.6, - oil: 241.5, - gas: 64.9, - coal: 120.8, - nuclear: 64.8, + hydro: 22, + oil: 170, + gas: 85, + coal: 120, + nuclear: 35, }, { country: 'India', - hydro: 19, - oil: 119.3, - gas: 28.9, - coal: 204.8, - nuclear: 3.8, + hydro: 40, + oil: 260, + gas: 60, + coal: 620, + nuclear: 10, }, { country: 'Germany', - hydro: 6.1, - oil: 123.6, - gas: 77.3, - coal: 85.7, - nuclear: 37.8, + hydro: 7, + oil: 110, + gas: 85, + coal: 35, + nuclear: 5, +}, { + country: 'Canada', + hydro: 90, + oil: 110, + gas: 120, + coal: 5, + nuclear: 20, +}, { + country: 'Brazil', + hydro: 110, + oil: 150, + gas: 50, + coal: 15, + nuclear: 5, }]; @Injectable() diff --git a/apps/demos/Demos/Charts/FullStackedBar/React/App.tsx b/apps/demos/Demos/Charts/FullStackedBar/React/App.tsx index d156bbc1f154..dcf672efd4f4 100644 --- a/apps/demos/Demos/Charts/FullStackedBar/React/App.tsx +++ b/apps/demos/Demos/Charts/FullStackedBar/React/App.tsx @@ -26,7 +26,7 @@ function App() { dataSource={dataSource} > <Title - text="Energy Consumption in 2004" + text="Energy Consumption in 2024" subtitle="(Millions of Tons, Oil Equivalent)" /> <CommonSeriesSettings argumentField="country" type="fullstackedbar" /> diff --git a/apps/demos/Demos/Charts/FullStackedBar/React/data.ts b/apps/demos/Demos/Charts/FullStackedBar/React/data.ts index 27fdd1a389db..7e6d9dc5388b 100644 --- a/apps/demos/Demos/Charts/FullStackedBar/React/data.ts +++ b/apps/demos/Demos/Charts/FullStackedBar/React/data.ts @@ -1,45 +1,45 @@ const dataSource = [{ country: 'USA', - hydro: 59.8, - oil: 937.6, - gas: 582, - coal: 564.3, - nuclear: 187.9, -}, { - country: 'China', - hydro: 74.2, - oil: 308.6, - gas: 35.1, - coal: 956.9, - nuclear: 11.3, -}, { - country: 'Russia', - hydro: 40, - oil: 128.5, - gas: 361.8, - coal: 105, - nuclear: 32.4, + hydro: 60, + oil: 940, + gas: 910, + coal: 210, + nuclear: 230, }, { country: 'Japan', - hydro: 22.6, - oil: 241.5, - gas: 64.9, - coal: 120.8, - nuclear: 64.8, + hydro: 22, + oil: 170, + gas: 85, + coal: 120, + nuclear: 35, }, { country: 'India', - hydro: 19, - oil: 119.3, - gas: 28.9, - coal: 204.8, - nuclear: 3.8, + hydro: 40, + oil: 260, + gas: 60, + coal: 620, + nuclear: 10, }, { country: 'Germany', - hydro: 6.1, - oil: 123.6, - gas: 77.3, - coal: 85.7, - nuclear: 37.8, + hydro: 7, + oil: 110, + gas: 85, + coal: 35, + nuclear: 5, +}, { + country: 'Canada', + hydro: 90, + oil: 110, + gas: 120, + coal: 5, + nuclear: 20, +}, { + country: 'Brazil', + hydro: 110, + oil: 150, + gas: 50, + coal: 15, + nuclear: 5, }]; export default { diff --git a/apps/demos/Demos/Charts/FullStackedBar/ReactJs/App.js b/apps/demos/Demos/Charts/FullStackedBar/ReactJs/App.js index ce2a09e21a9c..e9be46df0438 100644 --- a/apps/demos/Demos/Charts/FullStackedBar/ReactJs/App.js +++ b/apps/demos/Demos/Charts/FullStackedBar/ReactJs/App.js @@ -23,7 +23,7 @@ function App() { dataSource={dataSource} > <Title - text="Energy Consumption in 2004" + text="Energy Consumption in 2024" subtitle="(Millions of Tons, Oil Equivalent)" /> <CommonSeriesSettings diff --git a/apps/demos/Demos/Charts/FullStackedBar/ReactJs/data.js b/apps/demos/Demos/Charts/FullStackedBar/ReactJs/data.js index a976fdee8703..16aee3604fdf 100644 --- a/apps/demos/Demos/Charts/FullStackedBar/ReactJs/data.js +++ b/apps/demos/Demos/Charts/FullStackedBar/ReactJs/data.js @@ -1,51 +1,51 @@ const dataSource = [ { country: 'USA', - hydro: 59.8, - oil: 937.6, - gas: 582, - coal: 564.3, - nuclear: 187.9, + hydro: 60, + oil: 940, + gas: 910, + coal: 210, + nuclear: 230, }, { - country: 'China', - hydro: 74.2, - oil: 308.6, - gas: 35.1, - coal: 956.9, - nuclear: 11.3, + country: 'Japan', + hydro: 22, + oil: 170, + gas: 85, + coal: 120, + nuclear: 35, }, { - country: 'Russia', + country: 'India', hydro: 40, - oil: 128.5, - gas: 361.8, - coal: 105, - nuclear: 32.4, + oil: 260, + gas: 60, + coal: 620, + nuclear: 10, }, { - country: 'Japan', - hydro: 22.6, - oil: 241.5, - gas: 64.9, - coal: 120.8, - nuclear: 64.8, + country: 'Germany', + hydro: 7, + oil: 110, + gas: 85, + coal: 35, + nuclear: 5, }, { - country: 'India', - hydro: 19, - oil: 119.3, - gas: 28.9, - coal: 204.8, - nuclear: 3.8, + country: 'Canada', + hydro: 90, + oil: 110, + gas: 120, + coal: 5, + nuclear: 20, }, { - country: 'Germany', - hydro: 6.1, - oil: 123.6, - gas: 77.3, - coal: 85.7, - nuclear: 37.8, + country: 'Brazil', + hydro: 110, + oil: 150, + gas: 50, + coal: 15, + nuclear: 5, }, ]; export default { diff --git a/apps/demos/Demos/Charts/FullStackedBar/Vue/App.vue b/apps/demos/Demos/Charts/FullStackedBar/Vue/App.vue index 5c1f28820b6b..eaea3814741c 100644 --- a/apps/demos/Demos/Charts/FullStackedBar/Vue/App.vue +++ b/apps/demos/Demos/Charts/FullStackedBar/Vue/App.vue @@ -8,7 +8,7 @@ type="fullstackedbar" /> <DxTitle - text="Energy Consumption in 2004" + text="Energy Consumption in 2024" subtitle="(Millions of Tons, Oil Equivalent)" /> <DxSeries diff --git a/apps/demos/Demos/Charts/FullStackedBar/Vue/data.ts b/apps/demos/Demos/Charts/FullStackedBar/Vue/data.ts index 27fdd1a389db..7e6d9dc5388b 100644 --- a/apps/demos/Demos/Charts/FullStackedBar/Vue/data.ts +++ b/apps/demos/Demos/Charts/FullStackedBar/Vue/data.ts @@ -1,45 +1,45 @@ const dataSource = [{ country: 'USA', - hydro: 59.8, - oil: 937.6, - gas: 582, - coal: 564.3, - nuclear: 187.9, -}, { - country: 'China', - hydro: 74.2, - oil: 308.6, - gas: 35.1, - coal: 956.9, - nuclear: 11.3, -}, { - country: 'Russia', - hydro: 40, - oil: 128.5, - gas: 361.8, - coal: 105, - nuclear: 32.4, + hydro: 60, + oil: 940, + gas: 910, + coal: 210, + nuclear: 230, }, { country: 'Japan', - hydro: 22.6, - oil: 241.5, - gas: 64.9, - coal: 120.8, - nuclear: 64.8, + hydro: 22, + oil: 170, + gas: 85, + coal: 120, + nuclear: 35, }, { country: 'India', - hydro: 19, - oil: 119.3, - gas: 28.9, - coal: 204.8, - nuclear: 3.8, + hydro: 40, + oil: 260, + gas: 60, + coal: 620, + nuclear: 10, }, { country: 'Germany', - hydro: 6.1, - oil: 123.6, - gas: 77.3, - coal: 85.7, - nuclear: 37.8, + hydro: 7, + oil: 110, + gas: 85, + coal: 35, + nuclear: 5, +}, { + country: 'Canada', + hydro: 90, + oil: 110, + gas: 120, + coal: 5, + nuclear: 20, +}, { + country: 'Brazil', + hydro: 110, + oil: 150, + gas: 50, + coal: 15, + nuclear: 5, }]; export default { diff --git a/apps/demos/Demos/Charts/FullStackedBar/jQuery/data.js b/apps/demos/Demos/Charts/FullStackedBar/jQuery/data.js index a09a52489545..e13aeada800d 100644 --- a/apps/demos/Demos/Charts/FullStackedBar/jQuery/data.js +++ b/apps/demos/Demos/Charts/FullStackedBar/jQuery/data.js @@ -1,43 +1,43 @@ const dataSource = [{ country: 'USA', - hydro: 59.8, - oil: 937.6, - gas: 582, - coal: 564.3, - nuclear: 187.9, -}, { - country: 'China', - hydro: 74.2, - oil: 308.6, - gas: 35.1, - coal: 956.9, - nuclear: 11.3, -}, { - country: 'Russia', - hydro: 40, - oil: 128.5, - gas: 361.8, - coal: 105, - nuclear: 32.4, + hydro: 60, + oil: 940, + gas: 910, + coal: 210, + nuclear: 230, }, { country: 'Japan', - hydro: 22.6, - oil: 241.5, - gas: 64.9, - coal: 120.8, - nuclear: 64.8, + hydro: 22, + oil: 170, + gas: 85, + coal: 120, + nuclear: 35, }, { country: 'India', - hydro: 19, - oil: 119.3, - gas: 28.9, - coal: 204.8, - nuclear: 3.8, + hydro: 40, + oil: 260, + gas: 60, + coal: 620, + nuclear: 10, }, { country: 'Germany', - hydro: 6.1, - oil: 123.6, - gas: 77.3, - coal: 85.7, - nuclear: 37.8, + hydro: 7, + oil: 110, + gas: 85, + coal: 35, + nuclear: 5, +}, { + country: 'Canada', + hydro: 90, + oil: 110, + gas: 120, + coal: 5, + nuclear: 20, +}, { + country: 'Brazil', + hydro: 110, + oil: 150, + gas: 50, + coal: 15, + nuclear: 5, }]; diff --git a/apps/demos/Demos/Charts/FullStackedBar/jQuery/index.js b/apps/demos/Demos/Charts/FullStackedBar/jQuery/index.js index c786653d246a..8f0527097c05 100644 --- a/apps/demos/Demos/Charts/FullStackedBar/jQuery/index.js +++ b/apps/demos/Demos/Charts/FullStackedBar/jQuery/index.js @@ -18,7 +18,7 @@ $(() => { itemTextPosition: 'right', }, title: { - text: 'Energy Consumption in 2004', + text: 'Energy Consumption in 2024', subtitle: { text: '(Millions of Tons, Oil Equivalent)', }, diff --git a/apps/demos/Demos/Charts/MultiplePointSelection/Angular/app/app.component.html b/apps/demos/Demos/Charts/MultiplePointSelection/Angular/app/app.component.html index be3f8a3837b2..b818744bf02d 100644 --- a/apps/demos/Demos/Charts/MultiplePointSelection/Angular/app/app.component.html +++ b/apps/demos/Demos/Charts/MultiplePointSelection/Angular/app/app.component.html @@ -3,7 +3,7 @@ [dataSource]="medalsInfo" pointSelectionMode="multiple" [rotated]="true" - title="Olympic Medals in 2008" + title="Olympic Medals in 2024" (onPointClick)="pointClick($event)" > <dxi-chart-series diff --git a/apps/demos/Demos/Charts/MultiplePointSelection/Angular/app/app.service.ts b/apps/demos/Demos/Charts/MultiplePointSelection/Angular/app/app.service.ts index a503d5df9ed2..db5ed4600690 100644 --- a/apps/demos/Demos/Charts/MultiplePointSelection/Angular/app/app.service.ts +++ b/apps/demos/Demos/Charts/MultiplePointSelection/Angular/app/app.service.ts @@ -12,33 +12,33 @@ export class MedalsInfo { const medalsInfo: MedalsInfo[] = [{ country: 'USA', - gold: 36, - silver: 38, - bronze: 36, + gold: 40, + silver: 44, + bronze: 42, }, { - country: 'China', - gold: 51, - silver: 21, - bronze: 28, + country: 'Japan', + gold: 20, + silver: 12, + bronze: 13, }, { - country: 'Russia', - gold: 23, - silver: 21, - bronze: 28, + country: 'Australia', + gold: 18, + silver: 19, + bronze: 16, }, { - country: 'Britain', - gold: 19, - silver: 13, - bronze: 15, + country: 'France', + gold: 16, + silver: 26, + bronze: 22, }, { - country: 'Australia', + country: 'Great Britain', gold: 14, - silver: 15, - bronze: 17, + silver: 22, + bronze: 29, }, { - country: 'Germany', - gold: 16, - silver: 10, + country: 'Italy', + gold: 12, + silver: 13, bronze: 15, }]; diff --git a/apps/demos/Demos/Charts/MultiplePointSelection/React/App.tsx b/apps/demos/Demos/Charts/MultiplePointSelection/React/App.tsx index 7054000a2757..e821056b7831 100644 --- a/apps/demos/Demos/Charts/MultiplePointSelection/React/App.tsx +++ b/apps/demos/Demos/Charts/MultiplePointSelection/React/App.tsx @@ -26,7 +26,7 @@ function App() { rotated={true} pointSelectionMode="multiple" onPointClick={onPointClick} - title="Olympic Medals in 2008" + title="Olympic Medals in 2024" > <CommonSeriesSettings argumentField="country" diff --git a/apps/demos/Demos/Charts/MultiplePointSelection/React/data.ts b/apps/demos/Demos/Charts/MultiplePointSelection/React/data.ts index 79902276024c..5c5ea5208ddd 100644 --- a/apps/demos/Demos/Charts/MultiplePointSelection/React/data.ts +++ b/apps/demos/Demos/Charts/MultiplePointSelection/React/data.ts @@ -6,32 +6,32 @@ export const medalSources = [ export const medalStatistics = [{ country: 'USA', - gold: 36, - silver: 38, - bronze: 36, + gold: 40, + silver: 44, + bronze: 42, }, { - country: 'China', - gold: 51, - silver: 21, - bronze: 28, + country: 'Japan', + gold: 20, + silver: 12, + bronze: 13, }, { - country: 'Russia', - gold: 23, - silver: 21, - bronze: 28, + country: 'Australia', + gold: 18, + silver: 19, + bronze: 16, }, { - country: 'Britain', - gold: 19, - silver: 13, - bronze: 15, + country: 'France', + gold: 16, + silver: 26, + bronze: 22, }, { - country: 'Australia', + country: 'Great Britain', gold: 14, - silver: 15, - bronze: 17, + silver: 22, + bronze: 29, }, { - country: 'Germany', - gold: 16, - silver: 10, + country: 'Italy', + gold: 12, + silver: 13, bronze: 15, }]; diff --git a/apps/demos/Demos/Charts/MultiplePointSelection/ReactJs/App.js b/apps/demos/Demos/Charts/MultiplePointSelection/ReactJs/App.js index b7a61f62576b..43f2b5a07540 100644 --- a/apps/demos/Demos/Charts/MultiplePointSelection/ReactJs/App.js +++ b/apps/demos/Demos/Charts/MultiplePointSelection/ReactJs/App.js @@ -24,7 +24,7 @@ function App() { rotated={true} pointSelectionMode="multiple" onPointClick={onPointClick} - title="Olympic Medals in 2008" + title="Olympic Medals in 2024" > <CommonSeriesSettings argumentField="country" diff --git a/apps/demos/Demos/Charts/MultiplePointSelection/ReactJs/data.js b/apps/demos/Demos/Charts/MultiplePointSelection/ReactJs/data.js index 908d2aa6dee2..b752433e029d 100644 --- a/apps/demos/Demos/Charts/MultiplePointSelection/ReactJs/data.js +++ b/apps/demos/Demos/Charts/MultiplePointSelection/ReactJs/data.js @@ -6,38 +6,38 @@ export const medalSources = [ export const medalStatistics = [ { country: 'USA', - gold: 36, - silver: 38, - bronze: 36, + gold: 40, + silver: 44, + bronze: 42, }, { - country: 'China', - gold: 51, - silver: 21, - bronze: 28, + country: 'Japan', + gold: 20, + silver: 12, + bronze: 13, }, { - country: 'Russia', - gold: 23, - silver: 21, - bronze: 28, + country: 'Australia', + gold: 18, + silver: 19, + bronze: 16, }, { - country: 'Britain', - gold: 19, - silver: 13, - bronze: 15, + country: 'France', + gold: 16, + silver: 26, + bronze: 22, }, { - country: 'Australia', + country: 'Great Britain', gold: 14, - silver: 15, - bronze: 17, + silver: 22, + bronze: 29, }, { - country: 'Germany', - gold: 16, - silver: 10, + country: 'Italy', + gold: 12, + silver: 13, bronze: 15, }, ]; diff --git a/apps/demos/Demos/Charts/MultiplePointSelection/Vue/App.vue b/apps/demos/Demos/Charts/MultiplePointSelection/Vue/App.vue index 19a1e36e0c4a..625296b07ce1 100644 --- a/apps/demos/Demos/Charts/MultiplePointSelection/Vue/App.vue +++ b/apps/demos/Demos/Charts/MultiplePointSelection/Vue/App.vue @@ -4,7 +4,7 @@ :data-source="medalStatistics" :rotated="true" point-selection-mode="multiple" - title="Olympic Medals in 2008" + title="Olympic Medals in 2024" @point-click="onPointClick" > <DxCommonSeriesSettings diff --git a/apps/demos/Demos/Charts/MultiplePointSelection/Vue/data.ts b/apps/demos/Demos/Charts/MultiplePointSelection/Vue/data.ts index 79902276024c..5c5ea5208ddd 100644 --- a/apps/demos/Demos/Charts/MultiplePointSelection/Vue/data.ts +++ b/apps/demos/Demos/Charts/MultiplePointSelection/Vue/data.ts @@ -6,32 +6,32 @@ export const medalSources = [ export const medalStatistics = [{ country: 'USA', - gold: 36, - silver: 38, - bronze: 36, + gold: 40, + silver: 44, + bronze: 42, }, { - country: 'China', - gold: 51, - silver: 21, - bronze: 28, + country: 'Japan', + gold: 20, + silver: 12, + bronze: 13, }, { - country: 'Russia', - gold: 23, - silver: 21, - bronze: 28, + country: 'Australia', + gold: 18, + silver: 19, + bronze: 16, }, { - country: 'Britain', - gold: 19, - silver: 13, - bronze: 15, + country: 'France', + gold: 16, + silver: 26, + bronze: 22, }, { - country: 'Australia', + country: 'Great Britain', gold: 14, - silver: 15, - bronze: 17, + silver: 22, + bronze: 29, }, { - country: 'Germany', - gold: 16, - silver: 10, + country: 'Italy', + gold: 12, + silver: 13, bronze: 15, }]; diff --git a/apps/demos/Demos/Charts/MultiplePointSelection/jQuery/data.js b/apps/demos/Demos/Charts/MultiplePointSelection/jQuery/data.js index c5b7b7c72bd9..e16a928208c0 100644 --- a/apps/demos/Demos/Charts/MultiplePointSelection/jQuery/data.js +++ b/apps/demos/Demos/Charts/MultiplePointSelection/jQuery/data.js @@ -1,31 +1,31 @@ const dataSource = [{ country: 'USA', - gold: 36, - silver: 38, - bronze: 36, + gold: 40, + silver: 44, + bronze: 42, }, { - country: 'China', - gold: 51, - silver: 21, - bronze: 28, + country: 'Japan', + gold: 20, + silver: 12, + bronze: 13, }, { - country: 'Russia', - gold: 23, - silver: 21, - bronze: 28, + country: 'Australia', + gold: 18, + silver: 19, + bronze: 16, }, { - country: 'Britain', - gold: 19, - silver: 13, - bronze: 15, + country: 'France', + gold: 16, + silver: 26, + bronze: 22, }, { - country: 'Australia', + country: 'Great Britain', gold: 14, - silver: 15, - bronze: 17, + silver: 22, + bronze: 29, }, { - country: 'Germany', - gold: 16, - silver: 10, + country: 'Italy', + gold: 12, + silver: 13, bronze: 15, }]; diff --git a/apps/demos/Demos/Charts/MultiplePointSelection/jQuery/index.js b/apps/demos/Demos/Charts/MultiplePointSelection/jQuery/index.js index ff32ffab6ec5..61039ca11a6b 100644 --- a/apps/demos/Demos/Charts/MultiplePointSelection/jQuery/index.js +++ b/apps/demos/Demos/Charts/MultiplePointSelection/jQuery/index.js @@ -18,7 +18,7 @@ $(() => { { valueField: 'bronze', name: 'Bronze Medals', color: '#cd7f32' }, ], title: { - text: 'Olympic Medals in 2008', + text: 'Olympic Medals in 2024', }, export: { enabled: true, diff --git a/apps/demos/Demos/Charts/PieWithMultipleSeries/Angular/app/app.component.html b/apps/demos/Demos/Charts/PieWithMultipleSeries/Angular/app/app.component.html index 2a7810a10e81..4c381bd03c18 100644 --- a/apps/demos/Demos/Charts/PieWithMultipleSeries/Angular/app/app.component.html +++ b/apps/demos/Demos/Charts/PieWithMultipleSeries/Angular/app/app.component.html @@ -6,7 +6,7 @@ [dataSource]="exportImportData" > <dxo-pie-chart-title text="Imports/Exports of Goods and Services"> - <dxo-pie-chart-subtitle text="(billion US$, 2012)"></dxo-pie-chart-subtitle> + <dxo-pie-chart-subtitle text="(billion US$, 2024)"></dxo-pie-chart-subtitle> </dxo-pie-chart-title> <dxo-pie-chart-legend [visible]="true"></dxo-pie-chart-legend> <dxo-pie-chart-export [enabled]="true"></dxo-pie-chart-export> diff --git a/apps/demos/Demos/Charts/PieWithMultipleSeries/Angular/app/app.service.ts b/apps/demos/Demos/Charts/PieWithMultipleSeries/Angular/app/app.service.ts index 18cc51dbe46c..e1434720106a 100644 --- a/apps/demos/Demos/Charts/PieWithMultipleSeries/Angular/app/app.service.ts +++ b/apps/demos/Demos/Charts/PieWithMultipleSeries/Angular/app/app.service.ts @@ -11,45 +11,41 @@ export class ExportImportEntry { } const exportImportData: ExportImportEntry[] = [{ - Country: 'Brazil', - Export: 241, - Import: 225, + Country: 'United States', + Export: 2065, + Import: 3359, }, { - Country: 'Russia', - Export: 536, - Import: 284, + Country: 'Germany', + Export: 1683, + Import: 1425, }, { - Country: 'India', - Export: 317, - Import: 453, + Country: 'Japan', + Export: 707, + Import: 743, }, { - Country: 'China', - Export: 1702, - Import: 1717, + Country: 'United Kingdom', + Export: 513, + Import: 816, }, { - Country: 'Japan', - Export: 699, - Import: 800, + Country: 'France', + Export: 640, + Import: 750, }, { - Country: 'USA', - Export: 1448, - Import: 2795, + Country: 'Italy', + Export: 674, + Import: 615, }, { Country: 'Canada', - Export: 522, - Import: 440, + Export: 568, + Import: 573, }, { - Country: 'France', - Export: 626, - Import: 717, -}, { - Country: 'England', - Export: 424, - Import: 568, + Country: 'India', + Export: 443, + Import: 702, }, { - Country: 'Germany', - Export: 1403, - Import: 1000, + Country: 'Brazil', + Export: 337, + Import: 278, }]; @Injectable() diff --git a/apps/demos/Demos/Charts/PieWithMultipleSeries/React/App.tsx b/apps/demos/Demos/Charts/PieWithMultipleSeries/React/App.tsx index 16c08b17a832..7a9265a0475d 100644 --- a/apps/demos/Demos/Charts/PieWithMultipleSeries/React/App.tsx +++ b/apps/demos/Demos/Charts/PieWithMultipleSeries/React/App.tsx @@ -26,7 +26,7 @@ function App() { dataSource={exportImportData} > <Title text="Imports/Exports of Goods and Services"> - <Subtitle text="(billion US$, 2012)" /> + <Subtitle text="(billion US$, 2024)" /> diff --git a/apps/demos/Demos/Charts/PieWithMultipleSeries/React/data.ts b/apps/demos/Demos/Charts/PieWithMultipleSeries/React/data.ts index 7d1b1079b828..30a42209ee79 100644 --- a/apps/demos/Demos/Charts/PieWithMultipleSeries/React/data.ts +++ b/apps/demos/Demos/Charts/PieWithMultipleSeries/React/data.ts @@ -1,41 +1,37 @@ export const exportImportData = [{ - Country: 'Brazil', - Export: 241, - Import: 225, + Country: 'United States', + Export: 2065, + Import: 3359, }, { - Country: 'Russia', - Export: 536, - Import: 284, + Country: 'Germany', + Export: 1683, + Import: 1425, }, { - Country: 'India', - Export: 317, - Import: 453, + Country: 'Japan', + Export: 707, + Import: 743, }, { - Country: 'China', - Export: 1702, - Import: 1717, + Country: 'United Kingdom', + Export: 513, + Import: 816, }, { - Country: 'Japan', - Export: 699, - Import: 800, + Country: 'France', + Export: 640, + Import: 750, }, { - Country: 'USA', - Export: 1448, - Import: 2795, + Country: 'Italy', + Export: 674, + Import: 615, }, { Country: 'Canada', - Export: 522, - Import: 440, + Export: 568, + Import: 573, }, { - Country: 'France', - Export: 626, - Import: 717, -}, { - Country: 'England', - Export: 424, - Import: 568, + Country: 'India', + Export: 443, + Import: 702, }, { - Country: 'Germany', - Export: 1403, - Import: 1000, + Country: 'Brazil', + Export: 337, + Import: 278, }]; diff --git a/apps/demos/Demos/Charts/PieWithMultipleSeries/ReactJs/App.js b/apps/demos/Demos/Charts/PieWithMultipleSeries/ReactJs/App.js index fdee4361d789..bfa0ba9bdf64 100644 --- a/apps/demos/Demos/Charts/PieWithMultipleSeries/ReactJs/App.js +++ b/apps/demos/Demos/Charts/PieWithMultipleSeries/ReactJs/App.js @@ -24,7 +24,7 @@ function App() { dataSource={exportImportData} > - <Subtitle text="(billion US$, 2012)" /> + <Subtitle text="(billion US$, 2024)" /> diff --git a/apps/demos/Demos/Charts/PieWithMultipleSeries/ReactJs/data.js b/apps/demos/Demos/Charts/PieWithMultipleSeries/ReactJs/data.js index 3c8c9ed60496..cd540dcaf735 100644 --- a/apps/demos/Demos/Charts/PieWithMultipleSeries/ReactJs/data.js +++ b/apps/demos/Demos/Charts/PieWithMultipleSeries/ReactJs/data.js @@ -1,52 +1,47 @@ export const exportImportData = [ { - Country: 'Brazil', - Export: 241, - Import: 225, + Country: 'United States', + Export: 2065, + Import: 3359, }, { - Country: 'Russia', - Export: 536, - Import: 284, + Country: 'Germany', + Export: 1683, + Import: 1425, }, { - Country: 'India', - Export: 317, - Import: 453, + Country: 'Japan', + Export: 707, + Import: 743, }, { - Country: 'China', - Export: 1702, - Import: 1717, + Country: 'United Kingdom', + Export: 513, + Import: 816, }, { - Country: 'Japan', - Export: 699, - Import: 800, + Country: 'France', + Export: 640, + Import: 750, }, { - Country: 'USA', - Export: 1448, - Import: 2795, + Country: 'Italy', + Export: 674, + Import: 615, }, { Country: 'Canada', - Export: 522, - Import: 440, + Export: 568, + Import: 573, }, { - Country: 'France', - Export: 626, - Import: 717, - }, - { - Country: 'England', - Export: 424, - Import: 568, + Country: 'India', + Export: 443, + Import: 702, }, { - Country: 'Germany', - Export: 1403, - Import: 1000, + Country: 'Brazil', + Export: 337, + Import: 278, }, ]; diff --git a/apps/demos/Demos/Charts/PieWithMultipleSeries/Vue/App.vue b/apps/demos/Demos/Charts/PieWithMultipleSeries/Vue/App.vue index 3a7fa146f911..c3183032b829 100644 --- a/apps/demos/Demos/Charts/PieWithMultipleSeries/Vue/App.vue +++ b/apps/demos/Demos/Charts/PieWithMultipleSeries/Vue/App.vue @@ -7,7 +7,7 @@ palette="Ocean" > - + diff --git a/apps/demos/Demos/Charts/PieWithMultipleSeries/Vue/data.ts b/apps/demos/Demos/Charts/PieWithMultipleSeries/Vue/data.ts index 7d1b1079b828..30a42209ee79 100644 --- a/apps/demos/Demos/Charts/PieWithMultipleSeries/Vue/data.ts +++ b/apps/demos/Demos/Charts/PieWithMultipleSeries/Vue/data.ts @@ -1,41 +1,37 @@ export const exportImportData = [{ - Country: 'Brazil', - Export: 241, - Import: 225, + Country: 'United States', + Export: 2065, + Import: 3359, }, { - Country: 'Russia', - Export: 536, - Import: 284, + Country: 'Germany', + Export: 1683, + Import: 1425, }, { - Country: 'India', - Export: 317, - Import: 453, + Country: 'Japan', + Export: 707, + Import: 743, }, { - Country: 'China', - Export: 1702, - Import: 1717, + Country: 'United Kingdom', + Export: 513, + Import: 816, }, { - Country: 'Japan', - Export: 699, - Import: 800, + Country: 'France', + Export: 640, + Import: 750, }, { - Country: 'USA', - Export: 1448, - Import: 2795, + Country: 'Italy', + Export: 674, + Import: 615, }, { Country: 'Canada', - Export: 522, - Import: 440, + Export: 568, + Import: 573, }, { - Country: 'France', - Export: 626, - Import: 717, -}, { - Country: 'England', - Export: 424, - Import: 568, + Country: 'India', + Export: 443, + Import: 702, }, { - Country: 'Germany', - Export: 1403, - Import: 1000, + Country: 'Brazil', + Export: 337, + Import: 278, }]; diff --git a/apps/demos/Demos/Charts/PieWithMultipleSeries/jQuery/data.js b/apps/demos/Demos/Charts/PieWithMultipleSeries/jQuery/data.js index 8e97f1a4e7ca..90b75741b6f6 100644 --- a/apps/demos/Demos/Charts/PieWithMultipleSeries/jQuery/data.js +++ b/apps/demos/Demos/Charts/PieWithMultipleSeries/jQuery/data.js @@ -1,41 +1,37 @@ const dataSource = [{ - Country: 'Brazil', - Export: 241, - Import: 225, + Country: 'United States', + Export: 2065, + Import: 3359, }, { - Country: 'Russia', - Export: 536, - Import: 284, + Country: 'Germany', + Export: 1683, + Import: 1425, }, { - Country: 'India', - Export: 317, - Import: 453, + Country: 'Japan', + Export: 707, + Import: 743, }, { - Country: 'China', - Export: 1702, - Import: 1717, + Country: 'United Kingdom', + Export: 513, + Import: 816, }, { - Country: 'Japan', - Export: 699, - Import: 800, + Country: 'France', + Export: 640, + Import: 750, }, { - Country: 'USA', - Export: 1448, - Import: 2795, + Country: 'Italy', + Export: 674, + Import: 615, }, { Country: 'Canada', - Export: 522, - Import: 440, + Export: 568, + Import: 573, }, { - Country: 'France', - Export: 626, - Import: 717, -}, { - Country: 'England', - Export: 424, - Import: 568, + Country: 'India', + Export: 443, + Import: 702, }, { - Country: 'Germany', - Export: 1403, - Import: 1000, + Country: 'Brazil', + Export: 337, + Import: 278, }]; diff --git a/apps/demos/Demos/Charts/PieWithMultipleSeries/jQuery/index.js b/apps/demos/Demos/Charts/PieWithMultipleSeries/jQuery/index.js index 0e239ebeae14..d7ba825cd04b 100644 --- a/apps/demos/Demos/Charts/PieWithMultipleSeries/jQuery/index.js +++ b/apps/demos/Demos/Charts/PieWithMultipleSeries/jQuery/index.js @@ -6,7 +6,7 @@ $(() => { title: { text: 'Imports/Exports of Goods and Services', subtitle: { - text: '(billion US$, 2012)', + text: '(billion US$, 2024)', }, }, legend: { diff --git a/apps/demos/Demos/Charts/Selection/Angular/app/app.component.html b/apps/demos/Demos/Charts/Selection/Angular/app/app.component.html index 904a8b01123f..27b956034f95 100644 --- a/apps/demos/Demos/Charts/Selection/Angular/app/app.component.html +++ b/apps/demos/Demos/Charts/Selection/Angular/app/app.component.html @@ -6,8 +6,8 @@ (onPointClick)="pointClick($event)" (onLegendClick)="legendClick($event)" > - - + + diff --git a/apps/demos/Demos/Charts/Selection/Vue/data.ts b/apps/demos/Demos/Charts/Selection/Vue/data.ts index 8b0ddc1611b3..a3f8b4bc1aef 100644 --- a/apps/demos/Demos/Charts/Selection/Vue/data.ts +++ b/apps/demos/Demos/Charts/Selection/Vue/data.ts @@ -1,25 +1,25 @@ export const exportData = [{ - country: 'China', - year2007: 0.18265, - year2008: -0.16682, + country: 'United Kingdom', + year2019: 0.142, + year2020: -0.153, }, { country: 'Germany', - year2007: 0.10467, - year2008: -0.20165, + year2019: 0.109, + year2020: -0.120, }, { country: 'United States', - year2007: 0.1232, - year2008: -0.17994, + year2019: 0.097, + year2020: -0.134, }, { country: 'Japan', - year2007: 0.10868, - year2008: -0.25622, + year2019: 0.106, + year2020: -0.111, }, { country: 'France', - year2007: 0.09526, - year2008: -0.23631, + year2019: 0.113, + year2020: -0.162, }, { country: 'Netherlands', - year2007: 0.14402, - year2008: -0.21923, + year2019: 0.128, + year2020: -0.147, }]; diff --git a/apps/demos/Demos/Charts/Selection/jQuery/data.js b/apps/demos/Demos/Charts/Selection/jQuery/data.js index 2800b6631520..3d9023d7d71c 100644 --- a/apps/demos/Demos/Charts/Selection/jQuery/data.js +++ b/apps/demos/Demos/Charts/Selection/jQuery/data.js @@ -1,25 +1,25 @@ const dataSource = [{ - country: 'China', - year2007: 0.18265, - year2008: -0.16682, + country: 'United Kingdom', + year2019: 0.142, + year2020: -0.153, }, { country: 'Germany', - year2007: 0.10467, - year2008: -0.20165, + year2019: 0.109, + year2020: -0.120, }, { country: 'United States', - year2007: 0.1232, - year2008: -0.17994, + year2019: 0.097, + year2020: -0.134, }, { country: 'Japan', - year2007: 0.10868, - year2008: -0.25622, + year2019: 0.106, + year2020: -0.111, }, { country: 'France', - year2007: 0.09526, - year2008: -0.23631, + year2019: 0.113, + year2020: -0.162, }, { country: 'Netherlands', - year2007: 0.14402, - year2008: -0.21923, + year2019: 0.128, + year2020: -0.147, }]; diff --git a/apps/demos/Demos/Charts/Selection/jQuery/index.js b/apps/demos/Demos/Charts/Selection/jQuery/index.js index d7b93d155f6f..728a13496458 100644 --- a/apps/demos/Demos/Charts/Selection/jQuery/index.js +++ b/apps/demos/Demos/Charts/Selection/jQuery/index.js @@ -24,8 +24,8 @@ $(() => { }, }, series: [ - { valueField: 'year2007', name: '2007 - 2008' }, - { valueField: 'year2008', name: '2008 - 2009' }, + { valueField: 'year2019', name: '2019 - 2020' }, + { valueField: 'year2020', name: '2020 - 2021' }, ], title: { text: 'Economy - Export Change', diff --git a/apps/demos/Demos/Charts/SideBySideBar/Angular/app/app.component.html b/apps/demos/Demos/Charts/SideBySideBar/Angular/app/app.component.html index ab198d237d57..87b44537ae34 100644 --- a/apps/demos/Demos/Charts/SideBySideBar/Angular/app/app.component.html +++ b/apps/demos/Demos/Charts/SideBySideBar/Angular/app/app.component.html @@ -1,12 +1,12 @@ - - - + + + @@ -27,16 +27,16 @@ function App() { diff --git a/apps/demos/Demos/Charts/SideBySideBar/React/data.ts b/apps/demos/Demos/Charts/SideBySideBar/React/data.ts index 5895b5ddb993..262848360651 100644 --- a/apps/demos/Demos/Charts/SideBySideBar/React/data.ts +++ b/apps/demos/Demos/Charts/SideBySideBar/React/data.ts @@ -1,26 +1,26 @@ export const grossProductData = [{ state: 'Illinois', - year2016: 803, - year2017: 823, - year2018: 863, + year2022: 1040, + year2023: 1090, + year2024: 1137, }, { state: 'Indiana', - year2016: 316, - year2017: 332, - year2018: 332, + year2022: 473, + year2023: 505, + year2024: 527, }, { state: 'Michigan', - year2016: 452, - year2017: 459, - year2018: 470, + year2022: 627, + year2023: 675, + year2024: 705, }, { state: 'Ohio', - year2016: 621, - year2017: 642, - year2018: 675, + year2022: 833, + year2023: 890, + year2024: 930, }, { state: 'Wisconsin', - year2016: 290, - year2017: 294, - year2018: 301, + year2022: 401, + year2023: 415, + year2024: 430, }]; diff --git a/apps/demos/Demos/Charts/SideBySideBar/ReactJs/App.js b/apps/demos/Demos/Charts/SideBySideBar/ReactJs/App.js index 965100701bd9..003fdf2c9aea 100644 --- a/apps/demos/Demos/Charts/SideBySideBar/ReactJs/App.js +++ b/apps/demos/Demos/Charts/SideBySideBar/ReactJs/App.js @@ -17,7 +17,7 @@ function App() { return ( @@ -36,16 +36,16 @@ function App() { { }, }, series: [ - { valueField: 'year2018', name: '2018' }, - { valueField: 'year2017', name: '2017' }, - { valueField: 'year2016', name: '2016' }, + { valueField: 'year2024', name: '2024' }, + { valueField: 'year2023', name: '2023' }, + { valueField: 'year2022', name: '2022' }, ], - title: 'Gross State Product within the Great Lakes Region', + title: 'Gross State Product within the Great Lakes Region (Billions USD)', legend: { verticalAlignment: 'bottom', horizontalAlignment: 'center', diff --git a/apps/demos/testing/etalons/Charts-Area (fluent.blue.light).png b/apps/demos/testing/etalons/Charts-Area (fluent.blue.light).png index 835fe0086d77..e291c3fb507f 100644 Binary files a/apps/demos/testing/etalons/Charts-Area (fluent.blue.light).png and b/apps/demos/testing/etalons/Charts-Area (fluent.blue.light).png differ diff --git a/apps/demos/testing/etalons/Charts-BiDirectionalBarChart (fluent.blue.light).png b/apps/demos/testing/etalons/Charts-BiDirectionalBarChart (fluent.blue.light).png index f657865d1144..3614dbb11880 100644 Binary files a/apps/demos/testing/etalons/Charts-BiDirectionalBarChart (fluent.blue.light).png and b/apps/demos/testing/etalons/Charts-BiDirectionalBarChart (fluent.blue.light).png differ diff --git a/apps/demos/testing/etalons/Charts-CenterLabelCustomization (fluent.blue.light).png b/apps/demos/testing/etalons/Charts-CenterLabelCustomization (fluent.blue.light).png index b5585c19484f..24ce890c3ada 100644 Binary files a/apps/demos/testing/etalons/Charts-CenterLabelCustomization (fluent.blue.light).png and b/apps/demos/testing/etalons/Charts-CenterLabelCustomization (fluent.blue.light).png differ diff --git a/apps/demos/testing/etalons/Charts-CustomBarWidth (fluent.blue.light).png b/apps/demos/testing/etalons/Charts-CustomBarWidth (fluent.blue.light).png index eb68fe5a7db1..54c5231a5137 100644 Binary files a/apps/demos/testing/etalons/Charts-CustomBarWidth (fluent.blue.light).png and b/apps/demos/testing/etalons/Charts-CustomBarWidth (fluent.blue.light).png differ diff --git a/apps/demos/testing/etalons/Charts-ExportCustomMarkup (fluent.blue.light).png b/apps/demos/testing/etalons/Charts-ExportCustomMarkup (fluent.blue.light).png index 7216954410fe..376ed3a94616 100644 Binary files a/apps/demos/testing/etalons/Charts-ExportCustomMarkup (fluent.blue.light).png and b/apps/demos/testing/etalons/Charts-ExportCustomMarkup (fluent.blue.light).png differ diff --git a/apps/demos/testing/etalons/Charts-FullStackedBar (fluent.blue.light).png b/apps/demos/testing/etalons/Charts-FullStackedBar (fluent.blue.light).png index 9835c2442f34..1f9417bcfae3 100644 Binary files a/apps/demos/testing/etalons/Charts-FullStackedBar (fluent.blue.light).png and b/apps/demos/testing/etalons/Charts-FullStackedBar (fluent.blue.light).png differ diff --git a/apps/demos/testing/etalons/Charts-MultiplePointSelection (fluent.blue.light).png b/apps/demos/testing/etalons/Charts-MultiplePointSelection (fluent.blue.light).png index dde484a983d3..77bedbf1bb2c 100644 Binary files a/apps/demos/testing/etalons/Charts-MultiplePointSelection (fluent.blue.light).png and b/apps/demos/testing/etalons/Charts-MultiplePointSelection (fluent.blue.light).png differ diff --git a/apps/demos/testing/etalons/Charts-PieWithMultipleSeries (fluent.blue.light).png b/apps/demos/testing/etalons/Charts-PieWithMultipleSeries (fluent.blue.light).png index b189db36015f..20e0648a55a6 100644 Binary files a/apps/demos/testing/etalons/Charts-PieWithMultipleSeries (fluent.blue.light).png and b/apps/demos/testing/etalons/Charts-PieWithMultipleSeries (fluent.blue.light).png differ diff --git a/apps/demos/testing/etalons/Charts-Selection (fluent.blue.light).png b/apps/demos/testing/etalons/Charts-Selection (fluent.blue.light).png index b84cc35c11f8..2dc0261ea74c 100644 Binary files a/apps/demos/testing/etalons/Charts-Selection (fluent.blue.light).png and b/apps/demos/testing/etalons/Charts-Selection (fluent.blue.light).png differ diff --git a/apps/demos/testing/etalons/Charts-SideBySideBar (fluent.blue.light).png b/apps/demos/testing/etalons/Charts-SideBySideBar (fluent.blue.light).png index 6559f9f300be..5ea66e44cc6b 100644 Binary files a/apps/demos/testing/etalons/Charts-SideBySideBar (fluent.blue.light).png and b/apps/demos/testing/etalons/Charts-SideBySideBar (fluent.blue.light).png differ diff --git a/apps/demos/testing/widgets/charts/etalons/charts_crosshair (material.blue.light).png b/apps/demos/testing/widgets/charts/etalons/charts_crosshair (material.blue.light).png index 45fb3cc5ecd1..66644fe0d35b 100644 Binary files a/apps/demos/testing/widgets/charts/etalons/charts_crosshair (material.blue.light).png and b/apps/demos/testing/widgets/charts/etalons/charts_crosshair (material.blue.light).png differ