diff --git a/Correlator/Properties/AssemblyInfo.cs b/Correlator/Properties/AssemblyInfo.cs
index a1cf2b5..7c66752 100644
--- a/Correlator/Properties/AssemblyInfo.cs
+++ b/Correlator/Properties/AssemblyInfo.cs
@@ -49,6 +49,6 @@
// 可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.2")]
-[assembly: AssemblyFileVersion("1.0.0.2")]
+[assembly: AssemblyVersion("1.0.0.3")]
+[assembly: AssemblyFileVersion("1.0.0.3")]
[assembly: log4net.Config.XmlConfigurator(Watch = true)]
\ No newline at end of file
diff --git a/Correlator/Properties/AssemblyInfo.cs b/Correlator/Properties/AssemblyInfo.cs
index a1cf2b5..7c66752 100644
--- a/Correlator/Properties/AssemblyInfo.cs
+++ b/Correlator/Properties/AssemblyInfo.cs
@@ -49,6 +49,6 @@
// 可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.2")]
-[assembly: AssemblyFileVersion("1.0.0.2")]
+[assembly: AssemblyVersion("1.0.0.3")]
+[assembly: AssemblyFileVersion("1.0.0.3")]
[assembly: log4net.Config.XmlConfigurator(Watch = true)]
\ No newline at end of file
diff --git a/Correlator/Util/MethodExtensions.cs b/Correlator/Util/MethodExtensions.cs
index 45a4008..6e43b49 100644
--- a/Correlator/Util/MethodExtensions.cs
+++ b/Correlator/Util/MethodExtensions.cs
@@ -299,7 +299,7 @@
var oidBytes = new byte[4];
Array.Copy(tagBytes, i, oidBytes, 0, 4);
var oid = oidBytes.ConvertToString();
-
+
//value域的长度
var tagValueBytes = new byte[2];
Array.Copy(tagBytes, i + 4, tagValueBytes, 0, 2);
@@ -504,6 +504,11 @@
}
///
+ /// 每个音频数据
+ ///
+ private static string _perData;
+
+ ///
/// 保存听音上传的原始数据
///
///
@@ -534,18 +539,18 @@
var builder = new StringBuilder();
for (var i = 0; i < dataArray.Count; i++)
{
- var per = BitConverter.ToString(dataArray[i]).Replace("-", "");
+ _perData = BitConverter.ToString(dataArray[i]);
if (i == dataArray.Count - 1)
{
- builder.Append(per);
+ builder.Append(_perData);
}
else
{
- builder.Append(per).Append("\r\n");
+ builder.Append(_perData).Append("\r\n");
}
}
- File.AppendAllText(fileName, builder.ToString());
+ File.AppendAllText(fileName, builder.Replace("-", "").ToString());
//插入新纪录
configModel.Pipe++;
diff --git a/Correlator/Properties/AssemblyInfo.cs b/Correlator/Properties/AssemblyInfo.cs
index a1cf2b5..7c66752 100644
--- a/Correlator/Properties/AssemblyInfo.cs
+++ b/Correlator/Properties/AssemblyInfo.cs
@@ -49,6 +49,6 @@
// 可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.2")]
-[assembly: AssemblyFileVersion("1.0.0.2")]
+[assembly: AssemblyVersion("1.0.0.3")]
+[assembly: AssemblyFileVersion("1.0.0.3")]
[assembly: log4net.Config.XmlConfigurator(Watch = true)]
\ No newline at end of file
diff --git a/Correlator/Util/MethodExtensions.cs b/Correlator/Util/MethodExtensions.cs
index 45a4008..6e43b49 100644
--- a/Correlator/Util/MethodExtensions.cs
+++ b/Correlator/Util/MethodExtensions.cs
@@ -299,7 +299,7 @@
var oidBytes = new byte[4];
Array.Copy(tagBytes, i, oidBytes, 0, 4);
var oid = oidBytes.ConvertToString();
-
+
//value域的长度
var tagValueBytes = new byte[2];
Array.Copy(tagBytes, i + 4, tagValueBytes, 0, 2);
@@ -504,6 +504,11 @@
}
///
+ /// 每个音频数据
+ ///
+ private static string _perData;
+
+ ///
/// 保存听音上传的原始数据
///
///
@@ -534,18 +539,18 @@
var builder = new StringBuilder();
for (var i = 0; i < dataArray.Count; i++)
{
- var per = BitConverter.ToString(dataArray[i]).Replace("-", "");
+ _perData = BitConverter.ToString(dataArray[i]);
if (i == dataArray.Count - 1)
{
- builder.Append(per);
+ builder.Append(_perData);
}
else
{
- builder.Append(per).Append("\r\n");
+ builder.Append(_perData).Append("\r\n");
}
}
- File.AppendAllText(fileName, builder.ToString());
+ File.AppendAllText(fileName, builder.Replace("-", "").ToString());
//插入新纪录
configModel.Pipe++;
diff --git a/Correlator/Views/MainWindow.xaml.cs b/Correlator/Views/MainWindow.xaml.cs
index 63aa8ef..57a2282 100644
--- a/Correlator/Views/MainWindow.xaml.cs
+++ b/Correlator/Views/MainWindow.xaml.cs
@@ -87,10 +87,8 @@
var maxCorrelationCoefficient = Convert.ToDouble(array[3].ToString());
//柱状图横坐标集合
var xDoubles = ((MWNumericArray)array[5]).GetArray();
- // xDoubles.SaveArrayToFile("C:\\Users\\Administrator\\Desktop\\X轴数据.txt");
//柱状图纵坐标集合
var yDoubles = ((MWNumericArray)array[4]).GetArray();
- // yDoubles.SaveArrayToFile("C:\\Users\\Administrator\\Desktop\\Y轴数据.txt");
ScottplotView.Plot.SetAxisLimits(0, xDoubles.Last(), 0, maxCorrelationCoefficient);
ScottplotView.Plot.AddFill(