From 856a23723afcc9d48c0f019dc33a259ac6c279ed Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 12 Jul 2018 14:03:47 +0300 Subject: Implemented continuous request timeouts. Implemented continuous request abort exception. Added log object for real time logs. Some work on PPC & Machine Studio. --- .../Tango.MachineStudio.UI/Resources/BuildDate.txt | 2 +- .../Tango.MachineStudio.UI/ViewModels/MainViewVM.cs | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt index 60d433d99..a64fd8b3d 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt @@ -1 +1 @@ -Wed 07/11/2018 16:02:40.40 +Thu 07/12/2018 13:56:47.00 diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs index 8eaa1f360..fd28d5b1e 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs @@ -444,6 +444,11 @@ namespace Tango.MachineStudio.UI.ViewModels { try { + if (!x.SelectedMachine.EnableDiagnostics) + { + x.SelectedMachine.EnableEmbeddedDebugging = false; + } + await x.SelectedMachine.Connect(); var authenticated = await x.SelectedMachine.As().Authenticate(login.Password); @@ -479,6 +484,11 @@ namespace Tango.MachineStudio.UI.ViewModels { try { + if (!x.SelectedMachine.EnableDiagnostics) + { + x.SelectedMachine.EnableEmbeddedDebugging = false; + } + await x.SelectedMachine.Connect(); x.SelectedMachine.SerialNumber = vm.SelectedMachine.SerialNumber; ApplicationManager.ConnectedMachine = x.SelectedMachine; -- cgit v1.3.1 From 8adbe1c2004903c3e60e9347c4b0ee8d09cd2457 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 12 Jul 2018 14:47:26 +0300 Subject: Temp --- Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 1572864 -> 1572864 bytes .../Converters/JobProgressToPositionConverter.cs | 7 +++---- .../Views/JobView.xaml | 1 - .../Views/MainView.xaml | 4 ++-- .../Tango.MachineStudio.UI/Resources/BuildDate.txt | 2 +- Software/Visual_Studio/Versioning/Core.cs | 4 ++-- Software/Visual_Studio/Versioning/MachineStudio.cs | 4 ++-- 8 files changed, 10 insertions(+), 12 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index c63ad1861..4b4f9a441 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index f36fd173c..39cd69c13 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/JobProgressToPositionConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/JobProgressToPositionConverter.cs index f6d2c4f42..4212c6908 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/JobProgressToPositionConverter.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/JobProgressToPositionConverter.cs @@ -15,14 +15,13 @@ namespace Tango.MachineStudio.Developer.Converters { try { - Job job = values[0] as Job; - - if (job != null) + if (values.Length == 3) { + double length = System.Convert.ToDouble(values[0]); double progress = System.Convert.ToDouble(values[1]); double parentElementWidth = System.Convert.ToDouble(values[2]); - return (progress / job.Length) * parentElementWidth; + return (progress / length) * parentElementWidth; } else { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml index 585a0cb6b..fde7ff275 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml @@ -59,7 +59,6 @@ - diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml index 14c4cd78a..3e76ccbd0 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml @@ -213,8 +213,8 @@ - - + + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt index a64fd8b3d..66ca876c6 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt @@ -1 +1 @@ -Thu 07/12/2018 13:56:47.00 +Thu 07/12/2018 14:40:14.74 diff --git a/Software/Visual_Studio/Versioning/Core.cs b/Software/Visual_Studio/Versioning/Core.cs index 20faee219..0c8bdf3f5 100644 --- a/Software/Visual_Studio/Versioning/Core.cs +++ b/Software/Visual_Studio/Versioning/Core.cs @@ -9,5 +9,5 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("Copyright © Twine LTD 2017")] [assembly: AssemblyTrademark("Twine LTD")] -[assembly: AssemblyVersion("1.0.0.5")] -[assembly: AssemblyFileVersion("1.0.0.5")] +[assembly: AssemblyVersion("1.0.0.6")] +[assembly: AssemblyFileVersion("1.0.0.6")] diff --git a/Software/Visual_Studio/Versioning/MachineStudio.cs b/Software/Visual_Studio/Versioning/MachineStudio.cs index 6046b1b47..df70e81bb 100644 --- a/Software/Visual_Studio/Versioning/MachineStudio.cs +++ b/Software/Visual_Studio/Versioning/MachineStudio.cs @@ -9,5 +9,5 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("Copyright © Twine LTD 2017")] [assembly: AssemblyTrademark("Twine LTD")] -[assembly: AssemblyVersion("1.0.0.11")] -[assembly: AssemblyFileVersion("1.0.0.11")] +[assembly: AssemblyVersion("1.0.0.12")] +[assembly: AssemblyFileVersion("1.0.0.12")] -- cgit v1.3.1