diff --git a/Correlator/UserControlPage/FilterUserControl.xaml b/Correlator/UserControlPage/FilterUserControl.xaml index ef3b2d3..ab7d100 100644 --- a/Correlator/UserControlPage/FilterUserControl.xaml +++ b/Correlator/UserControlPage/FilterUserControl.xaml @@ -175,7 +175,6 @@ - /// X轴起始频率 - /// - private double _minValue; + private int _minCurrentValue = 20; - public double MinValue + public int MinCurrentValue { - get => _minValue; + get => _minCurrentValue; set { - _minValue = value; - RaisePropertyChanged(() => MinValue); + _minCurrentValue = value; + RaisePropertyChanged(() => MinCurrentValue); } } - /// - /// X轴最大频率 - /// - private double _maxValue; + private int _maxCurrentValue = 20; - public double MaxValue + public int MaxCurrentValue { - get => _maxValue; + get => _maxCurrentValue; set { - _maxValue = value; - RaisePropertyChanged(() => MaxValue); - } - } - - /// - /// 高值 - /// - private double _highValue; - - public double HighValue - { - get => _highValue; - set - { - _highValue = value; - RaisePropertyChanged(() => HighValue); - } - } - - /// - /// 低值 - /// - private double _lowValue; - - public double LowValue - { - get => _lowValue; - set - { - _lowValue = value; - RaisePropertyChanged(() => LowValue); + _maxCurrentValue = value; + RaisePropertyChanged(() => MaxCurrentValue); } } @@ -104,40 +67,6 @@ } } - - /// - /// 红色直线显示状态 - /// - private string _lineRedVisibility = "Hidden"; - - public string LineRedVisibility - { - get => _lineRedVisibility; - set - { - _lineRedVisibility = value; - RaisePropertyChanged(() => LineRedVisibility); - } - } - - /// - /// 蓝色直线显示状态 - /// - private string _lineBlueVisibility = "Hidden"; - - public string LineBlueVisibility - { - get => _lineBlueVisibility; - set - { - _lineBlueVisibility = value; - RaisePropertyChanged(() => LineBlueVisibility); - } - } - - public IChartValues ColumnValuesA { get; set; } = new ChartValues(); - public IChartValues ColumnValuesB { get; set; } = new ChartValues(); - #endregion public RelayCommand GoBackCommand { get; set; } @@ -153,35 +82,6 @@ GoBackCommand = new RelayCommand(() => { Messenger.Default.Send("", MessengerToken.RemoveNoise); }); StartCollectDataCommand = new RelayCommand(StartCollectData); - //默认值 - HighValue = 600; - LowValue = 100; - MaxValue = 3000; - MinValue = 20; - - var random = new Random(); - for (var i = 0; i < 300; i++) - { - var p = new ObservablePoint - { - X = i * 10, - Y = random.Next(0, 100) - }; - - ColumnValuesA.Add(p); - } - - for (var i = 0; i < 300; i++) - { - var p = new ObservablePoint - { - X = i * 10, - Y = random.Next(0, 100) - }; - - ColumnValuesB.Add(p); - } - //每秒查询信号状态 _statusTimer.Tick += delegate { @@ -246,9 +146,6 @@ { FlowStatus.IsRedCollectComplete = false; FlowStatus.IsBlueCollectComplete = false; - - LineRedVisibility = "Visible"; - LineBlueVisibility = "Visible"; } } }