diff --git a/samples/charts/category-chart/axis-range/App.razor b/samples/charts/category-chart/axis-range/App.razor index 0d2ed0beef..1492431c9a 100644 --- a/samples/charts/category-chart/axis-range/App.razor +++ b/samples/charts/category-chart/axis-range/App.razor @@ -21,6 +21,7 @@ ValueType="PropertyEditorValueType.EnumValue" DropDownNames="@(new string[] { "0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100" })" DropDownValues="@(new string[] { "0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100" })" + PrimitiveValue="0" Changed="EditorChangeUpdateYAxisMinimumValue"> @@ -33,6 +34,7 @@ ValueType="PropertyEditorValueType.EnumValue" DropDownNames="@(new string[] { "100", "110", "120", "130", "140", "150", "160", "170", "180", "190", "200" })" DropDownValues="@(new string[] { "100", "110", "120", "130", "140", "150", "160", "170", "180", "190", "200" })" + PrimitiveValue="150" Changed="EditorChangeUpdateYAxisMaximumValue"> diff --git a/samples/charts/category-chart/format-specifiers/App.razor b/samples/charts/category-chart/format-specifiers/App.razor index bb9672b7b7..6b9b10fe99 100644 --- a/samples/charts/category-chart/format-specifiers/App.razor +++ b/samples/charts/category-chart/format-specifiers/App.razor @@ -6,11 +6,10 @@
+ @ref="legend" + ValueFormatString="{0} Billion" + ValueFormatSpecifiers="NumberFormatSpecifier1">
@@ -22,10 +21,11 @@ ChartType="CategoryChartType.Column" IsHorizontalZoomEnabled="false" IsVerticalZoomEnabled="false" - DataToolTipValueFormatMode="DataLegendValueMode.Currency" - DataToolTipValueFormatString="${0} Billion" + FinalValueAnnotationsPrecision="2" + DataToolTipValueFormatString="{0} Billion" + DataToolTipValueFormatSpecifiers="NumberFormatSpecifier3" YAxisLabelFormat="{0}B" - YAxisLabelFormatSpecifiers="NumberFormatSpecifier1"> + YAxisLabelFormatSpecifiers="NumberFormatSpecifier5"> @@ -48,7 +48,6 @@ } private IgbDataLegend legend; - private IgbCategoryChart chart; private IgbNumberFormatSpecifier[] _numberFormatSpecifier1 = null; public IgbNumberFormatSpecifier[] NumberFormatSpecifier1 { @@ -61,13 +60,54 @@ numberFormatSpecifier2.Style = "currency"; numberFormatSpecifier2.Currency = "USD"; numberFormatSpecifier2.CurrencyDisplay = "symbol"; - numberFormatSpecifier2.MinimumFractionDigits = 0; + numberFormatSpecifier2.MaximumFractionDigits = 2; + numberFormatSpecifier2.MinimumFractionDigits = 2; numberFormatSpecifier1[0] = numberFormatSpecifier2; this._numberFormatSpecifier1 = numberFormatSpecifier1; } return this._numberFormatSpecifier1; } } + private IgbCategoryChart chart; + private IgbNumberFormatSpecifier[] _numberFormatSpecifier3 = null; + public IgbNumberFormatSpecifier[] NumberFormatSpecifier3 + { + get + { + if (this._numberFormatSpecifier3 == null) + { + var numberFormatSpecifier3 = new IgbNumberFormatSpecifier[1]; + var numberFormatSpecifier4 = new IgbNumberFormatSpecifier(); + numberFormatSpecifier4.Style = "currency"; + numberFormatSpecifier4.Currency = "USD"; + numberFormatSpecifier4.CurrencyDisplay = "symbol"; + numberFormatSpecifier4.MaximumFractionDigits = 2; + numberFormatSpecifier4.MinimumFractionDigits = 2; + numberFormatSpecifier3[0] = numberFormatSpecifier4; + this._numberFormatSpecifier3 = numberFormatSpecifier3; + } + return this._numberFormatSpecifier3; + } + } + private IgbNumberFormatSpecifier[] _numberFormatSpecifier5 = null; + public IgbNumberFormatSpecifier[] NumberFormatSpecifier5 + { + get + { + if (this._numberFormatSpecifier5 == null) + { + var numberFormatSpecifier5 = new IgbNumberFormatSpecifier[1]; + var numberFormatSpecifier6 = new IgbNumberFormatSpecifier(); + numberFormatSpecifier6.Style = "currency"; + numberFormatSpecifier6.Currency = "USD"; + numberFormatSpecifier6.CurrencyDisplay = "symbol"; + numberFormatSpecifier6.MinimumFractionDigits = 0; + numberFormatSpecifier5[0] = numberFormatSpecifier6; + this._numberFormatSpecifier5 = numberFormatSpecifier5; + } + return this._numberFormatSpecifier5; + } + } private HighestGrossingMovies _highestGrossingMovies = null; public HighestGrossingMovies HighestGrossingMovies diff --git a/samples/charts/category-chart/format-specifiers/Program.cs b/samples/charts/category-chart/format-specifiers/Program.cs index 23b384cac3..5b5204ad16 100644 --- a/samples/charts/category-chart/format-specifiers/Program.cs +++ b/samples/charts/category-chart/format-specifiers/Program.cs @@ -23,7 +23,8 @@ public static async Task Main(string[] args) typeof(IgbInputModule), typeof(IgbPropertyEditorPanelModule), typeof(IgbDataLegendModule), - typeof(IgbCategoryChartModule) + typeof(IgbCategoryChartModule), + typeof(IgbNumberFormatSpecifierModule) ); await builder.Build().RunAsync(); } diff --git a/samples/charts/data-chart/format-specifiers/App.razor b/samples/charts/data-chart/format-specifiers/App.razor index 1736c43656..616be7df0d 100644 --- a/samples/charts/data-chart/format-specifiers/App.razor +++ b/samples/charts/data-chart/format-specifiers/App.razor @@ -8,8 +8,8 @@ + ValueFormatString="{0} Billion" + ValueFormatSpecifiers="NumberFormatSpecifier1"> @@ -35,7 +35,7 @@ Title="Billions of U.S. Dollars" LabelFormat="{0}B" AbbreviateLargeNumbers="false" - LabelFormatSpecifiers="NumberFormatSpecifier1"> + LabelFormatSpecifiers="NumberFormatSpecifier3"> + ValueFormatString="{0} Billion" + ValueFormatSpecifiers="NumberFormatSpecifier5"> @@ -94,9 +94,6 @@ } private IgbDataLegend legend; - private IgbDataChart chart; - private IgbCategoryYAxis yAxis; - private IgbNumericXAxis xAxis; private IgbNumberFormatSpecifier[] _numberFormatSpecifier1 = null; public IgbNumberFormatSpecifier[] NumberFormatSpecifier1 { @@ -109,16 +106,59 @@ numberFormatSpecifier2.Style = "currency"; numberFormatSpecifier2.Currency = "USD"; numberFormatSpecifier2.CurrencyDisplay = "symbol"; - numberFormatSpecifier2.MinimumFractionDigits = 0; + numberFormatSpecifier2.MinimumFractionDigits = 2; + numberFormatSpecifier2.MaximumFractionDigits = 2; numberFormatSpecifier1[0] = numberFormatSpecifier2; this._numberFormatSpecifier1 = numberFormatSpecifier1; } return this._numberFormatSpecifier1; } } + private IgbDataChart chart; + private IgbCategoryYAxis yAxis; + private IgbNumericXAxis xAxis; + private IgbNumberFormatSpecifier[] _numberFormatSpecifier3 = null; + public IgbNumberFormatSpecifier[] NumberFormatSpecifier3 + { + get + { + if (this._numberFormatSpecifier3 == null) + { + var numberFormatSpecifier3 = new IgbNumberFormatSpecifier[1]; + var numberFormatSpecifier4 = new IgbNumberFormatSpecifier(); + numberFormatSpecifier4.Style = "currency"; + numberFormatSpecifier4.Currency = "USD"; + numberFormatSpecifier4.CurrencyDisplay = "symbol"; + numberFormatSpecifier4.MinimumFractionDigits = 0; + numberFormatSpecifier3[0] = numberFormatSpecifier4; + this._numberFormatSpecifier3 = numberFormatSpecifier3; + } + return this._numberFormatSpecifier3; + } + } private IgbBarSeries barSeries1; private IgbBarSeries barSeries2; private IgbDataToolTipLayer tooltips; + private IgbNumberFormatSpecifier[] _numberFormatSpecifier5 = null; + public IgbNumberFormatSpecifier[] NumberFormatSpecifier5 + { + get + { + if (this._numberFormatSpecifier5 == null) + { + var numberFormatSpecifier5 = new IgbNumberFormatSpecifier[1]; + var numberFormatSpecifier6 = new IgbNumberFormatSpecifier(); + numberFormatSpecifier6.Style = "currency"; + numberFormatSpecifier6.Currency = "USD"; + numberFormatSpecifier6.CurrencyDisplay = "symbol"; + numberFormatSpecifier6.MinimumFractionDigits = 2; + numberFormatSpecifier6.MaximumFractionDigits = 2; + numberFormatSpecifier5[0] = numberFormatSpecifier6; + this._numberFormatSpecifier5 = numberFormatSpecifier5; + } + return this._numberFormatSpecifier5; + } + } private HighestGrossingMovies _highestGrossingMovies = null; public HighestGrossingMovies HighestGrossingMovies diff --git a/samples/charts/financial-chart/format-specifiers/App.razor b/samples/charts/financial-chart/format-specifiers/App.razor index e30047ee49..f5f9b17042 100644 --- a/samples/charts/financial-chart/format-specifiers/App.razor +++ b/samples/charts/financial-chart/format-specifiers/App.razor @@ -8,8 +8,8 @@ IncludedColumns="@(new string[] { "Close", "Change", "Value" })" ExcludedColumns="@(new string[] { "High", "Low", "Open", "Volume" })" LabelDisplayMode="DataLegendLabelMode.Hidden" - ValueFormatMode="DataLegendValueMode.Currency" - ValueFormatCulture="en-GB"> + ValueFormatString="{0}" + ValueFormatSpecifiers="NumberFormatSpecifier1"> @@ -19,14 +19,14 @@ @ref="chart" ChartType="FinancialChartType.Candle" DataSource="MultipleStocks" - DataToolTipValueFormatMode="DataLegendValueMode.Currency" - DataToolTipValueFormatCulture="en-GB" - DataToolTipLabelDisplayMode="DataLegendLabelMode.Hidden" + DataToolTipValueFormatString="{0}" + DataToolTipValueFormatSpecifiers="NumberFormatSpecifier3" DataToolTipIncludedColumns="@(new string[] { "Close", "Change", "Value" })" DataToolTipHeaderFormatTime="DataLegendHeaderTimeMode.None" ZoomSliderType="FinancialChartZoomSliderType.None" + YAxisAbbreviateLargeNumbers="false" YAxisLabelFormat="{0}" - YAxisLabelFormatSpecifiers="NumberFormatSpecifier1" + YAxisLabelFormatSpecifiers="NumberFormatSpecifier5" XAxisLabelFormat="{0}" XAxisLabelFormatSpecifiers="DateTimeFormatSpecifier1"> @@ -51,7 +51,6 @@ } private IgbDataLegend legend; - private IgbFinancialChart chart; private IgbNumberFormatSpecifier[] _numberFormatSpecifier1 = null; public IgbNumberFormatSpecifier[] NumberFormatSpecifier1 { @@ -64,13 +63,54 @@ numberFormatSpecifier2.Currency = "EUR"; numberFormatSpecifier2.Style = "currency"; numberFormatSpecifier2.Locale = "en-GB"; - numberFormatSpecifier2.MinimumFractionDigits = 0; + numberFormatSpecifier2.MinimumFractionDigits = 2; + numberFormatSpecifier2.MaximumFractionDigits = 2; numberFormatSpecifier1[0] = numberFormatSpecifier2; this._numberFormatSpecifier1 = numberFormatSpecifier1; } return this._numberFormatSpecifier1; } } + private IgbFinancialChart chart; + private IgbNumberFormatSpecifier[] _numberFormatSpecifier3 = null; + public IgbNumberFormatSpecifier[] NumberFormatSpecifier3 + { + get + { + if (this._numberFormatSpecifier3 == null) + { + var numberFormatSpecifier3 = new IgbNumberFormatSpecifier[1]; + var numberFormatSpecifier4 = new IgbNumberFormatSpecifier(); + numberFormatSpecifier4.Currency = "EUR"; + numberFormatSpecifier4.Style = "currency"; + numberFormatSpecifier4.Locale = "en-GB"; + numberFormatSpecifier4.MinimumFractionDigits = 2; + numberFormatSpecifier4.MaximumFractionDigits = 2; + numberFormatSpecifier3[0] = numberFormatSpecifier4; + this._numberFormatSpecifier3 = numberFormatSpecifier3; + } + return this._numberFormatSpecifier3; + } + } + private IgbNumberFormatSpecifier[] _numberFormatSpecifier5 = null; + public IgbNumberFormatSpecifier[] NumberFormatSpecifier5 + { + get + { + if (this._numberFormatSpecifier5 == null) + { + var numberFormatSpecifier5 = new IgbNumberFormatSpecifier[1]; + var numberFormatSpecifier6 = new IgbNumberFormatSpecifier(); + numberFormatSpecifier6.Currency = "EUR"; + numberFormatSpecifier6.Style = "currency"; + numberFormatSpecifier6.Locale = "en-GB"; + numberFormatSpecifier6.MinimumFractionDigits = 0; + numberFormatSpecifier5[0] = numberFormatSpecifier6; + this._numberFormatSpecifier5 = numberFormatSpecifier5; + } + return this._numberFormatSpecifier5; + } + } private IgbDateTimeFormatSpecifier[] _dateTimeFormatSpecifier1 = null; public IgbDateTimeFormatSpecifier[] DateTimeFormatSpecifier1 { diff --git a/samples/charts/financial-chart/format-specifiers/Program.cs b/samples/charts/financial-chart/format-specifiers/Program.cs index 1e88b1be8c..3d695cbe63 100644 --- a/samples/charts/financial-chart/format-specifiers/Program.cs +++ b/samples/charts/financial-chart/format-specifiers/Program.cs @@ -22,7 +22,9 @@ public static async Task Main(string[] args) builder.Services.AddIgniteUIBlazor( typeof(IgbFinancialChartModule), typeof(IgbDataChartInteractivityModule), - typeof(IgbDataLegendModule) + typeof(IgbDataLegendModule), + typeof(IgbNumberFormatSpecifierModule), + typeof(IgbDateTimeFormatSpecifierModule) ); await builder.Build().RunAsync(); }