Skip to content

Commit 27ce485

Browse files
BornToBeRootBornToBeRoot
committed
WiFi ToolTip Channel added
1 parent e70fa54 commit 27ce485

4 files changed

Lines changed: 76 additions & 44 deletions

File tree

‎Source/NETworkManager/Controls/LvlChartsTooltipWiFi.xaml‎

Lines changed: 44 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,50 @@
11
<UserControl x:Class="NETworkManager.Controls.LvlChartsTooltipWiFi"
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6-
xmlns:wpf="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
6+
xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
7+
xmlns:wpf="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
8+
xmlns:converter="clr-namespace:NETworkManager.Converters"
79
mc:Ignorable="d">
8-
<ItemsControl ItemsSource="{Binding Data.Points}">
9-
<ItemsControl.ItemTemplate>
10-
<DataTemplate DataType="{x:Type wpf:DataPointViewModel}">
11-
<Grid>
12-
<Grid.Style>
13-
<Style TargetType="{x:Type Grid}">
14-
<Style.Triggers>
15-
<DataTrigger Binding="{Binding ChartPoint.Instance}" Value="-1" >
16-
<Setter Property="Visibility" Value="Collapsed" />
17-
</DataTrigger>
18-
</Style.Triggers>
19-
</Style>
20-
</Grid.Style>
21-
<Grid.ColumnDefinitions>
22-
<ColumnDefinition Width="Auto"/>
23-
<ColumnDefinition Width="10" />
24-
<ColumnDefinition Width="Auto" />
25-
<ColumnDefinition Width="10" />
26-
<ColumnDefinition Width="Auto" />
27-
</Grid.ColumnDefinitions>
28-
<Rectangle Grid.Column="0" Stroke="{Binding Series.Stroke}" Fill="{Binding Series.Stroke}" Height="2" Width="14"></Rectangle>
29-
<TextBlock Grid.Column="2" Text="{Binding ChartPoint.Instance, StringFormat={}-{0} dBm}" VerticalAlignment="Center" Foreground="{DynamicResource GrayBrush3}"/>
30-
<TextBlock Grid.Column="4" Text="{Binding Series.Title}" VerticalAlignment="Center" Foreground="{DynamicResource AccentColorBrush}"/>
31-
</Grid>
32-
</DataTemplate>
33-
</ItemsControl.ItemTemplate>
34-
</ItemsControl>
10+
<UserControl.Resources>
11+
<converter:WiFiTooltipChannelConverter x:Key="WiFiTooltipChannelConverter" />
12+
</UserControl.Resources>
13+
<StackPanel>
14+
<TextBlock Style="{StaticResource HeaderTextBlock}">
15+
<TextBlock.Text>
16+
<MultiBinding StringFormat="{}{0} {1}">
17+
<Binding Source="{x:Static localization:Strings.Channel}" Path="." />
18+
<Binding Path="Data" Converter="{StaticResource WiFiTooltipChannelConverter}"/>
19+
</MultiBinding>
20+
</TextBlock.Text>
21+
</TextBlock>
22+
<ItemsControl ItemsSource="{Binding Data.Points}">
23+
<ItemsControl.ItemTemplate>
24+
<DataTemplate DataType="{x:Type wpf:DataPointViewModel}">
25+
<Grid>
26+
<Grid.Style>
27+
<Style TargetType="{x:Type Grid}">
28+
<Style.Triggers>
29+
<DataTrigger Binding="{Binding ChartPoint.Instance}" Value="-1" >
30+
<Setter Property="Visibility" Value="Collapsed" />
31+
</DataTrigger>
32+
</Style.Triggers>
33+
</Style>
34+
</Grid.Style>
35+
<Grid.ColumnDefinitions>
36+
<ColumnDefinition Width="Auto"/>
37+
<ColumnDefinition Width="10" />
38+
<ColumnDefinition Width="Auto" />
39+
<ColumnDefinition Width="10" />
40+
<ColumnDefinition Width="Auto" />
41+
</Grid.ColumnDefinitions>
42+
<Rectangle Grid.Column="0" Stroke="{Binding Series.Stroke}" Fill="{Binding Series.Stroke}" Height="2" Width="14"></Rectangle>
43+
<TextBlock Grid.Column="2" Text="{Binding ChartPoint.Instance, StringFormat={}-{0} dBm}" VerticalAlignment="Center" Foreground="{DynamicResource GrayBrush3}"/>
44+
<TextBlock Grid.Column="4" Text="{Binding Series.Title}" VerticalAlignment="Center" Foreground="{DynamicResource AccentColorBrush}"/>
45+
</Grid>
46+
</DataTemplate>
47+
</ItemsControl.ItemTemplate>
48+
</ItemsControl>
49+
</StackPanel>
3550
</UserControl>

‎Source/NETworkManager/Controls/LvlChartsTooltipWiFi.xaml.cs‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,8 @@
11
using LiveCharts;
22
using LiveCharts.Wpf;
3-
using NETworkManager.ViewModels;
4-
using System;
5-
using System.Collections.Generic;
63
using System.ComponentModel;
7-
using System.Linq;
84
using System.Runtime.CompilerServices;
9-
using System.Text;
10-
using System.Threading.Tasks;
11-
using System.Windows;
12-
using System.Windows.Controls;
13-
using System.Windows.Data;
14-
using System.Windows.Documents;
15-
using System.Windows.Input;
16-
using System.Windows.Media;
17-
using System.Windows.Media.Imaging;
18-
using System.Windows.Navigation;
19-
using System.Windows.Shapes;
5+
206

217
namespace NETworkManager.Controls
228
{

‎Source/NETworkManager/Converters/WiFiTooltipChannelConverter.cs‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
using LiveCharts.Wpf;
2+
using System;
3+
using System.Globalization;
4+
using System.Windows.Data;
5+
6+
namespace NETworkManager.Converters
7+
{
8+
public sealed class WiFiTooltipChannelConverter : IValueConverter
9+
{
10+
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
11+
{
12+
if (value is TooltipData info)
13+
{
14+
double index = info.SharedValue ?? -1;
15+
16+
if (index == -1)
17+
return "-/-";
18+
19+
return info.XFormatter.Invoke(index) as string;
20+
}
21+
22+
return "-/-";
23+
}
24+
25+
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
26+
{
27+
throw new NotImplementedException();
28+
}
29+
}
30+
}

‎Source/NETworkManager/NETworkManager.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@
139139
<Compile Include="Controls\PuTTYControl.xaml.cs">
140140
<DependentUpon>PuTTYControl.xaml</DependentUpon>
141141
</Compile>
142+
<Compile Include="Converters\WiFiTooltipChannelConverter.cs" />
142143
<Compile Include="Converters\BandwidthBytesToSizeConverter.cs" />
143144
<Compile Include="Converters\IntZeroReverseToVisibilityCollapsedConverter.cs" />
144145
<Compile Include="Converters\IntZeroToVisibilityCollapsedConverter.cs" />

0 commit comments

Comments
 (0)