diff --git a/Correlator.sln.DotSettings.user b/Correlator.sln.DotSettings.user
index 37a4f1f..15da52d 100644
--- a/Correlator.sln.DotSettings.user
+++ b/Correlator.sln.DotSettings.user
@@ -6,4 +6,5 @@
<Assembly Path="C:\Users\Administrator\Desktop\dll\国内\CorrelatorSingle.dll" />
<Assembly Path="D:\Code\Rider Projects\相关仪\测试版\correlator\packages\log4net.2.0.15\lib\net45\log4net.dll" />
</AssemblyExplorer>
- True
\ No newline at end of file
+ True
+ True
\ No newline at end of file
diff --git a/Correlator.sln.DotSettings.user b/Correlator.sln.DotSettings.user
index 37a4f1f..15da52d 100644
--- a/Correlator.sln.DotSettings.user
+++ b/Correlator.sln.DotSettings.user
@@ -6,4 +6,5 @@
<Assembly Path="C:\Users\Administrator\Desktop\dll\国内\CorrelatorSingle.dll" />
<Assembly Path="D:\Code\Rider Projects\相关仪\测试版\correlator\packages\log4net.2.0.15\lib\net45\log4net.dll" />
</AssemblyExplorer>
- True
\ No newline at end of file
+ True
+ True
\ No newline at end of file
diff --git a/Correlator/App.config b/Correlator/App.config
index 38a06f9..480eed3 100644
--- a/Correlator/App.config
+++ b/Correlator/App.config
@@ -129,6 +129,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/Correlator.sln.DotSettings.user b/Correlator.sln.DotSettings.user
index 37a4f1f..15da52d 100644
--- a/Correlator.sln.DotSettings.user
+++ b/Correlator.sln.DotSettings.user
@@ -6,4 +6,5 @@
<Assembly Path="C:\Users\Administrator\Desktop\dll\国内\CorrelatorSingle.dll" />
<Assembly Path="D:\Code\Rider Projects\相关仪\测试版\correlator\packages\log4net.2.0.15\lib\net45\log4net.dll" />
</AssemblyExplorer>
- True
\ No newline at end of file
+ True
+ True
\ No newline at end of file
diff --git a/Correlator/App.config b/Correlator/App.config
index 38a06f9..480eed3 100644
--- a/Correlator/App.config
+++ b/Correlator/App.config
@@ -129,6 +129,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index e5597ff..ca5327d 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -92,6 +92,7 @@
..\packages\log4net.2.0.15\lib\net45\log4net.dll
+
False
C:\Users\Administrator\Desktop\dll\MWArray.dll
@@ -102,6 +103,12 @@
C:\Users\Administrator\Desktop\dll\playWaveNamespace.dll
+
+ ..\packages\ScottPlot.4.1.60\lib\net462\ScottPlot.dll
+
+
+ ..\packages\ScottPlot.WPF.4.1.60\lib\net48\ScottPlot.WPF.dll
+
..\packages\sqlite-net-pcl.1.8.116\lib\netstandard2.0\SQLite-net.dll
@@ -125,17 +132,26 @@
+
+ ..\packages\System.Drawing.Common.4.7.2\lib\net461\System.Drawing.Common.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.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll
..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll
+
+ ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll
+
+
+ ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll
+
diff --git a/Correlator.sln.DotSettings.user b/Correlator.sln.DotSettings.user
index 37a4f1f..15da52d 100644
--- a/Correlator.sln.DotSettings.user
+++ b/Correlator.sln.DotSettings.user
@@ -6,4 +6,5 @@
<Assembly Path="C:\Users\Administrator\Desktop\dll\国内\CorrelatorSingle.dll" />
<Assembly Path="D:\Code\Rider Projects\相关仪\测试版\correlator\packages\log4net.2.0.15\lib\net45\log4net.dll" />
</AssemblyExplorer>
- True
\ No newline at end of file
+ True
+ True
\ No newline at end of file
diff --git a/Correlator/App.config b/Correlator/App.config
index 38a06f9..480eed3 100644
--- a/Correlator/App.config
+++ b/Correlator/App.config
@@ -129,6 +129,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index e5597ff..ca5327d 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -92,6 +92,7 @@
..\packages\log4net.2.0.15\lib\net45\log4net.dll
+
False
C:\Users\Administrator\Desktop\dll\MWArray.dll
@@ -102,6 +103,12 @@
C:\Users\Administrator\Desktop\dll\playWaveNamespace.dll
+
+ ..\packages\ScottPlot.4.1.60\lib\net462\ScottPlot.dll
+
+
+ ..\packages\ScottPlot.WPF.4.1.60\lib\net48\ScottPlot.WPF.dll
+
..\packages\sqlite-net-pcl.1.8.116\lib\netstandard2.0\SQLite-net.dll
@@ -125,17 +132,26 @@
+
+ ..\packages\System.Drawing.Common.4.7.2\lib\net461\System.Drawing.Common.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.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll
..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll
+
+ ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll
+
+
+ ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll
+
diff --git a/Correlator/UserControlPage/FilterUserControl.xaml b/Correlator/UserControlPage/FilterUserControl.xaml
index fe46f06..ef3b2d3 100644
--- a/Correlator/UserControlPage/FilterUserControl.xaml
+++ b/Correlator/UserControlPage/FilterUserControl.xaml
@@ -4,7 +4,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:hc="https://handyorg.github.io/handycontrol"
- xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="768"
d:DesignWidth="1366"
@@ -146,10 +145,6 @@
-
-
-
-
@@ -177,27 +172,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -235,14 +215,7 @@
-
-
-
-
-
+
@@ -270,27 +243,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
- True
\ No newline at end of file
+ True
+ True
\ No newline at end of file
diff --git a/Correlator/App.config b/Correlator/App.config
index 38a06f9..480eed3 100644
--- a/Correlator/App.config
+++ b/Correlator/App.config
@@ -129,6 +129,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index e5597ff..ca5327d 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -92,6 +92,7 @@
..\packages\log4net.2.0.15\lib\net45\log4net.dll
+
False
C:\Users\Administrator\Desktop\dll\MWArray.dll
@@ -102,6 +103,12 @@
C:\Users\Administrator\Desktop\dll\playWaveNamespace.dll
+
+ ..\packages\ScottPlot.4.1.60\lib\net462\ScottPlot.dll
+
+
+ ..\packages\ScottPlot.WPF.4.1.60\lib\net48\ScottPlot.WPF.dll
+
..\packages\sqlite-net-pcl.1.8.116\lib\netstandard2.0\SQLite-net.dll
@@ -125,17 +132,26 @@
+
+ ..\packages\System.Drawing.Common.4.7.2\lib\net461\System.Drawing.Common.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.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll
..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll
+
+ ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll
+
+
+ ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll
+
diff --git a/Correlator/UserControlPage/FilterUserControl.xaml b/Correlator/UserControlPage/FilterUserControl.xaml
index fe46f06..ef3b2d3 100644
--- a/Correlator/UserControlPage/FilterUserControl.xaml
+++ b/Correlator/UserControlPage/FilterUserControl.xaml
@@ -4,7 +4,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:hc="https://handyorg.github.io/handycontrol"
- xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="768"
d:DesignWidth="1366"
@@ -146,10 +145,6 @@
-
-
-
-
@@ -177,27 +172,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -235,14 +215,7 @@
-
-
-
-
-
+
@@ -270,27 +243,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
- True
\ No newline at end of file
+ True
+ True
\ No newline at end of file
diff --git a/Correlator/App.config b/Correlator/App.config
index 38a06f9..480eed3 100644
--- a/Correlator/App.config
+++ b/Correlator/App.config
@@ -129,6 +129,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index e5597ff..ca5327d 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -92,6 +92,7 @@
..\packages\log4net.2.0.15\lib\net45\log4net.dll
+
False
C:\Users\Administrator\Desktop\dll\MWArray.dll
@@ -102,6 +103,12 @@
C:\Users\Administrator\Desktop\dll\playWaveNamespace.dll
+
+ ..\packages\ScottPlot.4.1.60\lib\net462\ScottPlot.dll
+
+
+ ..\packages\ScottPlot.WPF.4.1.60\lib\net48\ScottPlot.WPF.dll
+
..\packages\sqlite-net-pcl.1.8.116\lib\netstandard2.0\SQLite-net.dll
@@ -125,17 +132,26 @@
+
+ ..\packages\System.Drawing.Common.4.7.2\lib\net461\System.Drawing.Common.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.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll
..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll
+
+ ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll
+
+
+ ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll
+
diff --git a/Correlator/UserControlPage/FilterUserControl.xaml b/Correlator/UserControlPage/FilterUserControl.xaml
index fe46f06..ef3b2d3 100644
--- a/Correlator/UserControlPage/FilterUserControl.xaml
+++ b/Correlator/UserControlPage/FilterUserControl.xaml
@@ -4,7 +4,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:hc="https://handyorg.github.io/handycontrol"
- xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="768"
d:DesignWidth="1366"
@@ -146,10 +145,6 @@
-
-
-
-
@@ -177,27 +172,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -235,14 +215,7 @@
-
-
-
-
-
+
@@ -270,27 +243,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
_columnValuesA;
- set
- {
- _columnValuesA = value;
- RaisePropertyChanged(() => ColumnValuesA);
- }
- }
-
- private IChartValues _columnValuesB;
-
- public IChartValues ColumnValuesB
- {
- get => _columnValuesB;
- set
- {
- _columnValuesB = value;
- RaisePropertyChanged(() => ColumnValuesB);
- }
- }
-
#endregion
public FilterViewModel()
{
- var random = new Random();
- ColumnValuesA = new ChartValues();
- for (var i = 0; i < 100; i++)
- {
- var p = new ObservablePoint
- {
- X = i * 10,
- Y = random.Next(0, 100)
- };
-
- ColumnValuesA.Add(p);
- }
-
- ColumnValuesB = new ChartValues();
- for (var i = 0; i < 100; i++)
- {
- var p = new ObservablePoint
- {
- X = i * 10,
- Y = random.Next(0, 100)
- };
-
- ColumnValuesB.Add(p);
- }
-
GoBackCommand = new RelayCommand(() => { Messenger.Default.Send("", MessengerToken.RemoveFilter); });
StartCalculateCommand = new RelayCommand(() =>
{
diff --git a/Correlator.sln.DotSettings.user b/Correlator.sln.DotSettings.user
index 37a4f1f..15da52d 100644
--- a/Correlator.sln.DotSettings.user
+++ b/Correlator.sln.DotSettings.user
@@ -6,4 +6,5 @@
<Assembly Path="C:\Users\Administrator\Desktop\dll\国内\CorrelatorSingle.dll" />
<Assembly Path="D:\Code\Rider Projects\相关仪\测试版\correlator\packages\log4net.2.0.15\lib\net45\log4net.dll" />
</AssemblyExplorer>
- True
\ No newline at end of file
+ True
+ True
\ No newline at end of file
diff --git a/Correlator/App.config b/Correlator/App.config
index 38a06f9..480eed3 100644
--- a/Correlator/App.config
+++ b/Correlator/App.config
@@ -129,6 +129,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index e5597ff..ca5327d 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -92,6 +92,7 @@
..\packages\log4net.2.0.15\lib\net45\log4net.dll
+
False
C:\Users\Administrator\Desktop\dll\MWArray.dll
@@ -102,6 +103,12 @@
C:\Users\Administrator\Desktop\dll\playWaveNamespace.dll
+
+ ..\packages\ScottPlot.4.1.60\lib\net462\ScottPlot.dll
+
+
+ ..\packages\ScottPlot.WPF.4.1.60\lib\net48\ScottPlot.WPF.dll
+
..\packages\sqlite-net-pcl.1.8.116\lib\netstandard2.0\SQLite-net.dll
@@ -125,17 +132,26 @@
+
+ ..\packages\System.Drawing.Common.4.7.2\lib\net461\System.Drawing.Common.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.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll
..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll
+
+ ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll
+
+
+ ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll
+
diff --git a/Correlator/UserControlPage/FilterUserControl.xaml b/Correlator/UserControlPage/FilterUserControl.xaml
index fe46f06..ef3b2d3 100644
--- a/Correlator/UserControlPage/FilterUserControl.xaml
+++ b/Correlator/UserControlPage/FilterUserControl.xaml
@@ -4,7 +4,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:hc="https://handyorg.github.io/handycontrol"
- xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="768"
d:DesignWidth="1366"
@@ -146,10 +145,6 @@
-
-
-
-
@@ -177,27 +172,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -235,14 +215,7 @@
-
-
-
-
-
+
@@ -270,27 +243,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
_columnValuesA;
- set
- {
- _columnValuesA = value;
- RaisePropertyChanged(() => ColumnValuesA);
- }
- }
-
- private IChartValues _columnValuesB;
-
- public IChartValues ColumnValuesB
- {
- get => _columnValuesB;
- set
- {
- _columnValuesB = value;
- RaisePropertyChanged(() => ColumnValuesB);
- }
- }
-
#endregion
public FilterViewModel()
{
- var random = new Random();
- ColumnValuesA = new ChartValues();
- for (var i = 0; i < 100; i++)
- {
- var p = new ObservablePoint
- {
- X = i * 10,
- Y = random.Next(0, 100)
- };
-
- ColumnValuesA.Add(p);
- }
-
- ColumnValuesB = new ChartValues();
- for (var i = 0; i < 100; i++)
- {
- var p = new ObservablePoint
- {
- X = i * 10,
- Y = random.Next(0, 100)
- };
-
- ColumnValuesB.Add(p);
- }
-
GoBackCommand = new RelayCommand(() => { Messenger.Default.Send("", MessengerToken.RemoveFilter); });
StartCalculateCommand = new RelayCommand(() =>
{
diff --git a/Correlator/packages.config b/Correlator/packages.config
index 2d8de0d..681f3d4 100644
--- a/Correlator/packages.config
+++ b/Correlator/packages.config
@@ -1,20 +1,26 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file