diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index 5be7580..eadefec 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -1,490 +1,487 @@
-
+
+
+ Debug
+ AnyCPU
+ {BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}
+ WinExe
+ Correlator
+ Correlator
+ v4.8
+ 512
+ {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ 4
+ true
+
+
+
+
+ x64
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+ false
+
+
+ AnyCPU
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+ Image\favicon.ico
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ 7.3
+ prompt
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ 7.3
+ prompt
+ true
+
+
+
+ ..\packages\CommonServiceLocator.2.0.6\lib\net48\CommonServiceLocator.dll
+
+
+ C:\Users\Administrator\Desktop\dll\CorrelatorCSharp.dll
+
+
+ C:\Users\Administrator\Desktop\dll\CorrelatorSingle.dll
+
+
+ ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll
+
+
+ ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Extras.dll
+
+
+ ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll
+
+
+ ..\packages\HandyControl.3.3.0\lib\net48\HandyControl.dll
+
+
+ ..\packages\LiveCharts.0.9.7\lib\net45\LiveCharts.dll
+
+
+ C:\Users\Administrator\Desktop\dll\LiveCharts.Geared.dll
+
+
+ ..\packages\LiveCharts.Wpf.0.9.7\lib\net45\LiveCharts.Wpf.dll
+
+
+ ..\packages\log4net.2.0.15\lib\net45\log4net.dll
+
+
+ False
+ C:\Users\Administrator\Desktop\dll\MWArray.dll
+
+
+ ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
+
+
+ C:\Users\Administrator\Desktop\dll\playWaveNamespace.dll
+
+
+ ..\packages\sqlite-net-pcl.1.8.116\lib\netstandard2.0\SQLite-net.dll
+
+
+ ..\packages\SQLitePCLRaw.bundle_green.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll
+
+
+ ..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll
+
+
+ ..\packages\SQLitePCLRaw.bundle_green.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll
+
+
+ ..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll
+
+
+
+ ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll
+
+
+
+
+
+
+
+ ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll
+
+
+
+ ..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll
+
+
+ ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll
+
+
+
+
+ ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll
+
+
+
+ 4.0
+
+
+
+
+
+
+
+ MSBuild:Compile
+ Designer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AudioFileUserControl.xaml
+
+
+ AuditionUserControl.xaml
+
+
+ BigPictureUserControl.xaml
+
+
+ EditFilterUserControl.xaml
+
+
+ EditNameUserControl.xaml
+
+
+ EditPipeDiameterUserControl.xaml
+
+
+ EditPipeLengthUserControl.xaml
+
+
+ EditSoundSpeedUserControl.xaml
+
+
+ FilterUserControl.xaml
+
+
+ MenuUserControl.xaml
+
+
+ PictureFileUserControl.xaml
+
+
+ PipeMaterialUserControl.xaml
+
+
+ SoundSpeedUserControl.xaml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PipeRangeWindow.xaml
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+
+
+
+
+
+
+
+
+ Designer
+ MSBuild:Compile
+
+
+
+
+
+
+ MSBuild:Compile
+ Designer
+
+
+ App.xaml
+ Code
+
+
+ HomePageWindow.xaml
+
+
+ MainWindow.xaml
+ Code
+
+
+
+
+
+ Code
+
+
+ True
+ True
+ Resources.resx
+
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- Debug
- AnyCPU
- {BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}
- WinExe
- Correlator
- Correlator
- v4.8
- 512
- {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 4
- true
-
-
+ 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息,请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。
-
- x64
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
- false
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
- Image\favicon.ico
-
-
- true
- bin\x64\Debug\
- DEBUG;TRACE
- full
- x64
- 7.3
- prompt
-
-
- bin\x64\Release\
- TRACE
- true
- pdbonly
- x64
- 7.3
- prompt
- true
-
-
-
- ..\packages\CommonServiceLocator.2.0.6\lib\net48\CommonServiceLocator.dll
-
-
- C:\Users\Administrator\Desktop\dll\CorrelatorCSharp.dll
-
-
- C:\Users\Administrator\Desktop\dll\CorrelatorSingle.dll
-
-
- ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll
-
-
- ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Extras.dll
-
-
- ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll
-
-
- ..\packages\HandyControl.3.3.0\lib\net48\HandyControl.dll
-
-
- ..\packages\HandyControl.3.3.0\lib\net48\HandyControl.dll
-
-
- ..\packages\LiveCharts.0.9.7\lib\net45\LiveCharts.dll
-
-
- C:\Users\Administrator\Desktop\dll\LiveCharts.Geared.dll
-
-
- ..\packages\LiveCharts.Wpf.0.9.7\lib\net45\LiveCharts.Wpf.dll
-
-
- ..\packages\log4net.2.0.15\lib\net45\log4net.dll
-
-
- False
- C:\Users\Administrator\Desktop\dll\MWArray.dll
-
-
- ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
-
-
- C:\Users\Administrator\Desktop\dll\playWaveNamespace.dll
-
-
- ..\packages\sqlite-net-pcl.1.8.116\lib\netstandard2.0\SQLite-net.dll
-
-
- ..\packages\SQLitePCLRaw.bundle_green.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll
-
-
- ..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll
-
-
- ..\packages\SQLitePCLRaw.bundle_green.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll
-
-
- ..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll
-
-
-
- ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll
-
-
-
-
-
-
-
- ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll
-
-
-
- ..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll
-
-
- ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll
-
-
-
-
- ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll
-
-
-
- 4.0
-
-
-
-
-
-
-
- MSBuild:Compile
- Designer
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- AudioFileUserControl.xaml
-
-
- AuditionUserControl.xaml
-
-
- BigPictureUserControl.xaml
-
-
- EditFilterUserControl.xaml
-
-
- EditNameUserControl.xaml
-
-
- EditPipeDiameterUserControl.xaml
-
-
- EditPipeLengthUserControl.xaml
-
-
- EditSoundSpeedUserControl.xaml
-
-
- FilterUserControl.xaml
-
-
- MenuUserControl.xaml
-
-
- PictureFileUserControl.xaml
-
-
- PipeMaterialUserControl.xaml
-
-
- SoundSpeedUserControl.xaml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- PipeRangeWindow.xaml
-
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
-
-
-
-
-
-
-
-
-
- Designer
- MSBuild:Compile
-
-
-
-
-
-
- MSBuild:Compile
- Designer
-
-
- App.xaml
- Code
-
-
- HomePageWindow.xaml
-
-
- MainWindow.xaml
- Code
-
-
-
-
-
- Code
-
-
- True
- True
- Resources.resx
-
-
- ResXFileCodeGenerator
- Resources.Designer.cs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息,请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。
-
-
-
+
+
\ No newline at end of file
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index 5be7580..eadefec 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -1,490 +1,487 @@
-
+
+
+ Debug
+ AnyCPU
+ {BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}
+ WinExe
+ Correlator
+ Correlator
+ v4.8
+ 512
+ {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ 4
+ true
+
+
+
+
+ x64
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+ false
+
+
+ AnyCPU
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+ Image\favicon.ico
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ 7.3
+ prompt
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ 7.3
+ prompt
+ true
+
+
+
+ ..\packages\CommonServiceLocator.2.0.6\lib\net48\CommonServiceLocator.dll
+
+
+ C:\Users\Administrator\Desktop\dll\CorrelatorCSharp.dll
+
+
+ C:\Users\Administrator\Desktop\dll\CorrelatorSingle.dll
+
+
+ ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll
+
+
+ ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Extras.dll
+
+
+ ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll
+
+
+ ..\packages\HandyControl.3.3.0\lib\net48\HandyControl.dll
+
+
+ ..\packages\LiveCharts.0.9.7\lib\net45\LiveCharts.dll
+
+
+ C:\Users\Administrator\Desktop\dll\LiveCharts.Geared.dll
+
+
+ ..\packages\LiveCharts.Wpf.0.9.7\lib\net45\LiveCharts.Wpf.dll
+
+
+ ..\packages\log4net.2.0.15\lib\net45\log4net.dll
+
+
+ False
+ C:\Users\Administrator\Desktop\dll\MWArray.dll
+
+
+ ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
+
+
+ C:\Users\Administrator\Desktop\dll\playWaveNamespace.dll
+
+
+ ..\packages\sqlite-net-pcl.1.8.116\lib\netstandard2.0\SQLite-net.dll
+
+
+ ..\packages\SQLitePCLRaw.bundle_green.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll
+
+
+ ..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll
+
+
+ ..\packages\SQLitePCLRaw.bundle_green.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll
+
+
+ ..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll
+
+
+
+ ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll
+
+
+
+
+
+
+
+ ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll
+
+
+
+ ..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll
+
+
+ ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll
+
+
+
+
+ ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll
+
+
+
+ 4.0
+
+
+
+
+
+
+
+ MSBuild:Compile
+ Designer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AudioFileUserControl.xaml
+
+
+ AuditionUserControl.xaml
+
+
+ BigPictureUserControl.xaml
+
+
+ EditFilterUserControl.xaml
+
+
+ EditNameUserControl.xaml
+
+
+ EditPipeDiameterUserControl.xaml
+
+
+ EditPipeLengthUserControl.xaml
+
+
+ EditSoundSpeedUserControl.xaml
+
+
+ FilterUserControl.xaml
+
+
+ MenuUserControl.xaml
+
+
+ PictureFileUserControl.xaml
+
+
+ PipeMaterialUserControl.xaml
+
+
+ SoundSpeedUserControl.xaml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PipeRangeWindow.xaml
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+
+
+
+
+
+
+
+
+ Designer
+ MSBuild:Compile
+
+
+
+
+
+
+ MSBuild:Compile
+ Designer
+
+
+ App.xaml
+ Code
+
+
+ HomePageWindow.xaml
+
+
+ MainWindow.xaml
+ Code
+
+
+
+
+
+ Code
+
+
+ True
+ True
+ Resources.resx
+
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- Debug
- AnyCPU
- {BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}
- WinExe
- Correlator
- Correlator
- v4.8
- 512
- {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 4
- true
-
-
+ 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息,请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。
-
- x64
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
- false
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
- Image\favicon.ico
-
-
- true
- bin\x64\Debug\
- DEBUG;TRACE
- full
- x64
- 7.3
- prompt
-
-
- bin\x64\Release\
- TRACE
- true
- pdbonly
- x64
- 7.3
- prompt
- true
-
-
-
- ..\packages\CommonServiceLocator.2.0.6\lib\net48\CommonServiceLocator.dll
-
-
- C:\Users\Administrator\Desktop\dll\CorrelatorCSharp.dll
-
-
- C:\Users\Administrator\Desktop\dll\CorrelatorSingle.dll
-
-
- ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll
-
-
- ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Extras.dll
-
-
- ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll
-
-
- ..\packages\HandyControl.3.3.0\lib\net48\HandyControl.dll
-
-
- ..\packages\HandyControl.3.3.0\lib\net48\HandyControl.dll
-
-
- ..\packages\LiveCharts.0.9.7\lib\net45\LiveCharts.dll
-
-
- C:\Users\Administrator\Desktop\dll\LiveCharts.Geared.dll
-
-
- ..\packages\LiveCharts.Wpf.0.9.7\lib\net45\LiveCharts.Wpf.dll
-
-
- ..\packages\log4net.2.0.15\lib\net45\log4net.dll
-
-
- False
- C:\Users\Administrator\Desktop\dll\MWArray.dll
-
-
- ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
-
-
- C:\Users\Administrator\Desktop\dll\playWaveNamespace.dll
-
-
- ..\packages\sqlite-net-pcl.1.8.116\lib\netstandard2.0\SQLite-net.dll
-
-
- ..\packages\SQLitePCLRaw.bundle_green.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll
-
-
- ..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll
-
-
- ..\packages\SQLitePCLRaw.bundle_green.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll
-
-
- ..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll
-
-
-
- ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll
-
-
-
-
-
-
-
- ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll
-
-
-
- ..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll
-
-
- ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll
-
-
-
-
- ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll
-
-
-
- 4.0
-
-
-
-
-
-
-
- MSBuild:Compile
- Designer
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- AudioFileUserControl.xaml
-
-
- AuditionUserControl.xaml
-
-
- BigPictureUserControl.xaml
-
-
- EditFilterUserControl.xaml
-
-
- EditNameUserControl.xaml
-
-
- EditPipeDiameterUserControl.xaml
-
-
- EditPipeLengthUserControl.xaml
-
-
- EditSoundSpeedUserControl.xaml
-
-
- FilterUserControl.xaml
-
-
- MenuUserControl.xaml
-
-
- PictureFileUserControl.xaml
-
-
- PipeMaterialUserControl.xaml
-
-
- SoundSpeedUserControl.xaml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- PipeRangeWindow.xaml
-
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
-
-
-
-
-
-
-
-
-
- Designer
- MSBuild:Compile
-
-
-
-
-
-
- MSBuild:Compile
- Designer
-
-
- App.xaml
- Code
-
-
- HomePageWindow.xaml
-
-
- MainWindow.xaml
- Code
-
-
-
-
-
- Code
-
-
- True
- True
- Resources.resx
-
-
- ResXFileCodeGenerator
- Resources.Designer.cs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息,请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。
-
-
-
+
+
\ No newline at end of file
diff --git a/Correlator/View/HomePageWindow.xaml b/Correlator/View/HomePageWindow.xaml
index 1c7a972..0e1b61a 100644
--- a/Correlator/View/HomePageWindow.xaml
+++ b/Correlator/View/HomePageWindow.xaml
@@ -83,6 +83,7 @@
+
@@ -200,7 +201,14 @@
-
+
+
+
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index 5be7580..eadefec 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -1,490 +1,487 @@
-
+
+
+ Debug
+ AnyCPU
+ {BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}
+ WinExe
+ Correlator
+ Correlator
+ v4.8
+ 512
+ {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ 4
+ true
+
+
+
+
+ x64
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+ false
+
+
+ AnyCPU
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+ Image\favicon.ico
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ 7.3
+ prompt
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ 7.3
+ prompt
+ true
+
+
+
+ ..\packages\CommonServiceLocator.2.0.6\lib\net48\CommonServiceLocator.dll
+
+
+ C:\Users\Administrator\Desktop\dll\CorrelatorCSharp.dll
+
+
+ C:\Users\Administrator\Desktop\dll\CorrelatorSingle.dll
+
+
+ ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll
+
+
+ ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Extras.dll
+
+
+ ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll
+
+
+ ..\packages\HandyControl.3.3.0\lib\net48\HandyControl.dll
+
+
+ ..\packages\LiveCharts.0.9.7\lib\net45\LiveCharts.dll
+
+
+ C:\Users\Administrator\Desktop\dll\LiveCharts.Geared.dll
+
+
+ ..\packages\LiveCharts.Wpf.0.9.7\lib\net45\LiveCharts.Wpf.dll
+
+
+ ..\packages\log4net.2.0.15\lib\net45\log4net.dll
+
+
+ False
+ C:\Users\Administrator\Desktop\dll\MWArray.dll
+
+
+ ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
+
+
+ C:\Users\Administrator\Desktop\dll\playWaveNamespace.dll
+
+
+ ..\packages\sqlite-net-pcl.1.8.116\lib\netstandard2.0\SQLite-net.dll
+
+
+ ..\packages\SQLitePCLRaw.bundle_green.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll
+
+
+ ..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll
+
+
+ ..\packages\SQLitePCLRaw.bundle_green.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll
+
+
+ ..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll
+
+
+
+ ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll
+
+
+
+
+
+
+
+ ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll
+
+
+
+ ..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll
+
+
+ ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll
+
+
+
+
+ ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll
+
+
+
+ 4.0
+
+
+
+
+
+
+
+ MSBuild:Compile
+ Designer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AudioFileUserControl.xaml
+
+
+ AuditionUserControl.xaml
+
+
+ BigPictureUserControl.xaml
+
+
+ EditFilterUserControl.xaml
+
+
+ EditNameUserControl.xaml
+
+
+ EditPipeDiameterUserControl.xaml
+
+
+ EditPipeLengthUserControl.xaml
+
+
+ EditSoundSpeedUserControl.xaml
+
+
+ FilterUserControl.xaml
+
+
+ MenuUserControl.xaml
+
+
+ PictureFileUserControl.xaml
+
+
+ PipeMaterialUserControl.xaml
+
+
+ SoundSpeedUserControl.xaml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PipeRangeWindow.xaml
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+
+
+
+
+
+
+
+
+ Designer
+ MSBuild:Compile
+
+
+
+
+
+
+ MSBuild:Compile
+ Designer
+
+
+ App.xaml
+ Code
+
+
+ HomePageWindow.xaml
+
+
+ MainWindow.xaml
+ Code
+
+
+
+
+
+ Code
+
+
+ True
+ True
+ Resources.resx
+
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- Debug
- AnyCPU
- {BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}
- WinExe
- Correlator
- Correlator
- v4.8
- 512
- {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 4
- true
-
-
+ 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息,请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。
-
- x64
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
- false
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
- Image\favicon.ico
-
-
- true
- bin\x64\Debug\
- DEBUG;TRACE
- full
- x64
- 7.3
- prompt
-
-
- bin\x64\Release\
- TRACE
- true
- pdbonly
- x64
- 7.3
- prompt
- true
-
-
-
- ..\packages\CommonServiceLocator.2.0.6\lib\net48\CommonServiceLocator.dll
-
-
- C:\Users\Administrator\Desktop\dll\CorrelatorCSharp.dll
-
-
- C:\Users\Administrator\Desktop\dll\CorrelatorSingle.dll
-
-
- ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll
-
-
- ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Extras.dll
-
-
- ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll
-
-
- ..\packages\HandyControl.3.3.0\lib\net48\HandyControl.dll
-
-
- ..\packages\HandyControl.3.3.0\lib\net48\HandyControl.dll
-
-
- ..\packages\LiveCharts.0.9.7\lib\net45\LiveCharts.dll
-
-
- C:\Users\Administrator\Desktop\dll\LiveCharts.Geared.dll
-
-
- ..\packages\LiveCharts.Wpf.0.9.7\lib\net45\LiveCharts.Wpf.dll
-
-
- ..\packages\log4net.2.0.15\lib\net45\log4net.dll
-
-
- False
- C:\Users\Administrator\Desktop\dll\MWArray.dll
-
-
- ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
-
-
- C:\Users\Administrator\Desktop\dll\playWaveNamespace.dll
-
-
- ..\packages\sqlite-net-pcl.1.8.116\lib\netstandard2.0\SQLite-net.dll
-
-
- ..\packages\SQLitePCLRaw.bundle_green.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll
-
-
- ..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll
-
-
- ..\packages\SQLitePCLRaw.bundle_green.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll
-
-
- ..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll
-
-
-
- ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll
-
-
-
-
-
-
-
- ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll
-
-
-
- ..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll
-
-
- ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll
-
-
-
-
- ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll
-
-
-
- 4.0
-
-
-
-
-
-
-
- MSBuild:Compile
- Designer
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- AudioFileUserControl.xaml
-
-
- AuditionUserControl.xaml
-
-
- BigPictureUserControl.xaml
-
-
- EditFilterUserControl.xaml
-
-
- EditNameUserControl.xaml
-
-
- EditPipeDiameterUserControl.xaml
-
-
- EditPipeLengthUserControl.xaml
-
-
- EditSoundSpeedUserControl.xaml
-
-
- FilterUserControl.xaml
-
-
- MenuUserControl.xaml
-
-
- PictureFileUserControl.xaml
-
-
- PipeMaterialUserControl.xaml
-
-
- SoundSpeedUserControl.xaml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- PipeRangeWindow.xaml
-
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
-
-
-
-
-
-
-
-
-
- Designer
- MSBuild:Compile
-
-
-
-
-
-
- MSBuild:Compile
- Designer
-
-
- App.xaml
- Code
-
-
- HomePageWindow.xaml
-
-
- MainWindow.xaml
- Code
-
-
-
-
-
- Code
-
-
- True
- True
- Resources.resx
-
-
- ResXFileCodeGenerator
- Resources.Designer.cs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息,请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。
-
-
-
+
+
\ No newline at end of file
diff --git a/Correlator/View/HomePageWindow.xaml b/Correlator/View/HomePageWindow.xaml
index 1c7a972..0e1b61a 100644
--- a/Correlator/View/HomePageWindow.xaml
+++ b/Correlator/View/HomePageWindow.xaml
@@ -83,6 +83,7 @@
+
@@ -200,7 +201,14 @@
-
+
+
+
diff --git a/Correlator/ViewModel/HomePageViewModel.cs b/Correlator/ViewModel/HomePageViewModel.cs
index 88aef19..d7ea7f0 100644
--- a/Correlator/ViewModel/HomePageViewModel.cs
+++ b/Correlator/ViewModel/HomePageViewModel.cs
@@ -295,6 +295,21 @@
}
///
+ /// 最大相关系数
+ ///
+ private string _maxCorrelationCoefficient = string.Empty;
+
+ public string MaxCorrelationCoefficient
+ {
+ get => _maxCorrelationCoefficient;
+ set
+ {
+ _maxCorrelationCoefficient = value;
+ RaisePropertyChanged(() => MaxCorrelationCoefficient);
+ }
+ }
+
+ ///
/// Chart点数据
///
private GearedValues _columnValues;
@@ -874,7 +889,7 @@
TransmitterBDistance = Convert.ToDouble(array[2].ToString()); //距离B
//最大相关系数
var maxCorrelationCoefficient = Convert.ToDouble(array[3].ToString());
- LogWithConsole.WriteLine("最大相关系数:" + maxCorrelationCoefficient, "HomePageViewModel");
+ MaxCorrelationCoefficient = "最大相关系数:" + maxCorrelationCoefficient;
//时间差
// var timeDiff = Convert.ToDouble(array[6].ToString());
@@ -888,7 +903,8 @@
var xDoubles = GetArray((MWNumericArray)array[5]);
//绑定柱状图
ColumnValues = new GearedValues();
- for (var i = 0; i < yDoubles.Length; i++)
+ var count = xDoubles.Length;
+ for (var i = 0; i < count; i++)
{
ColumnValues.Add(new ObservablePoint
{