提交 28dd7768 编写于 作者: cdy816's avatar cdy816

手动更新历史Bug修改

上级 74dbeca8
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"profiles": { "profiles": {
"DBInRun": { "DBInRun": {
"commandName": "Executable", "commandName": "Executable",
"executablePath": "C:\\Users\\chongdaoyang\\source\\repos\\mars\\Output\\DBInRun.exe" "executablePath": "C:\\Users\\cdy81\\source\\repos\\mars\\Output\\DBInRun.exe"
} }
} }
} }
\ No newline at end of file
...@@ -1576,9 +1576,13 @@ namespace Cdy.Tag ...@@ -1576,9 +1576,13 @@ namespace Cdy.Tag
byte[] datas = source.ReadBytes(datasize); byte[] datas = source.ReadBytes(datasize);
var timers = DeCompressTimers(datas, count); var timers = DeCompressTimers(datas, count);
DateTime preTimer = DateTime.MinValue;
for (int i = 0; i < timers.Count; i++) for (int i = 0; i < timers.Count; i++)
{ {
var vtime = sTime.AddMilliseconds(timers[i] * timeTick); var vtime = sTime.AddMilliseconds(timers[i] * timeTick);
if (vtime < preTimer) continue;
if (vtime >= startTime && vtime < endTime) if (vtime >= startTime && vtime < endTime)
re.Add(i, vtime); re.Add(i, vtime);
else if(vtime>endTime && (vtime - endTime).TotalMilliseconds< timeTick) else if(vtime>endTime && (vtime - endTime).TotalMilliseconds< timeTick)
...@@ -1589,6 +1593,7 @@ namespace Cdy.Tag ...@@ -1589,6 +1593,7 @@ namespace Cdy.Tag
{ {
re.Add(i, vtime); re.Add(i, vtime);
} }
preTimer = vtime;
} }
valueCount = count; valueCount = count;
return re; return re;
......
...@@ -1569,6 +1569,7 @@ namespace Cdy.Tag ...@@ -1569,6 +1569,7 @@ namespace Cdy.Tag
hb.ValueAddress = valueOffset; hb.ValueAddress = valueOffset;
hb.QualityAddress = qulityOffset; hb.QualityAddress = qulityOffset;
hb.Id = (int)id; hb.Id = (int)id;
hb.CurrentCount = 0;
datacach.Add(time, hb); datacach.Add(time, hb);
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"profiles": { "profiles": {
"HisDataTools": { "HisDataTools": {
"commandName": "Executable", "commandName": "Executable",
"executablePath": "C:\\Users\\chongdaoyang\\source\\repos\\mars\\Output\\HisDataTools.exe" "executablePath": "C:\\Users\\cdy81\\source\\repos\\mars\\Output\\HisDataTools.exe"
} }
} }
} }
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册