Skip to content

Commit f4cfc9d

Browse files
BornToBeRootBornToBeRoot
committed
Feature: Ping Monitor - Zoom & drag chart
1 parent a61235c commit f4cfc9d

13 files changed

Lines changed: 377 additions & 109 deletions

File tree

‎Source/NETworkManager.Localization/Resources/Strings.Designer.cs‎

Lines changed: 20 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source/NETworkManager.Localization/Resources/Strings.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -735,6 +735,9 @@
735735
<data name="CapsLockIsEnabled" xml:space="preserve">
736736
<value>Caps lock is enabled!</value>
737737
</data>
738+
<data name="ChartTimeInSeconds" xml:space="preserve">
739+
<value>Chart time (seconds)</value>
740+
</data>
738741
<data name="CheckForUpdatesAtStartup" xml:space="preserve">
739742
<value>Check for updates at startup</value>
740743
</data>
@@ -1513,6 +1516,9 @@ Profile files are not affected!</value>
15131516
<data name="Lime" xml:space="preserve">
15141517
<value>Lime</value>
15151518
</data>
1519+
<data name="Live" xml:space="preserve">
1520+
<value>Live</value>
1521+
</data>
15161522
<data name="Magenta" xml:space="preserve">
15171523
<value>Magenta</value>
15181524
</data>

‎Source/NETworkManager.Settings/GlobalStaticConfiguration.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ public static class GlobalStaticConfiguration
143143
public static int PingMonitor_TTL => 64;
144144
public static int PingMonitor_WaitTime => 1000;
145145
public static bool PingMonitor_ExpandHostView => false;
146+
public static int PingMonitor_ChartTime => 120;
146147
public static ExportFileType PingMonitor_ExportFileType => ExportFileType.Csv;
147148

148149
// Application: Traceroute

‎Source/NETworkManager.Settings/SettingsInfo.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1508,6 +1508,19 @@ public bool PingMonitor_ExpandHostView
15081508
}
15091509
} = GlobalStaticConfiguration.PingMonitor_ExpandHostView;
15101510

1511+
public int PingMonitor_ChartTime
1512+
{
1513+
get;
1514+
set
1515+
{
1516+
if (value == field)
1517+
return;
1518+
1519+
field = value;
1520+
OnPropertyChanged();
1521+
}
1522+
} = GlobalStaticConfiguration.PingMonitor_ChartTime;
1523+
15111524
public string PingMonitor_ExportFilePath
15121525
{
15131526
get;

‎Source/NETworkManager/Resources/Styles/ExpanderStyles.xaml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,74 @@
7575
Value="{DynamicResource ResourceKey=ExpanderDownHeader}" />
7676
</Style>
7777

78+
<!-- Header style for bordered expanders (e.g. the ping monitor host): adds a small
79+
left margin so the chevron does not sit flush against the visible border. -->
80+
<Style x:Key="PingMonitorExpanderDownHeader"
81+
BasedOn="{StaticResource ResourceKey=MahApps.Styles.ToggleButton.ExpanderHeader.Down}"
82+
TargetType="{x:Type TypeName=ToggleButton}">
83+
<Setter Property="Template">
84+
<Setter.Value>
85+
<ControlTemplate TargetType="{x:Type TypeName=ToggleButton}">
86+
<Border Padding="{TemplateBinding Property=Padding}"
87+
Background="{TemplateBinding Property=Background}"
88+
BorderBrush="{TemplateBinding Property=BorderBrush}"
89+
BorderThickness="{TemplateBinding Property=BorderThickness}">
90+
<Grid Background="Transparent" SnapsToDevicePixels="False">
91+
<Grid.ColumnDefinitions>
92+
<ColumnDefinition Width="Auto" />
93+
<ColumnDefinition Width="*" />
94+
</Grid.ColumnDefinitions>
95+
<Rectangle Grid.Column="0" Grid.Row="0"
96+
x:Name="Chevron"
97+
Width="16" Height="16"
98+
Margin="10,0,0,0"
99+
Fill="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}"
100+
VerticalAlignment="Center">
101+
<Rectangle.OpacityMask>
102+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ChevronUp}" />
103+
</Rectangle.OpacityMask>
104+
</Rectangle>
105+
<mahAppsControls:ContentControlEx Grid.Column="1"
106+
Margin="10,0,0,0"
107+
HorizontalAlignment="Stretch"
108+
Padding="{TemplateBinding Property=Padding}"
109+
HorizontalContentAlignment="{TemplateBinding Property=HorizontalContentAlignment}"
110+
VerticalContentAlignment="{TemplateBinding Property=VerticalContentAlignment}"
111+
Content="{TemplateBinding Property=Content}"
112+
ContentCharacterCasing="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=(mahAppsControls:ControlsHelper.ContentCharacterCasing)}"
113+
ContentStringFormat="{TemplateBinding Property=ContentStringFormat}"
114+
ContentTemplate="{TemplateBinding Property=ContentTemplate}"
115+
ContentTemplateSelector="{TemplateBinding Property=ContentTemplateSelector}"
116+
RecognizesAccessKey="True"
117+
SnapsToDevicePixels="{TemplateBinding Property=SnapsToDevicePixels}" />
118+
</Grid>
119+
</Border>
120+
<ControlTemplate.Triggers>
121+
<Trigger Property="IsChecked" Value="True">
122+
<Setter TargetName="Chevron" Property="OpacityMask">
123+
<Setter.Value>
124+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ChevronDown}" />
125+
</Setter.Value>
126+
</Setter>
127+
</Trigger>
128+
<Trigger Property="IsMouseOver" Value="True">
129+
<Setter TargetName="Chevron" Property="Fill"
130+
Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray5}" />
131+
</Trigger>
132+
</ControlTemplate.Triggers>
133+
</ControlTemplate>
134+
</Setter.Value>
135+
</Setter>
136+
</Style>
137+
138+
<!-- Expander variant for the ping monitor host (bordered) using the indented header. -->
139+
<Style x:Key="PingMonitorExpander"
140+
TargetType="{x:Type TypeName=Expander}"
141+
BasedOn="{StaticResource ResourceKey=DefaultExpander}">
142+
<Setter Property="mahAppsControls:ExpanderHelper.HeaderDownStyle"
143+
Value="{DynamicResource ResourceKey=PingMonitorExpanderDownHeader}" />
144+
</Style>
145+
78146
<Style x:Key="ProfileExpanderOpen"
79147
BasedOn="{StaticResource ResourceKey=MahApps.Styles.ToggleButton.ExpanderHeader.Down}"
80148
TargetType="{x:Type TypeName=ToggleButton}">

‎Source/NETworkManager/ViewModels/PingMonitorHostViewModel.cs‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -144,22 +144,6 @@ public ObservableCollection<PingMonitorView> Hosts
144144
/// </summary>
145145
public ICollectionView HostsView { get; }
146146

147-
/// <summary>
148-
/// Gets or sets the selected host.
149-
/// </summary>
150-
public PingMonitorView SelectedHost
151-
{
152-
get;
153-
set
154-
{
155-
if (value == field)
156-
return;
157-
158-
field = value;
159-
OnPropertyChanged();
160-
}
161-
}
162-
163147
#region Profiles
164148

165149
/// <summary>
@@ -461,16 +445,6 @@ private void CloseGroupAction(object group)
461445
RemoveGroup(group.ToString());
462446
}
463447

464-
/// <summary>
465-
/// Gets the command to export the selected host's data.
466-
/// </summary>
467-
public ICommand ExportCommand => new RelayCommand(_ => ExportAction());
468-
469-
private void ExportAction()
470-
{
471-
SelectedHost?.Export();
472-
}
473-
474448
/// <summary>
475449
/// Gets the command to add a new profile.
476450
/// </summary>

‎Source/NETworkManager/ViewModels/PingMonitorSettingsViewModel.cs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,25 @@ public bool ExpandHostView
125125
}
126126
}
127127

128+
/// <summary>
129+
/// Gets or sets the chart time window in seconds.
130+
/// </summary>
131+
public int ChartTime
132+
{
133+
get;
134+
set
135+
{
136+
if (value == field)
137+
return;
138+
139+
if (!_isLoading)
140+
SettingsManager.Current.PingMonitor_ChartTime = value;
141+
142+
field = value;
143+
OnPropertyChanged();
144+
}
145+
}
146+
128147
#endregion
129148

130149
#region Contructor, load settings
@@ -149,6 +168,7 @@ private void LoadSettings()
149168
DontFragment = SettingsManager.Current.PingMonitor_DontFragment;
150169
WaitTime = SettingsManager.Current.PingMonitor_WaitTime;
151170
ExpandHostView = SettingsManager.Current.PingMonitor_ExpandHostView;
171+
ChartTime = SettingsManager.Current.PingMonitor_ChartTime;
152172
}
153173

154174
#endregion

0 commit comments

Comments
 (0)