diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-01-19 10:18:40 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-01-19 10:18:40 +0200 |
| commit | 1cb784093175d3d1aa73a8361156e9a5eaaf487c (patch) | |
| tree | bfc038bcdc44ba5448bd6a102686bc32a42990d3 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs | |
| parent | b746156be8be4c31303dad1b7fa8e7f18022c539 (diff) | |
| parent | b9c104e259ca24d2ae7ca82387209779fefddd34 (diff) | |
| download | Tango-1cb784093175d3d1aa73a8361156e9a5eaaf487c.tar.gz Tango-1cb784093175d3d1aa73a8361156e9a5eaaf487c.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs index 139d85493..ac54a714a 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs @@ -468,17 +468,17 @@ namespace Tango.MachineStudio.Technician.ViewModels TimeSpan delta = (DateTime.Now - _last_time); _last_time = DateTime.Now; - if (interval > 0) + if (data.ElapsedMilli > 0) { _diagnosticsNowTime = DateTime.ParseExact(data.DateTime, "MM/dd/yyyy HH:mm:ss.fff", null); //_diagnosticsNowTime.Add(TimeSpan.FromMilliseconds(data.ElapsedMilli)); //var now = _diagnosticsStartTime.Add(TimeSpan.FromMilliseconds(interval * _diagnostics_index)); - Debug.WriteLine("DeltaBase Before: " + delta_base); + //Debug.WriteLine("DeltaBase Before: " + delta_base); delta_base = _diagnosticsNowTime - _start_time; - Debug.WriteLine("DeltaBase After: " + delta_base); + //Debug.WriteLine("DeltaBase After: " + delta_base); - Debug.WriteLine("Delta Before: " + delta); + //Debug.WriteLine("Delta Before: " + delta); delta = TimeSpan.FromMilliseconds(data.ElapsedMilli); - Debug.WriteLine("Delta After: " + delta); + //Debug.WriteLine("Delta After: " + delta); } double delta_mili = delta.TotalMilliseconds; |