Skip to content

Commit 460485c

Browse files
DhanarajRajendranDhanarajRajendran
committed
Resolved Chart SB sample issues.
1 parent b6bcea0 commit 460485c

File tree

6 files changed

+49
-15
lines changed

6 files changed

+49
-15
lines changed

‎maui/samples/Gallery/Samples/CartesianChart/DataLabel/DataLabelTemplate.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
<chart:SfCartesianChart.Resources>
1818
<local:DoubleToFontIconConverter x:Key="doubleToFontIconConverter"/>
1919

20-
<DataTemplate x:Key="labelTemplate">
20+
<DataTemplate x:Key="labelTemplate" x:DataType="chart:ChartDataLabel">
2121
<Grid ColumnSpacing="2" ColumnDefinitions="Auto,Auto" RowDefinitions="{OnPlatform MacCatalyst='20', iOS='20'}" Margin="{OnPlatform MacCatalyst='0, 0, 0, 10', Android='0, 0, 0, -5'}">
2222
<!--<Image WidthRequest="30" HeightRequest="30" HorizontalOptions="Start" VerticalOptions="Start" Source="{Binding Item.GrossLastYearDelta, Converter={StaticResource doubleToFontIconConverter}, ConverterParameter='image'}"/>-->
23-
<Label Grid.Column="0" FontSize="{OnPlatform MacCatalyst='50', WinUI='Large', Default='40'}" Margin="{OnPlatform WinUI='-4', Default='-4,-4,-10, -4'}" Text="{Binding Item.GrossLastYearDelta, Converter={StaticResource doubleToFontIconConverter}, ConverterParameter='icon'}"
24-
TextColor="{Binding Item.GrossLastYearDelta, Converter={StaticResource doubleToFontIconConverter}, ConverterParameter='image'}"
23+
<Label Grid.Column="0" FontSize="{OnPlatform MacCatalyst='50', WinUI='Large', Default='40'}" Margin="{OnPlatform WinUI='-4', Default='-4,-4,-10, -4'}" Text="{Binding Item, Converter={StaticResource doubleToFontIconConverter}, ConverterParameter='icon'}"
24+
TextColor="{Binding Item, Converter={StaticResource doubleToFontIconConverter}, ConverterParameter='image'}"
2525
FontFamily="MauiSampleFontIcon" VerticalOptions="Center">
2626
</Label>
27-
<Label Grid.Column="1" Text="{Binding Item.GrossLastYearDelta, StringFormat='{0:0.###}%'}" FontSize="{OnPlatform Default='14', MacCatalyst='16'}"
27+
<Label Grid.Column="1" Text="{Binding Item,Converter={StaticResource doubleToFontIconConverter},ConverterParameter='GrossLastYearDelta', StringFormat='{0:0.###}%'}" FontSize="{OnPlatform Default='14', MacCatalyst='16'}"
2828
VerticalTextAlignment="Center" HorizontalOptions="Start" VerticalOptions="Center" >
2929
</Label>
3030
</Grid>

‎maui/samples/Gallery/Samples/CartesianChart/DataLabel/DataLabelTemplate.xaml.cs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,19 @@ public class DoubleToFontIconConverter : IValueConverter
3636
{
3737
public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
3838
{
39-
if (value is not double || parameter is not string para)
40-
{
39+
if (parameter is not string para)
4140
return null;
42-
}
4341

44-
var doubleValue = (double)value;
42+
double doubleValue = 0;
43+
44+
if (value is ChartDataModel model)
45+
{
46+
if (para == "GrossLastYearDelta")
47+
{
48+
return model.GrossLastYearDelta;
49+
}
50+
doubleValue = (double)model.GrossLastYearDelta;
51+
}
4552

4653
string text = "\ue704";
4754
Color color = Colors.Red;

‎maui/samples/Gallery/Samples/CircularChart/Interaction/Tooltip.xaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818
<chart:SfCircularChart x:Name="Chart" HorizontalOptions="Fill" VerticalOptions="Fill">
1919
<chart:SfCircularChart.Resources>
2020
<ResourceDictionary>
21+
<local:TooltipValueConverter x:Key="valueConverter"/>
2122
<DataTemplate x:Key="template1">
2223
<StackLayout Padding="0">
2324
<StackLayout Orientation="Horizontal" VerticalOptions="Fill" Spacing="0" Padding="0" Margin="0">
24-
<Label Text="{Binding Item.Name}" VerticalTextAlignment="Center" HorizontalOptions="Start" TextColor="{AppThemeBinding Default={StaticResource ContentBackground}}" FontAttributes="Bold" FontFamily="Helvetica" FontSize="14" Margin="2,0,2,0" />
25-
<Label Text="{Binding Item.Value,StringFormat=' : {0}%'}" VerticalTextAlignment="Center" HorizontalOptions="End" TextColor="{AppThemeBinding Default={StaticResource ContentBackground}}" FontAttributes="Bold" FontFamily="Helvetica" Margin="0,0,2,0" FontSize="14" />
25+
<Label Text="{Binding Item, Converter={StaticResource valueConverter}, ConverterParameter='Name'}" VerticalTextAlignment="Center" HorizontalOptions="Start" TextColor="{AppThemeBinding Default={StaticResource ContentBackground}}" FontAttributes="Bold" FontFamily="Helvetica" FontSize="14" Margin="2,0,2,0" />
26+
<Label Text="{Binding Item, Converter={StaticResource valueConverter}, ConverterParameter='Value',StringFormat=' : {0}%'}" VerticalTextAlignment="Center" HorizontalOptions="End" TextColor="{AppThemeBinding Default={StaticResource ContentBackground}}" FontAttributes="Bold" FontFamily="Helvetica" Margin="0,0,2,0" FontSize="14" />
2627
</StackLayout>
2728
</StackLayout>
2829
</DataTemplate>

‎maui/samples/Gallery/Samples/CircularChart/Interaction/Tooltip.xaml.cs

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
namespace Syncfusion.Maui.ControlsGallery.CircularChart.SfCircularChart
1+
using System.Globalization;
2+
3+
namespace Syncfusion.Maui.ControlsGallery.CircularChart.SfCircularChart
24
{
35
public partial class Tooltip : SampleView
46
{
@@ -13,4 +15,27 @@ public override void OnDisappearing()
1315
Chart.Handler?.DisconnectHandler();
1416
}
1517
}
18+
19+
public class TooltipValueConverter : IValueConverter
20+
{
21+
public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
22+
{
23+
if (value is ChartDataModel model)
24+
{
25+
switch (parameter?.ToString())
26+
{
27+
case "Name":
28+
return model.Name;
29+
case "Value":
30+
return model.Value;
31+
}
32+
}
33+
34+
return value;
35+
}
36+
public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
37+
{
38+
return value;
39+
}
40+
}
1641
}

‎maui/samples/Gallery/Samples/CircularChart/Pie/GroupToPieChart.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
<ResourceDictionary>
2121
<local:ItemsSourceConverter x:Key="valueConvert"/>
2222
<local:StringFormatConverter x:Key="StingConvert"/>
23-
<DataTemplate x:Key="tooltipTemplate">
23+
<DataTemplate x:Key="tooltipTemplate" x:DataType="chart:TooltipInfo">
2424
<VerticalStackLayout Spacing="2" BindableLayout.ItemsSource="{Binding Item, Converter={StaticResource valueConvert}}">
2525
<BindableLayout.ItemTemplate>
26-
<DataTemplate>
26+
<DataTemplate x:DataType="local:ChartDataModel">
2727
<Grid ColumnSpacing="10" ColumnDefinitions="*,Auto">
2828
<Label Text="{Binding Name}"
2929
TextColor="{AppThemeBinding Default={StaticResource ContentBackground}}" Grid.Column="0"

‎maui/samples/Gallery/Samples/CircularChart/Pie/SmartDataLabels.xaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@
2121
<chart:SfCircularChart x:Name="Chart" VerticalOptions="FillAndExpand">
2222

2323
<chart:SfCircularChart.Resources>
24+
<local:TooltipValueConverter x:Key="valueConverter"/>
2425
<DataTemplate x:Key="dataLabelTemplate">
2526
<HorizontalStackLayout>
26-
<Label Text="{Binding Item.Name}" VerticalOptions="Center" FontSize = "13"
27+
<Label Text="{Binding Item, Converter={StaticResource valueConverter}, ConverterParameter='Name'}" VerticalOptions="Center" FontSize = "13"
2728
LineBreakMode="{OnPlatform Android='TailTruncation', iOS='TailTruncation'}"
2829
MaximumWidthRequest="{OnPlatform Android='35', iOS='35'}" HorizontalTextAlignment="End"/>
2930
<Label Text=":" VerticalOptions="Center" FontSize = "13" HorizontalTextAlignment="Center"/>
30-
<Label Text="{Binding Item.Value, StringFormat=' {0}'}" VerticalOptions="Center" FontSize="13" HorizontalTextAlignment="Center"/>
31+
<Label Text="{Binding Item, Converter={StaticResource valueConverter}, ConverterParameter='Value', StringFormat=' {0}'}" VerticalOptions="Center" FontSize="13" HorizontalTextAlignment="Center"/>
3132
</HorizontalStackLayout>
3233
</DataTemplate>
3334
</chart:SfCircularChart.Resources>

0 commit comments

Comments
 (0)