diff --git a/Correlator/UserControlPage/NoiseUserControl.xaml b/Correlator/UserControlPage/NoiseUserControl.xaml index ac31b48..63daa5f 100644 --- a/Correlator/UserControlPage/NoiseUserControl.xaml +++ b/Correlator/UserControlPage/NoiseUserControl.xaml @@ -4,7 +4,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:converter="clr-namespace:Correlator.Converter" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf" + xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" d:DesignHeight="768" d:DesignWidth="1366" @@ -12,7 +12,6 @@ mc:Ignorable="d"> - @@ -91,15 +90,8 @@ BorderThickness="0" FontSize="22" Foreground="#545454" - IsEnabled="False"> - - - - - - - - + IsEnabled="False" + Text="{Binding Path=Value, ElementName=LowPreviewSlider, StringFormat=0}" /> - - - - - - - - + IsEnabled="False" + Text="{Binding Path=Value, ElementName=HighPreviewSlider, StringFormat=0}" /> - - - - - - - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + + Text="{Binding Path=Maximum, ElementName=LowPreviewSlider, StringFormat=0Hz}" /> @@ -321,163 +225,76 @@ - - - - - - - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + HorizontalAlignment="Center" + Maximum="3000" + Minimum="20" + Orientation="Horizontal" + Value="{Binding MaxCurrentValue}"> + + + - + + Text="{Binding Path=Maximum, ElementName=HighPreviewSlider, StringFormat=0Hz}" />