diff --git a/Correlator/Util/StringUtil.cs b/Correlator/Util/StringUtil.cs
index bab8bbf..616aeea 100644
--- a/Correlator/Util/StringUtil.cs
+++ b/Correlator/Util/StringUtil.cs
@@ -29,24 +29,20 @@
/// 完整路径
public static void SaveLocateData(CorrelatorDataModel it, string fileName)
{
- var locateData = DateTime.Now.ToString(CultureInfo.InvariantCulture) + "\r\n";
+ var builder = new StringBuilder();
+ builder.Append(DateTime.Now.ToString(CultureInfo.InvariantCulture)).Append("\r\n");
foreach (var d in it.LeftDeviceDataArray)
{
- locateData += d.AppendEndZero() + "\r\n";
+ builder.Append(d.AppendEndZero()).Append("\r\n");
}
- locateData += "===============" + "\r\n";
+ builder.Append("===============").Append("\r\n");
foreach (var d in it.RightDeviceDataArray)
{
- locateData += d.AppendEndZero() + "\r\n";
+ builder.Append(d.AppendEndZero()).Append("\r\n");
}
- var data = Encoding.Default.GetBytes(locateData);
- var fileStream = new FileStream(fileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
- fileStream.Position = fileStream.Length;
- fileStream.Write(data, 0, data.Length);
- fileStream.Flush();
- fileStream.Close();
+ File.AppendAllText(fileName, builder.ToString());
}
public static byte Year => byte.Parse(DateTime.Now.ToString("yy"));
diff --git a/Correlator/Util/StringUtil.cs b/Correlator/Util/StringUtil.cs
index bab8bbf..616aeea 100644
--- a/Correlator/Util/StringUtil.cs
+++ b/Correlator/Util/StringUtil.cs
@@ -29,24 +29,20 @@
/// 完整路径
public static void SaveLocateData(CorrelatorDataModel it, string fileName)
{
- var locateData = DateTime.Now.ToString(CultureInfo.InvariantCulture) + "\r\n";
+ var builder = new StringBuilder();
+ builder.Append(DateTime.Now.ToString(CultureInfo.InvariantCulture)).Append("\r\n");
foreach (var d in it.LeftDeviceDataArray)
{
- locateData += d.AppendEndZero() + "\r\n";
+ builder.Append(d.AppendEndZero()).Append("\r\n");
}
- locateData += "===============" + "\r\n";
+ builder.Append("===============").Append("\r\n");
foreach (var d in it.RightDeviceDataArray)
{
- locateData += d.AppendEndZero() + "\r\n";
+ builder.Append(d.AppendEndZero()).Append("\r\n");
}
- var data = Encoding.Default.GetBytes(locateData);
- var fileStream = new FileStream(fileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
- fileStream.Position = fileStream.Length;
- fileStream.Write(data, 0, data.Length);
- fileStream.Flush();
- fileStream.Close();
+ File.AppendAllText(fileName, builder.ToString());
}
public static byte Year => byte.Parse(DateTime.Now.ToString("yy"));
diff --git a/Correlator/View/MainWindow.xaml b/Correlator/View/MainWindow.xaml
index a0cc8c1..c8c99a1 100644
--- a/Correlator/View/MainWindow.xaml
+++ b/Correlator/View/MainWindow.xaml
@@ -27,7 +27,7 @@
Background="Transparent"
BorderBrush="Blue"
BorderThickness="1.5"
- Content="3s丨跳过"
+ Content="5s丨跳过"
FontFamily="仿宋"
FontSize="16"
FontWeight="Bold"
diff --git a/Correlator/Util/StringUtil.cs b/Correlator/Util/StringUtil.cs
index bab8bbf..616aeea 100644
--- a/Correlator/Util/StringUtil.cs
+++ b/Correlator/Util/StringUtil.cs
@@ -29,24 +29,20 @@
/// 完整路径
public static void SaveLocateData(CorrelatorDataModel it, string fileName)
{
- var locateData = DateTime.Now.ToString(CultureInfo.InvariantCulture) + "\r\n";
+ var builder = new StringBuilder();
+ builder.Append(DateTime.Now.ToString(CultureInfo.InvariantCulture)).Append("\r\n");
foreach (var d in it.LeftDeviceDataArray)
{
- locateData += d.AppendEndZero() + "\r\n";
+ builder.Append(d.AppendEndZero()).Append("\r\n");
}
- locateData += "===============" + "\r\n";
+ builder.Append("===============").Append("\r\n");
foreach (var d in it.RightDeviceDataArray)
{
- locateData += d.AppendEndZero() + "\r\n";
+ builder.Append(d.AppendEndZero()).Append("\r\n");
}
- var data = Encoding.Default.GetBytes(locateData);
- var fileStream = new FileStream(fileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
- fileStream.Position = fileStream.Length;
- fileStream.Write(data, 0, data.Length);
- fileStream.Flush();
- fileStream.Close();
+ File.AppendAllText(fileName, builder.ToString());
}
public static byte Year => byte.Parse(DateTime.Now.ToString("yy"));
diff --git a/Correlator/View/MainWindow.xaml b/Correlator/View/MainWindow.xaml
index a0cc8c1..c8c99a1 100644
--- a/Correlator/View/MainWindow.xaml
+++ b/Correlator/View/MainWindow.xaml
@@ -27,7 +27,7 @@
Background="Transparent"
BorderBrush="Blue"
BorderThickness="1.5"
- Content="3s丨跳过"
+ Content="5s丨跳过"
FontFamily="仿宋"
FontSize="16"
FontWeight="Bold"
diff --git a/Correlator/ViewModel/HomePageProViewModel.cs b/Correlator/ViewModel/HomePageProViewModel.cs
index 3f7b697..6b25b90 100644
--- a/Correlator/ViewModel/HomePageProViewModel.cs
+++ b/Correlator/ViewModel/HomePageProViewModel.cs
@@ -533,15 +533,6 @@
//开始计算就不收集收据了
FlowStatus.CanCollectData = false;
- //异步保存定位数据
- // var fileName = _locateDataDir + "\\测试数据." + _locateTimes + "."
- // + DateTime.Now.ToString("HHmmss") + ".txt";
- // var isSaveSuccess = await SaveSaveLocateData(it, fileName);
- // if (isSaveSuccess)
- // {
- // "HomePageViewModel".WriteLog("定位数据路径：" + fileName);
- // }
-
//异步计算数据
var array = await GetCalculateResult(it);
if (array == null) return;
@@ -551,19 +542,12 @@
Snr = snr.ToString("0.0") + ":1";
RedTransmitterDistance = Convert.ToDouble(array[1].ToString()); //距离A
BlueTransmitterDistance = Convert.ToDouble(array[2].ToString()); //距离B
- //最大相关系数
- var maxCorrelationCoefficient = Convert.ToDouble(array[3].ToString());
-
- //时间差
- var timeDiff = Convert.ToDouble(array[6].ToString());
//将数据发送到HomePageWindow.xaml.cs页面进行渲染
Messenger.Default.Send(array, MessengerToken.RenderOscillogram);
var maxFreLowOut = Convert.ToInt32(array[6].ToString()); //低频
var maxFreHighOut = Convert.ToInt32(array[7].ToString()); //高频
- var flag = Convert.ToBoolean(Convert.ToInt32(array[8].ToString())); //是否泄漏
- var totalNum = Convert.ToInt32(array[9].ToString()); //总的调用次数
FilterValue = maxFreLowOut + " ~ " + maxFreHighOut + "Hz";
@@ -852,11 +836,6 @@
FlowStatus.CanCollectData = false;
}
- private Task SaveSaveLocateData(CorrelatorDataModel dataModel, string fileName)
- {
- return Task.Run(() => StringUtil.SaveLocateData(dataModel, fileName));
- }
-
///
/// Matlab计算过程
///
@@ -866,6 +845,11 @@
{
var task = Task.Run(delegate
{
+ //异步保存定位数据
+ var fileName = _locateDataDir + "\\测试数据." + _locateTimes + "." + DateTime.Now.ToString("HHmmss") + ".txt";
+ StringUtil.SaveLocateData(dataModel, fileName);
+ "HomePageViewModel".WriteLog("定位数据路径：" + fileName);
+
var array = _correlator.locating(11,
(MWNumericArray)dataModel.LeftDeviceDataArray, (MWNumericArray)dataModel.RightDeviceDataArray,
Constant.SamplingRate,