diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..687debd 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,7 +5,7 @@
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{13A08909-E201-42D6-B44E-2FFD8A900B79}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -23,10 +23,10 @@
{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
- {6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
- {6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
- {6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
- {6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
+ {13A08909-E201-42D6-B44E-2FFD8A900B79}.Debug|Any CPU.ActiveCfg = Debug
+ {13A08909-E201-42D6-B44E-2FFD8A900B79}.Debug|x64.ActiveCfg = Debug
+ {13A08909-E201-42D6-B44E-2FFD8A900B79}.Release|Any CPU.ActiveCfg = Release
+ {13A08909-E201-42D6-B44E-2FFD8A900B79}.Release|x64.ActiveCfg = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..687debd 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,7 +5,7 @@
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{13A08909-E201-42D6-B44E-2FFD8A900B79}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -23,10 +23,10 @@
{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
- {6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
- {6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
- {6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
- {6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
+ {13A08909-E201-42D6-B44E-2FFD8A900B79}.Debug|Any CPU.ActiveCfg = Debug
+ {13A08909-E201-42D6-B44E-2FFD8A900B79}.Debug|x64.ActiveCfg = Debug
+ {13A08909-E201-42D6-B44E-2FFD8A900B79}.Release|Any CPU.ActiveCfg = Release
+ {13A08909-E201-42D6-B44E-2FFD8A900B79}.Release|x64.ActiveCfg = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Correlator/App.config b/Correlator/App.config
index 8c30460..38a06f9 100644
--- a/Correlator/App.config
+++ b/Correlator/App.config
@@ -36,9 +36,9 @@
-
+
-
+
@@ -54,7 +54,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
@@ -84,7 +84,7 @@
-
+
@@ -99,7 +99,7 @@
-
+
diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..687debd 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,7 +5,7 @@
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{13A08909-E201-42D6-B44E-2FFD8A900B79}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -23,10 +23,10 @@
{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
- {6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
- {6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
- {6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
- {6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
+ {13A08909-E201-42D6-B44E-2FFD8A900B79}.Debug|Any CPU.ActiveCfg = Debug
+ {13A08909-E201-42D6-B44E-2FFD8A900B79}.Debug|x64.ActiveCfg = Debug
+ {13A08909-E201-42D6-B44E-2FFD8A900B79}.Release|Any CPU.ActiveCfg = Release
+ {13A08909-E201-42D6-B44E-2FFD8A900B79}.Release|x64.ActiveCfg = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Correlator/App.config b/Correlator/App.config
index 8c30460..38a06f9 100644
--- a/Correlator/App.config
+++ b/Correlator/App.config
@@ -36,9 +36,9 @@
-
+
-
+
@@ -54,7 +54,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
@@ -84,7 +84,7 @@
-
+
@@ -99,7 +99,7 @@
-
+
diff --git a/Correlator/View/HomePageWindow.xaml b/Correlator/View/HomePageWindow.xaml
index 0e1b61a..4683b29 100644
--- a/Correlator/View/HomePageWindow.xaml
+++ b/Correlator/View/HomePageWindow.xaml
@@ -205,6 +205,7 @@
Grid.Row="1"
Width="1100"
VerticalAlignment="Bottom"
+ FontSize="20"
Foreground="#545454"
Text="{Binding MaxCorrelationCoefficient}" />
diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..687debd 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,7 +5,7 @@
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{13A08909-E201-42D6-B44E-2FFD8A900B79}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -23,10 +23,10 @@
{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
- {6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
- {6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
- {6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
- {6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
+ {13A08909-E201-42D6-B44E-2FFD8A900B79}.Debug|Any CPU.ActiveCfg = Debug
+ {13A08909-E201-42D6-B44E-2FFD8A900B79}.Debug|x64.ActiveCfg = Debug
+ {13A08909-E201-42D6-B44E-2FFD8A900B79}.Release|Any CPU.ActiveCfg = Release
+ {13A08909-E201-42D6-B44E-2FFD8A900B79}.Release|x64.ActiveCfg = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Correlator/App.config b/Correlator/App.config
index 8c30460..38a06f9 100644
--- a/Correlator/App.config
+++ b/Correlator/App.config
@@ -36,9 +36,9 @@
-
+
-
+
@@ -54,7 +54,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
@@ -84,7 +84,7 @@
-
+
@@ -99,7 +99,7 @@
-
+
diff --git a/Correlator/View/HomePageWindow.xaml b/Correlator/View/HomePageWindow.xaml
index 0e1b61a..4683b29 100644
--- a/Correlator/View/HomePageWindow.xaml
+++ b/Correlator/View/HomePageWindow.xaml
@@ -205,6 +205,7 @@
Grid.Row="1"
Width="1100"
VerticalAlignment="Bottom"
+ FontSize="20"
Foreground="#545454"
Text="{Binding MaxCorrelationCoefficient}" />
diff --git a/Correlator/ViewModel/HomePageViewModel.cs b/Correlator/ViewModel/HomePageViewModel.cs
index d7ea7f0..98fcb7e 100644
--- a/Correlator/ViewModel/HomePageViewModel.cs
+++ b/Correlator/ViewModel/HomePageViewModel.cs
@@ -780,27 +780,34 @@
var locateTimes = configModel.LocateTimes;
//计算
- var task = new Task(() => CalculateData(it));
- task.Start();
-
- //异步保存定位数据
- var fileName = locateDataDir + "\\测试数据." + locateTimes + "."
- + DateTime.Now.ToString("HHmmss") + ".txt";
- StringUtil.SaveLocateData(it, fileName);
- LogWithConsole.WriteLine("定位数据路径:" + fileName, "HomePageViewModel");
-
- //同步保存截图,需要等待Task出结果并且渲染完成,才能保存截图
- _snapShotPath = locateDataDir + "\\快照." + configModel.LocateTimes + "." +
- DateTime.Now.ToString("HHmmss") + ".png";
- if (task.Result)
+ try
{
- _snapShotTimer.Start();
- }
+ var task = new Task(() => CalculateData(it));
+ task.Start();
- //插入新纪录
- configModel.Pipe++;
- configModel.LocateTimes++;
- manager.Insert(configModel);
+ //异步保存定位数据
+ var fileName = locateDataDir + "\\测试数据." + locateTimes + "."
+ + DateTime.Now.ToString("HHmmss") + ".txt";
+ StringUtil.SaveLocateData(it, fileName);
+ LogWithConsole.WriteLine("定位数据路径:" + fileName, "HomePageViewModel");
+
+ //同步保存截图,需要等待Task出结果并且渲染完成,才能保存截图
+ _snapShotPath = locateDataDir + "\\快照." + configModel.LocateTimes + "." +
+ DateTime.Now.ToString("HHmmss") + ".png";
+ if (task.Result)
+ {
+ _snapShotTimer.Start();
+ }
+
+ //插入新纪录
+ configModel.Pipe++;
+ configModel.LocateTimes++;
+ manager.Insert(configModel);
+ }
+ catch (Exception e)
+ {
+ LogWithConsole.WriteLine(e.Message, "HomePageViewModel");
+ }
}
});
}