diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index 437109c..5439deb 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -19,11 +19,12 @@ + diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index 437109c..5439deb 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -19,11 +19,12 @@ + diff --git a/Correlator/Dialog/AlertControlDialog.xaml b/Correlator/Dialog/AlertControlDialog.xaml index b10e2ba..8acf006 100644 --- a/Correlator/Dialog/AlertControlDialog.xaml +++ b/Correlator/Dialog/AlertControlDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index 437109c..5439deb 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -19,11 +19,12 @@ + diff --git a/Correlator/Dialog/AlertControlDialog.xaml b/Correlator/Dialog/AlertControlDialog.xaml index b10e2ba..8acf006 100644 --- a/Correlator/Dialog/AlertControlDialog.xaml +++ b/Correlator/Dialog/AlertControlDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/AlertMessageDialog.xaml b/Correlator/Dialog/AlertMessageDialog.xaml index f08b168..cde5250 100644 --- a/Correlator/Dialog/AlertMessageDialog.xaml +++ b/Correlator/Dialog/AlertMessageDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index 437109c..5439deb 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -19,11 +19,12 @@ + diff --git a/Correlator/Dialog/AlertControlDialog.xaml b/Correlator/Dialog/AlertControlDialog.xaml index b10e2ba..8acf006 100644 --- a/Correlator/Dialog/AlertControlDialog.xaml +++ b/Correlator/Dialog/AlertControlDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/AlertMessageDialog.xaml b/Correlator/Dialog/AlertMessageDialog.xaml index f08b168..cde5250 100644 --- a/Correlator/Dialog/AlertMessageDialog.xaml +++ b/Correlator/Dialog/AlertMessageDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index add4074..38df797 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -20,6 +20,7 @@ + @@ -28,7 +29,7 @@ diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index 437109c..5439deb 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -19,11 +19,12 @@ + diff --git a/Correlator/Dialog/AlertControlDialog.xaml b/Correlator/Dialog/AlertControlDialog.xaml index b10e2ba..8acf006 100644 --- a/Correlator/Dialog/AlertControlDialog.xaml +++ b/Correlator/Dialog/AlertControlDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/AlertMessageDialog.xaml b/Correlator/Dialog/AlertMessageDialog.xaml index f08b168..cde5250 100644 --- a/Correlator/Dialog/AlertMessageDialog.xaml +++ b/Correlator/Dialog/AlertMessageDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index add4074..38df797 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -20,6 +20,7 @@ + @@ -28,7 +29,7 @@ diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs index 91441a2..72fd7b6 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml.cs +++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs @@ -181,12 +181,6 @@ ); } ); - // var boxResult = MessageBox.Show("数据未校验结束，确定要退出吗？", "温馨提示", MessageBoxButton.OKCancel, - // MessageBoxImage.Error); - // if (boxResult == MessageBoxResult.OK) - // { - // _eventAggregator.GetEvent().Publish(new DialogResult(ButtonResult.Abort)); - // } } else { @@ -212,13 +206,6 @@ } } ); - - // var result = MessageBox.Show("请确认数据是否已接收完整", "温馨提示", MessageBoxButton.YesNo, - // MessageBoxImage.Warning); - // if (result == MessageBoxResult.Yes) - // { - // RedSensorStepBar.Next(); - // } } else { @@ -296,13 +283,6 @@ } } ); - - // var result = MessageBox.Show("请确认数据是否已接收完整", "温馨提示", MessageBoxButton.YesNo, - // MessageBoxImage.Warning); - // if (result == MessageBoxResult.Yes) - // { - // BlueSensorStepBar.Next(); - // } } else { diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index 437109c..5439deb 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -19,11 +19,12 @@ + diff --git a/Correlator/Dialog/AlertControlDialog.xaml b/Correlator/Dialog/AlertControlDialog.xaml index b10e2ba..8acf006 100644 --- a/Correlator/Dialog/AlertControlDialog.xaml +++ b/Correlator/Dialog/AlertControlDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/AlertMessageDialog.xaml b/Correlator/Dialog/AlertMessageDialog.xaml index f08b168..cde5250 100644 --- a/Correlator/Dialog/AlertMessageDialog.xaml +++ b/Correlator/Dialog/AlertMessageDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index add4074..38df797 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -20,6 +20,7 @@ + @@ -28,7 +29,7 @@ diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs index 91441a2..72fd7b6 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml.cs +++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs @@ -181,12 +181,6 @@ ); } ); - // var boxResult = MessageBox.Show("数据未校验结束，确定要退出吗？", "温馨提示", MessageBoxButton.OKCancel, - // MessageBoxImage.Error); - // if (boxResult == MessageBoxResult.OK) - // { - // _eventAggregator.GetEvent().Publish(new DialogResult(ButtonResult.Abort)); - // } } else { @@ -212,13 +206,6 @@ } } ); - - // var result = MessageBox.Show("请确认数据是否已接收完整", "温馨提示", MessageBoxButton.YesNo, - // MessageBoxImage.Warning); - // if (result == MessageBoxResult.Yes) - // { - // RedSensorStepBar.Next(); - // } } else { @@ -296,13 +283,6 @@ } } ); - - // var result = MessageBox.Show("请确认数据是否已接收完整", "温馨提示", MessageBoxButton.YesNo, - // MessageBoxImage.Warning); - // if (result == MessageBoxResult.Yes) - // { - // BlueSensorStepBar.Next(); - // } } else { diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml b/Correlator/Dialog/EditSoundSpeedDialog.xaml index e3c4224..3bdcfbc 100644 --- a/Correlator/Dialog/EditSoundSpeedDialog.xaml +++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml @@ -19,11 +19,12 @@ + diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index 437109c..5439deb 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -19,11 +19,12 @@ + diff --git a/Correlator/Dialog/AlertControlDialog.xaml b/Correlator/Dialog/AlertControlDialog.xaml index b10e2ba..8acf006 100644 --- a/Correlator/Dialog/AlertControlDialog.xaml +++ b/Correlator/Dialog/AlertControlDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/AlertMessageDialog.xaml b/Correlator/Dialog/AlertMessageDialog.xaml index f08b168..cde5250 100644 --- a/Correlator/Dialog/AlertMessageDialog.xaml +++ b/Correlator/Dialog/AlertMessageDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index add4074..38df797 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -20,6 +20,7 @@ + @@ -28,7 +29,7 @@ diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs index 91441a2..72fd7b6 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml.cs +++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs @@ -181,12 +181,6 @@ ); } ); - // var boxResult = MessageBox.Show("数据未校验结束，确定要退出吗？", "温馨提示", MessageBoxButton.OKCancel, - // MessageBoxImage.Error); - // if (boxResult == MessageBoxResult.OK) - // { - // _eventAggregator.GetEvent().Publish(new DialogResult(ButtonResult.Abort)); - // } } else { @@ -212,13 +206,6 @@ } } ); - - // var result = MessageBox.Show("请确认数据是否已接收完整", "温馨提示", MessageBoxButton.YesNo, - // MessageBoxImage.Warning); - // if (result == MessageBoxResult.Yes) - // { - // RedSensorStepBar.Next(); - // } } else { @@ -296,13 +283,6 @@ } } ); - - // var result = MessageBox.Show("请确认数据是否已接收完整", "温馨提示", MessageBoxButton.YesNo, - // MessageBoxImage.Warning); - // if (result == MessageBoxResult.Yes) - // { - // BlueSensorStepBar.Next(); - // } } else { diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml b/Correlator/Dialog/EditSoundSpeedDialog.xaml index e3c4224..3bdcfbc 100644 --- a/Correlator/Dialog/EditSoundSpeedDialog.xaml +++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml @@ -19,11 +19,12 @@ + diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml index 99e7bf1..6f3274b 100644 --- a/Correlator/Dialog/ImportResponseDialog.xaml +++ b/Correlator/Dialog/ImportResponseDialog.xaml @@ -20,11 +20,12 @@ + diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index 437109c..5439deb 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -19,11 +19,12 @@ + diff --git a/Correlator/Dialog/AlertControlDialog.xaml b/Correlator/Dialog/AlertControlDialog.xaml index b10e2ba..8acf006 100644 --- a/Correlator/Dialog/AlertControlDialog.xaml +++ b/Correlator/Dialog/AlertControlDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/AlertMessageDialog.xaml b/Correlator/Dialog/AlertMessageDialog.xaml index f08b168..cde5250 100644 --- a/Correlator/Dialog/AlertMessageDialog.xaml +++ b/Correlator/Dialog/AlertMessageDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index add4074..38df797 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -20,6 +20,7 @@ + @@ -28,7 +29,7 @@ diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs index 91441a2..72fd7b6 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml.cs +++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs @@ -181,12 +181,6 @@ ); } ); - // var boxResult = MessageBox.Show("数据未校验结束，确定要退出吗？", "温馨提示", MessageBoxButton.OKCancel, - // MessageBoxImage.Error); - // if (boxResult == MessageBoxResult.OK) - // { - // _eventAggregator.GetEvent().Publish(new DialogResult(ButtonResult.Abort)); - // } } else { @@ -212,13 +206,6 @@ } } ); - - // var result = MessageBox.Show("请确认数据是否已接收完整", "温馨提示", MessageBoxButton.YesNo, - // MessageBoxImage.Warning); - // if (result == MessageBoxResult.Yes) - // { - // RedSensorStepBar.Next(); - // } } else { @@ -296,13 +283,6 @@ } } ); - - // var result = MessageBox.Show("请确认数据是否已接收完整", "温馨提示", MessageBoxButton.YesNo, - // MessageBoxImage.Warning); - // if (result == MessageBoxResult.Yes) - // { - // BlueSensorStepBar.Next(); - // } } else { diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml b/Correlator/Dialog/EditSoundSpeedDialog.xaml index e3c4224..3bdcfbc 100644 --- a/Correlator/Dialog/EditSoundSpeedDialog.xaml +++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml @@ -19,11 +19,12 @@ + diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml index 99e7bf1..6f3274b 100644 --- a/Correlator/Dialog/ImportResponseDialog.xaml +++ b/Correlator/Dialog/ImportResponseDialog.xaml @@ -20,11 +20,12 @@ + diff --git a/Correlator/Dialog/SimplyAuditionDialog.xaml b/Correlator/Dialog/SimplyAuditionDialog.xaml index 836c2cc..5a5096e 100644 --- a/Correlator/Dialog/SimplyAuditionDialog.xaml +++ b/Correlator/Dialog/SimplyAuditionDialog.xaml @@ -22,6 +22,7 @@ + @@ -31,7 +32,7 @@ @@ -186,7 +187,7 @@ - + + diff --git a/Correlator/Dialog/AlertControlDialog.xaml b/Correlator/Dialog/AlertControlDialog.xaml index b10e2ba..8acf006 100644 --- a/Correlator/Dialog/AlertControlDialog.xaml +++ b/Correlator/Dialog/AlertControlDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/AlertMessageDialog.xaml b/Correlator/Dialog/AlertMessageDialog.xaml index f08b168..cde5250 100644 --- a/Correlator/Dialog/AlertMessageDialog.xaml +++ b/Correlator/Dialog/AlertMessageDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index add4074..38df797 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -20,6 +20,7 @@ + @@ -28,7 +29,7 @@ diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs index 91441a2..72fd7b6 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml.cs +++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs @@ -181,12 +181,6 @@ ); } ); - // var boxResult = MessageBox.Show("数据未校验结束，确定要退出吗？", "温馨提示", MessageBoxButton.OKCancel, - // MessageBoxImage.Error); - // if (boxResult == MessageBoxResult.OK) - // { - // _eventAggregator.GetEvent().Publish(new DialogResult(ButtonResult.Abort)); - // } } else { @@ -212,13 +206,6 @@ } } ); - - // var result = MessageBox.Show("请确认数据是否已接收完整", "温馨提示", MessageBoxButton.YesNo, - // MessageBoxImage.Warning); - // if (result == MessageBoxResult.Yes) - // { - // RedSensorStepBar.Next(); - // } } else { @@ -296,13 +283,6 @@ } } ); - - // var result = MessageBox.Show("请确认数据是否已接收完整", "温馨提示", MessageBoxButton.YesNo, - // MessageBoxImage.Warning); - // if (result == MessageBoxResult.Yes) - // { - // BlueSensorStepBar.Next(); - // } } else { diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml b/Correlator/Dialog/EditSoundSpeedDialog.xaml index e3c4224..3bdcfbc 100644 --- a/Correlator/Dialog/EditSoundSpeedDialog.xaml +++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml @@ -19,11 +19,12 @@ + diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml index 99e7bf1..6f3274b 100644 --- a/Correlator/Dialog/ImportResponseDialog.xaml +++ b/Correlator/Dialog/ImportResponseDialog.xaml @@ -20,11 +20,12 @@ + diff --git a/Correlator/Dialog/SimplyAuditionDialog.xaml b/Correlator/Dialog/SimplyAuditionDialog.xaml index 836c2cc..5a5096e 100644 --- a/Correlator/Dialog/SimplyAuditionDialog.xaml +++ b/Correlator/Dialog/SimplyAuditionDialog.xaml @@ -22,6 +22,7 @@ + @@ -31,7 +32,7 @@ @@ -186,7 +187,7 @@ - + + diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index 437109c..5439deb 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -19,11 +19,12 @@ + diff --git a/Correlator/Dialog/AlertControlDialog.xaml b/Correlator/Dialog/AlertControlDialog.xaml index b10e2ba..8acf006 100644 --- a/Correlator/Dialog/AlertControlDialog.xaml +++ b/Correlator/Dialog/AlertControlDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/AlertMessageDialog.xaml b/Correlator/Dialog/AlertMessageDialog.xaml index f08b168..cde5250 100644 --- a/Correlator/Dialog/AlertMessageDialog.xaml +++ b/Correlator/Dialog/AlertMessageDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index add4074..38df797 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -20,6 +20,7 @@ + @@ -28,7 +29,7 @@ diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs index 91441a2..72fd7b6 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml.cs +++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs @@ -181,12 +181,6 @@ ); } ); - // var boxResult = MessageBox.Show("数据未校验结束，确定要退出吗？", "温馨提示", MessageBoxButton.OKCancel, - // MessageBoxImage.Error); - // if (boxResult == MessageBoxResult.OK) - // { - // _eventAggregator.GetEvent().Publish(new DialogResult(ButtonResult.Abort)); - // } } else { @@ -212,13 +206,6 @@ } } ); - - // var result = MessageBox.Show("请确认数据是否已接收完整", "温馨提示", MessageBoxButton.YesNo, - // MessageBoxImage.Warning); - // if (result == MessageBoxResult.Yes) - // { - // RedSensorStepBar.Next(); - // } } else { @@ -296,13 +283,6 @@ } } ); - - // var result = MessageBox.Show("请确认数据是否已接收完整", "温馨提示", MessageBoxButton.YesNo, - // MessageBoxImage.Warning); - // if (result == MessageBoxResult.Yes) - // { - // BlueSensorStepBar.Next(); - // } } else { diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml b/Correlator/Dialog/EditSoundSpeedDialog.xaml index e3c4224..3bdcfbc 100644 --- a/Correlator/Dialog/EditSoundSpeedDialog.xaml +++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml @@ -19,11 +19,12 @@ + diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml index 99e7bf1..6f3274b 100644 --- a/Correlator/Dialog/ImportResponseDialog.xaml +++ b/Correlator/Dialog/ImportResponseDialog.xaml @@ -20,11 +20,12 @@ + diff --git a/Correlator/Dialog/SimplyAuditionDialog.xaml b/Correlator/Dialog/SimplyAuditionDialog.xaml index 836c2cc..5a5096e 100644 --- a/Correlator/Dialog/SimplyAuditionDialog.xaml +++ b/Correlator/Dialog/SimplyAuditionDialog.xaml @@ -22,6 +22,7 @@ + @@ -31,7 +32,7 @@ @@ -186,7 +187,7 @@ - + + diff --git a/Correlator/ViewModels/AudioFileViewModel.cs b/Correlator/ViewModels/AudioFileViewModel.cs index 5c8b044..3cd57b9 100644 --- a/Correlator/ViewModels/AudioFileViewModel.cs +++ b/Correlator/ViewModels/AudioFileViewModel.cs @@ -195,8 +195,6 @@ }, delegate { } ); - - // MessageBox.Show("音频文件损坏，无法播放", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); } } }); diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index 437109c..5439deb 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -19,11 +19,12 @@ + diff --git a/Correlator/Dialog/AlertControlDialog.xaml b/Correlator/Dialog/AlertControlDialog.xaml index b10e2ba..8acf006 100644 --- a/Correlator/Dialog/AlertControlDialog.xaml +++ b/Correlator/Dialog/AlertControlDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/AlertMessageDialog.xaml b/Correlator/Dialog/AlertMessageDialog.xaml index f08b168..cde5250 100644 --- a/Correlator/Dialog/AlertMessageDialog.xaml +++ b/Correlator/Dialog/AlertMessageDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index add4074..38df797 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -20,6 +20,7 @@ + @@ -28,7 +29,7 @@ diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs index 91441a2..72fd7b6 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml.cs +++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs @@ -181,12 +181,6 @@ ); } ); - // var boxResult = MessageBox.Show("数据未校验结束，确定要退出吗？", "温馨提示", MessageBoxButton.OKCancel, - // MessageBoxImage.Error); - // if (boxResult == MessageBoxResult.OK) - // { - // _eventAggregator.GetEvent().Publish(new DialogResult(ButtonResult.Abort)); - // } } else { @@ -212,13 +206,6 @@ } } ); - - // var result = MessageBox.Show("请确认数据是否已接收完整", "温馨提示", MessageBoxButton.YesNo, - // MessageBoxImage.Warning); - // if (result == MessageBoxResult.Yes) - // { - // RedSensorStepBar.Next(); - // } } else { @@ -296,13 +283,6 @@ } } ); - - // var result = MessageBox.Show("请确认数据是否已接收完整", "温馨提示", MessageBoxButton.YesNo, - // MessageBoxImage.Warning); - // if (result == MessageBoxResult.Yes) - // { - // BlueSensorStepBar.Next(); - // } } else { diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml b/Correlator/Dialog/EditSoundSpeedDialog.xaml index e3c4224..3bdcfbc 100644 --- a/Correlator/Dialog/EditSoundSpeedDialog.xaml +++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml @@ -19,11 +19,12 @@ + diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml index 99e7bf1..6f3274b 100644 --- a/Correlator/Dialog/ImportResponseDialog.xaml +++ b/Correlator/Dialog/ImportResponseDialog.xaml @@ -20,11 +20,12 @@ + diff --git a/Correlator/Dialog/SimplyAuditionDialog.xaml b/Correlator/Dialog/SimplyAuditionDialog.xaml index 836c2cc..5a5096e 100644 --- a/Correlator/Dialog/SimplyAuditionDialog.xaml +++ b/Correlator/Dialog/SimplyAuditionDialog.xaml @@ -22,6 +22,7 @@ + @@ -31,7 +32,7 @@ @@ -186,7 +187,7 @@ - + + diff --git a/Correlator/ViewModels/AudioFileViewModel.cs b/Correlator/ViewModels/AudioFileViewModel.cs index 5c8b044..3cd57b9 100644 --- a/Correlator/ViewModels/AudioFileViewModel.cs +++ b/Correlator/ViewModels/AudioFileViewModel.cs @@ -195,8 +195,6 @@ }, delegate { } ); - - // MessageBox.Show("音频文件损坏，无法播放", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); } } }); diff --git a/Correlator/ViewModels/ImportResponseDialogViewModel.cs b/Correlator/ViewModels/ImportResponseDialogViewModel.cs index af9c398..7885104 100644 --- a/Correlator/ViewModels/ImportResponseDialogViewModel.cs +++ b/Correlator/ViewModels/ImportResponseDialogViewModel.cs @@ -377,7 +377,6 @@ }, delegate { } ); - // MessageBox.Show("数据转化失败!", "错误", MessageBoxButton.OK, MessageBoxImage.Error); return new List(); } diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index 437109c..5439deb 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -19,11 +19,12 @@ + diff --git a/Correlator/Dialog/AlertControlDialog.xaml b/Correlator/Dialog/AlertControlDialog.xaml index b10e2ba..8acf006 100644 --- a/Correlator/Dialog/AlertControlDialog.xaml +++ b/Correlator/Dialog/AlertControlDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/AlertMessageDialog.xaml b/Correlator/Dialog/AlertMessageDialog.xaml index f08b168..cde5250 100644 --- a/Correlator/Dialog/AlertMessageDialog.xaml +++ b/Correlator/Dialog/AlertMessageDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index add4074..38df797 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -20,6 +20,7 @@ + @@ -28,7 +29,7 @@ diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs index 91441a2..72fd7b6 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml.cs +++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs @@ -181,12 +181,6 @@ ); } ); - // var boxResult = MessageBox.Show("数据未校验结束，确定要退出吗？", "温馨提示", MessageBoxButton.OKCancel, - // MessageBoxImage.Error); - // if (boxResult == MessageBoxResult.OK) - // { - // _eventAggregator.GetEvent().Publish(new DialogResult(ButtonResult.Abort)); - // } } else { @@ -212,13 +206,6 @@ } } ); - - // var result = MessageBox.Show("请确认数据是否已接收完整", "温馨提示", MessageBoxButton.YesNo, - // MessageBoxImage.Warning); - // if (result == MessageBoxResult.Yes) - // { - // RedSensorStepBar.Next(); - // } } else { @@ -296,13 +283,6 @@ } } ); - - // var result = MessageBox.Show("请确认数据是否已接收完整", "温馨提示", MessageBoxButton.YesNo, - // MessageBoxImage.Warning); - // if (result == MessageBoxResult.Yes) - // { - // BlueSensorStepBar.Next(); - // } } else { diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml b/Correlator/Dialog/EditSoundSpeedDialog.xaml index e3c4224..3bdcfbc 100644 --- a/Correlator/Dialog/EditSoundSpeedDialog.xaml +++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml @@ -19,11 +19,12 @@ + diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml index 99e7bf1..6f3274b 100644 --- a/Correlator/Dialog/ImportResponseDialog.xaml +++ b/Correlator/Dialog/ImportResponseDialog.xaml @@ -20,11 +20,12 @@ + diff --git a/Correlator/Dialog/SimplyAuditionDialog.xaml b/Correlator/Dialog/SimplyAuditionDialog.xaml index 836c2cc..5a5096e 100644 --- a/Correlator/Dialog/SimplyAuditionDialog.xaml +++ b/Correlator/Dialog/SimplyAuditionDialog.xaml @@ -22,6 +22,7 @@ + @@ -31,7 +32,7 @@ @@ -186,7 +187,7 @@ - + + diff --git a/Correlator/ViewModels/AudioFileViewModel.cs b/Correlator/ViewModels/AudioFileViewModel.cs index 5c8b044..3cd57b9 100644 --- a/Correlator/ViewModels/AudioFileViewModel.cs +++ b/Correlator/ViewModels/AudioFileViewModel.cs @@ -195,8 +195,6 @@ }, delegate { } ); - - // MessageBox.Show("音频文件损坏，无法播放", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); } } }); diff --git a/Correlator/ViewModels/ImportResponseDialogViewModel.cs b/Correlator/ViewModels/ImportResponseDialogViewModel.cs index af9c398..7885104 100644 --- a/Correlator/ViewModels/ImportResponseDialogViewModel.cs +++ b/Correlator/ViewModels/ImportResponseDialogViewModel.cs @@ -377,7 +377,6 @@ }, delegate { } ); - // MessageBox.Show("数据转化失败!", "错误", MessageBoxButton.OK, MessageBoxImage.Error); return new List(); } diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs index b0809a8..4c9ef4b 100644 --- a/Correlator/ViewModels/MainWindowViewModel.cs +++ b/Correlator/ViewModels/MainWindowViewModel.cs @@ -529,7 +529,6 @@ }, delegate { } ); - // MessageBox.Show("数据未校验，无法进行计算", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return; } @@ -543,7 +542,6 @@ }, delegate { } ); - // MessageBox.Show("数据校验被终止，无法进行计算", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return; } @@ -769,7 +767,6 @@ }, delegate { } ); - // MessageBox.Show("接收不到数据，请点击复位并重新开始采集数据", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); } }; @@ -843,12 +840,6 @@ _mainWindow.Close(); } ); - - // var result = MessageBox.Show("是否确认退出应用？", "温馨提示", MessageBoxButton.YesNo, MessageBoxImage.Question); - // if (result == MessageBoxResult.Yes) - // { - // _mainWindow.Close(); - // } }); //查看图片列表 @@ -876,7 +867,6 @@ }, delegate { } ); - // MessageBox.Show("串口状态异常，无法操作", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return; } @@ -896,7 +886,6 @@ }, delegate { } ); - // MessageBox.Show("请选择管道材料", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return; } @@ -922,7 +911,6 @@ }, delegate { } ); - // MessageBox.Show("取消导入数据", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; } @@ -957,7 +945,6 @@ }, delegate { } ); - // MessageBox.Show("只能在水听器模式导入数据", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); } }); @@ -999,7 +986,6 @@ }, delegate { } ); - // MessageBox.Show("还未开始采集数据，无法保存音频", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); } }); @@ -1030,7 +1016,6 @@ }, delegate { } ); - // MessageBox.Show("串口状态异常，无法操作", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return; } @@ -1112,7 +1097,6 @@ }, delegate { } ); - // MessageBox.Show("请选择管道材料", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return false; } @@ -1126,7 +1110,6 @@ }, delegate { } ); - // MessageBox.Show("请输入管道直径", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return false; } @@ -1140,7 +1123,6 @@ }, delegate { } ); - // MessageBox.Show("请输入管道长度", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return false; } @@ -1154,7 +1136,6 @@ }, delegate { } ); - // MessageBox.Show("请输入完整的干扰频段", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return false; } @@ -1174,7 +1155,6 @@ }, delegate { } ); - // MessageBox.Show("频段范围10 ~ 300Hz，请重新输入", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return false; } @@ -1201,7 +1181,6 @@ }, delegate { } ); - // MessageBox.Show("频段范围100 ~ 3000Hz，请重新输入", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return false; } } diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index 437109c..5439deb 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -19,11 +19,12 @@ + diff --git a/Correlator/Dialog/AlertControlDialog.xaml b/Correlator/Dialog/AlertControlDialog.xaml index b10e2ba..8acf006 100644 --- a/Correlator/Dialog/AlertControlDialog.xaml +++ b/Correlator/Dialog/AlertControlDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/AlertMessageDialog.xaml b/Correlator/Dialog/AlertMessageDialog.xaml index f08b168..cde5250 100644 --- a/Correlator/Dialog/AlertMessageDialog.xaml +++ b/Correlator/Dialog/AlertMessageDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index add4074..38df797 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -20,6 +20,7 @@ + @@ -28,7 +29,7 @@ diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs index 91441a2..72fd7b6 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml.cs +++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs @@ -181,12 +181,6 @@ ); } ); - // var boxResult = MessageBox.Show("数据未校验结束，确定要退出吗？", "温馨提示", MessageBoxButton.OKCancel, - // MessageBoxImage.Error); - // if (boxResult == MessageBoxResult.OK) - // { - // _eventAggregator.GetEvent().Publish(new DialogResult(ButtonResult.Abort)); - // } } else { @@ -212,13 +206,6 @@ } } ); - - // var result = MessageBox.Show("请确认数据是否已接收完整", "温馨提示", MessageBoxButton.YesNo, - // MessageBoxImage.Warning); - // if (result == MessageBoxResult.Yes) - // { - // RedSensorStepBar.Next(); - // } } else { @@ -296,13 +283,6 @@ } } ); - - // var result = MessageBox.Show("请确认数据是否已接收完整", "温馨提示", MessageBoxButton.YesNo, - // MessageBoxImage.Warning); - // if (result == MessageBoxResult.Yes) - // { - // BlueSensorStepBar.Next(); - // } } else { diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml b/Correlator/Dialog/EditSoundSpeedDialog.xaml index e3c4224..3bdcfbc 100644 --- a/Correlator/Dialog/EditSoundSpeedDialog.xaml +++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml @@ -19,11 +19,12 @@ + diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml index 99e7bf1..6f3274b 100644 --- a/Correlator/Dialog/ImportResponseDialog.xaml +++ b/Correlator/Dialog/ImportResponseDialog.xaml @@ -20,11 +20,12 @@ + diff --git a/Correlator/Dialog/SimplyAuditionDialog.xaml b/Correlator/Dialog/SimplyAuditionDialog.xaml index 836c2cc..5a5096e 100644 --- a/Correlator/Dialog/SimplyAuditionDialog.xaml +++ b/Correlator/Dialog/SimplyAuditionDialog.xaml @@ -22,6 +22,7 @@ + @@ -31,7 +32,7 @@ @@ -186,7 +187,7 @@ - + + diff --git a/Correlator/ViewModels/AudioFileViewModel.cs b/Correlator/ViewModels/AudioFileViewModel.cs index 5c8b044..3cd57b9 100644 --- a/Correlator/ViewModels/AudioFileViewModel.cs +++ b/Correlator/ViewModels/AudioFileViewModel.cs @@ -195,8 +195,6 @@ }, delegate { } ); - - // MessageBox.Show("音频文件损坏，无法播放", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); } } }); diff --git a/Correlator/ViewModels/ImportResponseDialogViewModel.cs b/Correlator/ViewModels/ImportResponseDialogViewModel.cs index af9c398..7885104 100644 --- a/Correlator/ViewModels/ImportResponseDialogViewModel.cs +++ b/Correlator/ViewModels/ImportResponseDialogViewModel.cs @@ -377,7 +377,6 @@ }, delegate { } ); - // MessageBox.Show("数据转化失败!", "错误", MessageBoxButton.OK, MessageBoxImage.Error); return new List(); } diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs index b0809a8..4c9ef4b 100644 --- a/Correlator/ViewModels/MainWindowViewModel.cs +++ b/Correlator/ViewModels/MainWindowViewModel.cs @@ -529,7 +529,6 @@ }, delegate { } ); - // MessageBox.Show("数据未校验，无法进行计算", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return; } @@ -543,7 +542,6 @@ }, delegate { } ); - // MessageBox.Show("数据校验被终止，无法进行计算", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return; } @@ -769,7 +767,6 @@ }, delegate { } ); - // MessageBox.Show("接收不到数据，请点击复位并重新开始采集数据", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); } }; @@ -843,12 +840,6 @@ _mainWindow.Close(); } ); - - // var result = MessageBox.Show("是否确认退出应用？", "温馨提示", MessageBoxButton.YesNo, MessageBoxImage.Question); - // if (result == MessageBoxResult.Yes) - // { - // _mainWindow.Close(); - // } }); //查看图片列表 @@ -876,7 +867,6 @@ }, delegate { } ); - // MessageBox.Show("串口状态异常，无法操作", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return; } @@ -896,7 +886,6 @@ }, delegate { } ); - // MessageBox.Show("请选择管道材料", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return; } @@ -922,7 +911,6 @@ }, delegate { } ); - // MessageBox.Show("取消导入数据", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; } @@ -957,7 +945,6 @@ }, delegate { } ); - // MessageBox.Show("只能在水听器模式导入数据", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); } }); @@ -999,7 +986,6 @@ }, delegate { } ); - // MessageBox.Show("还未开始采集数据，无法保存音频", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); } }); @@ -1030,7 +1016,6 @@ }, delegate { } ); - // MessageBox.Show("串口状态异常，无法操作", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return; } @@ -1112,7 +1097,6 @@ }, delegate { } ); - // MessageBox.Show("请选择管道材料", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return false; } @@ -1126,7 +1110,6 @@ }, delegate { } ); - // MessageBox.Show("请输入管道直径", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return false; } @@ -1140,7 +1123,6 @@ }, delegate { } ); - // MessageBox.Show("请输入管道长度", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return false; } @@ -1154,7 +1136,6 @@ }, delegate { } ); - // MessageBox.Show("请输入完整的干扰频段", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return false; } @@ -1174,7 +1155,6 @@ }, delegate { } ); - // MessageBox.Show("频段范围10 ~ 300Hz，请重新输入", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return false; } @@ -1201,7 +1181,6 @@ }, delegate { } ); - // MessageBox.Show("频段范围100 ~ 3000Hz，请重新输入", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return false; } } diff --git a/Correlator/ViewModels/SimplyAuditionDialogViewModel.cs b/Correlator/ViewModels/SimplyAuditionDialogViewModel.cs index 1454d86..9fe8201 100644 --- a/Correlator/ViewModels/SimplyAuditionDialogViewModel.cs +++ b/Correlator/ViewModels/SimplyAuditionDialogViewModel.cs @@ -117,8 +117,6 @@ }, delegate { } ); - - // MessageBox.Show("请先停止蓝色传感器听音", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return; } @@ -166,8 +164,6 @@ }, delegate { } ); - - // MessageBox.Show("请先停止红色传感器听音", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return; } diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index 437109c..5439deb 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -19,11 +19,12 @@ + diff --git a/Correlator/Dialog/AlertControlDialog.xaml b/Correlator/Dialog/AlertControlDialog.xaml index b10e2ba..8acf006 100644 --- a/Correlator/Dialog/AlertControlDialog.xaml +++ b/Correlator/Dialog/AlertControlDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/AlertMessageDialog.xaml b/Correlator/Dialog/AlertMessageDialog.xaml index f08b168..cde5250 100644 --- a/Correlator/Dialog/AlertMessageDialog.xaml +++ b/Correlator/Dialog/AlertMessageDialog.xaml @@ -18,11 +18,12 @@ + diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index add4074..38df797 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -20,6 +20,7 @@ + @@ -28,7 +29,7 @@ diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs index 91441a2..72fd7b6 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml.cs +++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs @@ -181,12 +181,6 @@ ); } ); - // var boxResult = MessageBox.Show("数据未校验结束，确定要退出吗？", "温馨提示", MessageBoxButton.OKCancel, - // MessageBoxImage.Error); - // if (boxResult == MessageBoxResult.OK) - // { - // _eventAggregator.GetEvent().Publish(new DialogResult(ButtonResult.Abort)); - // } } else { @@ -212,13 +206,6 @@ } } ); - - // var result = MessageBox.Show("请确认数据是否已接收完整", "温馨提示", MessageBoxButton.YesNo, - // MessageBoxImage.Warning); - // if (result == MessageBoxResult.Yes) - // { - // RedSensorStepBar.Next(); - // } } else { @@ -296,13 +283,6 @@ } } ); - - // var result = MessageBox.Show("请确认数据是否已接收完整", "温馨提示", MessageBoxButton.YesNo, - // MessageBoxImage.Warning); - // if (result == MessageBoxResult.Yes) - // { - // BlueSensorStepBar.Next(); - // } } else { diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml b/Correlator/Dialog/EditSoundSpeedDialog.xaml index e3c4224..3bdcfbc 100644 --- a/Correlator/Dialog/EditSoundSpeedDialog.xaml +++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml @@ -19,11 +19,12 @@ + diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml index 99e7bf1..6f3274b 100644 --- a/Correlator/Dialog/ImportResponseDialog.xaml +++ b/Correlator/Dialog/ImportResponseDialog.xaml @@ -20,11 +20,12 @@ + diff --git a/Correlator/Dialog/SimplyAuditionDialog.xaml b/Correlator/Dialog/SimplyAuditionDialog.xaml index 836c2cc..5a5096e 100644 --- a/Correlator/Dialog/SimplyAuditionDialog.xaml +++ b/Correlator/Dialog/SimplyAuditionDialog.xaml @@ -22,6 +22,7 @@ + @@ -31,7 +32,7 @@ @@ -186,7 +187,7 @@ - + + diff --git a/Correlator/ViewModels/AudioFileViewModel.cs b/Correlator/ViewModels/AudioFileViewModel.cs index 5c8b044..3cd57b9 100644 --- a/Correlator/ViewModels/AudioFileViewModel.cs +++ b/Correlator/ViewModels/AudioFileViewModel.cs @@ -195,8 +195,6 @@ }, delegate { } ); - - // MessageBox.Show("音频文件损坏，无法播放", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); } } }); diff --git a/Correlator/ViewModels/ImportResponseDialogViewModel.cs b/Correlator/ViewModels/ImportResponseDialogViewModel.cs index af9c398..7885104 100644 --- a/Correlator/ViewModels/ImportResponseDialogViewModel.cs +++ b/Correlator/ViewModels/ImportResponseDialogViewModel.cs @@ -377,7 +377,6 @@ }, delegate { } ); - // MessageBox.Show("数据转化失败!", "错误", MessageBoxButton.OK, MessageBoxImage.Error); return new List(); } diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs index b0809a8..4c9ef4b 100644 --- a/Correlator/ViewModels/MainWindowViewModel.cs +++ b/Correlator/ViewModels/MainWindowViewModel.cs @@ -529,7 +529,6 @@ }, delegate { } ); - // MessageBox.Show("数据未校验，无法进行计算", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return; } @@ -543,7 +542,6 @@ }, delegate { } ); - // MessageBox.Show("数据校验被终止，无法进行计算", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return; } @@ -769,7 +767,6 @@ }, delegate { } ); - // MessageBox.Show("接收不到数据，请点击复位并重新开始采集数据", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); } }; @@ -843,12 +840,6 @@ _mainWindow.Close(); } ); - - // var result = MessageBox.Show("是否确认退出应用？", "温馨提示", MessageBoxButton.YesNo, MessageBoxImage.Question); - // if (result == MessageBoxResult.Yes) - // { - // _mainWindow.Close(); - // } }); //查看图片列表 @@ -876,7 +867,6 @@ }, delegate { } ); - // MessageBox.Show("串口状态异常，无法操作", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return; } @@ -896,7 +886,6 @@ }, delegate { } ); - // MessageBox.Show("请选择管道材料", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return; } @@ -922,7 +911,6 @@ }, delegate { } ); - // MessageBox.Show("取消导入数据", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; } @@ -957,7 +945,6 @@ }, delegate { } ); - // MessageBox.Show("只能在水听器模式导入数据", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); } }); @@ -999,7 +986,6 @@ }, delegate { } ); - // MessageBox.Show("还未开始采集数据，无法保存音频", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); } }); @@ -1030,7 +1016,6 @@ }, delegate { } ); - // MessageBox.Show("串口状态异常，无法操作", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return; } @@ -1112,7 +1097,6 @@ }, delegate { } ); - // MessageBox.Show("请选择管道材料", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return false; } @@ -1126,7 +1110,6 @@ }, delegate { } ); - // MessageBox.Show("请输入管道直径", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return false; } @@ -1140,7 +1123,6 @@ }, delegate { } ); - // MessageBox.Show("请输入管道长度", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return false; } @@ -1154,7 +1136,6 @@ }, delegate { } ); - // MessageBox.Show("请输入完整的干扰频段", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return false; } @@ -1174,7 +1155,6 @@ }, delegate { } ); - // MessageBox.Show("频段范围10 ~ 300Hz，请重新输入", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return false; } @@ -1201,7 +1181,6 @@ }, delegate { } ); - // MessageBox.Show("频段范围100 ~ 3000Hz，请重新输入", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return false; } } diff --git a/Correlator/ViewModels/SimplyAuditionDialogViewModel.cs b/Correlator/ViewModels/SimplyAuditionDialogViewModel.cs index 1454d86..9fe8201 100644 --- a/Correlator/ViewModels/SimplyAuditionDialogViewModel.cs +++ b/Correlator/ViewModels/SimplyAuditionDialogViewModel.cs @@ -117,8 +117,6 @@ }, delegate { } ); - - // MessageBox.Show("请先停止蓝色传感器听音", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return; } @@ -166,8 +164,6 @@ }, delegate { } ); - - // MessageBox.Show("请先停止红色传感器听音", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); return; } diff --git a/Correlator/ViewModels/SoundSpeedDialogViewModel.cs b/Correlator/ViewModels/SoundSpeedDialogViewModel.cs index 99201c3..1cc6cde 100644 --- a/Correlator/ViewModels/SoundSpeedDialogViewModel.cs +++ b/Correlator/ViewModels/SoundSpeedDialogViewModel.cs @@ -81,7 +81,6 @@ }, delegate { } ); - // MessageBox.Show("未选择任何项，无法删除", "错误", MessageBoxButton.OK, MessageBoxImage.Error); return; } @@ -102,16 +101,6 @@ VelocityCollection = dataService.GetVelocityCollection(_materialName); } ); - - // var result = MessageBox.Show("是否删除？删除后无法恢复", - // "温馨提示", MessageBoxButton.OKCancel, MessageBoxImage.Question); - // if (result == MessageBoxResult.Cancel) - // { - // return; - // } - // - // dataService.DeleteVelocity(_materialVelocity); - // VelocityCollection = dataService.GetVelocityCollection(_materialName); }); AddSpeedCommand = new DelegateCommand(delegate @@ -135,7 +124,6 @@ }, delegate { } ); - // MessageBox.Show("未选择任何项，无法编辑", "错误", MessageBoxButton.OK, MessageBoxImage.Error); return; }