diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-01-19 16:44:58 +0200 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-01-19 16:44:58 +0200 |
| commit | c87dfdfc47a41fd5524dc9145350208295ca6714 (patch) | |
| tree | 824fb82b79b8486fa2be9d63cb29b8504a7ee5a9 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels | |
| parent | 601c03423f2f623d28df991ef6870e3d981ffe05 (diff) | |
| parent | 13b01cc6e2539dae0063f8cf23909e07982dfbb9 (diff) | |
| download | Tango-c87dfdfc47a41fd5524dc9145350208295ca6714.tar.gz Tango-c87dfdfc47a41fd5524dc9145350208295ca6714.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels')
| -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; |