From adeeb0ee759b886f902ace9bb68998e1ecf320a7 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Thu, 12 Mar 2020 17:45:30 +0200 Subject: Implement statistic values in Job runs View. Related Work Items: #2509 --- .../Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config index 59f92d6b9..d70e2180b 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config @@ -152,6 +152,10 @@ + + + + \ No newline at end of file -- cgit v1.3.1 From 0ff631f2cb5ef06b216846b2d1e6339949db97c2 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 19 Mar 2020 18:28:24 +0200 Subject: PPC v1.1.8 MS v4.1.5 --- .../Machine Studio Installer.aip | 10 ++++++--- .../Advanced Installer Projects/PPC Installer.aip | 25 +++++++++------------- .../Properties/AssemblyInfo.cs | 2 +- .../PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs | 2 +- .../Visual_Studio/PPC/Tango.PPC.UI/app.manifest | 2 +- 5 files changed, 20 insertions(+), 21 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip index 29f744ef6..9f9bf3aaa 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip @@ -16,10 +16,10 @@ - + - + @@ -303,6 +303,7 @@ + @@ -801,6 +802,8 @@ + + @@ -812,7 +815,7 @@ - + @@ -1275,6 +1278,7 @@ + diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip index c36b538c5..95770a1c1 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip @@ -18,10 +18,10 @@ - + - + @@ -200,13 +200,11 @@ - - - - + + @@ -438,10 +436,6 @@ - - - - @@ -453,6 +447,7 @@ + @@ -462,7 +457,7 @@ - + @@ -530,6 +525,8 @@ + + @@ -711,10 +708,6 @@ - - - - @@ -722,6 +715,8 @@ + + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index edf619f2f..cdd3a51e3 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("4.1.4.0")] +[assembly: AssemblyVersion("4.1.5.0")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs index 751a4c316..bbd22a233 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs @@ -8,4 +8,4 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango PPC Application")] -[assembly: AssemblyVersion("1.1.7.0")] +[assembly: AssemblyVersion("1.1.8.0")] diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index efc5f8179..d72e75011 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest @@ -16,7 +16,7 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - + -- cgit v1.3.1 From 2ebbed964bdc4aa1c2889d6c4c0521b3ba1562aa Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Sun, 22 Mar 2020 16:50:25 +0200 Subject: Dropped logging categories from settings on MS and PPC. Debug Logs Processing is done in real time from UI. --- .../ViewModels/ApplicationLogsViewVM.cs | 22 ++++++++++++++++------ .../Views/ApplicationLogsView.xaml | 2 +- .../MachineStudioSettings.cs | 6 ------ .../Tango.MachineStudio.UI/App.xaml.cs | 13 ------------- .../ViewModels/LoggingViewVM.cs | 19 +++++++++++++++++++ .../Tango.PPC.Technician/Views/LoggingView.xaml | 13 +++++++++++++ .../PPC/Tango.PPC.Common/PPCSettings.cs | 6 ------ .../Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs | 18 ------------------ 8 files changed, 49 insertions(+), 50 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs index 91cc677e0..a384c133d 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs @@ -59,14 +59,14 @@ namespace Tango.MachineStudio.Logging.ViewModels } } - private bool _displayDebug; + private bool _processDebugLogs; /// /// Gets or sets a value indicating whether display debug logs. /// - public bool DisplayDebug + public bool ProcessDebugLogs { - get { return _displayDebug; } - set { _displayDebug = value; RaisePropertyChangedAuto(); } + get { return _processDebugLogs; } + set { _processDebugLogs = value; RaisePropertyChangedAuto(); OnProcessDebugLogsChanged(); } } private LogItemBase _selectedLog; @@ -184,6 +184,18 @@ namespace Tango.MachineStudio.Logging.ViewModels _is_debug = LogManager.Categories.Contains(LogCategory.Debug); } + private void OnProcessDebugLogsChanged() + { + if (ProcessDebugLogs) + { + LogManager.Categories.Add(LogCategory.Debug); + } + else + { + LogManager.Categories.RemoveAll(x => x == LogCategory.Debug); + } + } + private void ApplyLogsFilter() { if ((_realTimePaused && _isRealTime) || !_isRealTime) @@ -204,8 +216,6 @@ namespace Tango.MachineStudio.Logging.ViewModels private void LogManager_NewLog(object sender, LogItemBase log) { - if (log.Category == LogCategory.Debug && !DisplayDebug) return; - if (!RealTimePaused) { InvokeUI(() => diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml index 4c291d0df..486c0751d 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml @@ -114,7 +114,7 @@ - Process Debug Logs + Enable Debug Logs diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs index 7a016b376..25dfc2dc8 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs @@ -56,11 +56,6 @@ namespace Tango.MachineStudio.Common /// public String LastVirtualMachineSerialNumber { get; set; } - /// - /// Gets or sets the logging categories. - /// - public List LoggingCategories { get; set; } - /// /// Gets or sets the last bounds. /// @@ -189,7 +184,6 @@ namespace Tango.MachineStudio.Common public MachineStudioSettings() { LastBounds = new Rect(); - LoggingCategories = new List(); DefaultIssueReportTags = new List(); StudioModulesBounds = new List(); Environment = WorkingEnvironment.Remote; diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs index cb17a5a83..2ea0ebd38 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs @@ -81,19 +81,6 @@ namespace Tango.MachineStudio.UI base.OnStartup(e); - LogManager.Categories.Clear(); - - - if (settings.LoggingCategories.Count == 0) - { - settings.LoggingCategories.Add(LogCategory.Critical); - settings.LoggingCategories.Add(LogCategory.Error); - settings.LoggingCategories.Add(LogCategory.Info); - settings.LoggingCategories.Add(LogCategory.Warning); - } - - LogManager.Categories.AddRange(settings.LoggingCategories); - exceptionTrapper = new WpfGlobalExceptionTrapper(); exceptionTrapper.Initialize(this); exceptionTrapper.ApplicationCrashed += ExceptionTrapper_ApplicationCrashed; diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/LoggingViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/LoggingViewVM.cs index 89ac7e87b..a0110b18a 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/LoggingViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/LoggingViewVM.cs @@ -68,6 +68,13 @@ namespace Tango.PPC.Technician.ViewModels set { _isPaused = value; RaisePropertyChangedAuto(); OnIsPausedChanged(); } } + private bool _processDebugLogs; + public bool ProcessDebugLogs + { + get { return _processDebugLogs; } + set { _processDebugLogs = value; RaisePropertyChangedAuto(); OnProcessDebugLogsChanged(); } + } + public RelayCommand ClearCommand { get; set; } public LoggingViewVM() @@ -112,6 +119,18 @@ namespace Tango.PPC.Technician.ViewModels }; } + private void OnProcessDebugLogsChanged() + { + if (ProcessDebugLogs) + { + LogManager.Categories.Add(LogCategory.Debug); + } + else + { + LogManager.Categories.RemoveAll(x => x == LogCategory.Debug); + } + } + private void OnIsPausedChanged() { foreach (var log in paused_logs) diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/LoggingView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/LoggingView.xaml index 07db49909..8393349ea 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/LoggingView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/LoggingView.xaml @@ -47,6 +47,19 @@ + + + + + + diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs index 71a417190..2c605ec36 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs @@ -20,11 +20,6 @@ namespace Tango.PPC.Common /// public class PPCSettings : SettingsBase { - /// - /// Gets or sets the logging categories. - /// - public List LoggingCategories { get; set; } - /// /// Gets or sets the state of the application. /// @@ -278,7 +273,6 @@ namespace Tango.PPC.Common EnableGradientGeneration = true; GradientGenerationResolution = 20; MachineScanningTimeoutSeconds = 20; - LoggingCategories = new List(); EmbeddedComPort = "COM10"; EmbeddedDeviceHint = "Tango USB Serial Port"; ExternalBridgePassword = "Aa123456"; diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs index 8ee8f6a1a..ff0b1018b 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs @@ -69,8 +69,6 @@ namespace Tango.PPC.UI exceptionTrapper.Initialize(this); exceptionTrapper.ApplicationCrashed += ExceptionTrapper_ApplicationCrashed; - LogManager.Categories.Clear(); - CoreSettings.DefaultDataSource = new DataSource() { Address = "localhost\\SQLEXPRESS", @@ -78,22 +76,6 @@ namespace Tango.PPC.UI IntegratedSecurity = true, }; - SettingsManager.Default.GetOrCreate(); - - var settings = SettingsManager.Default.GetOrCreate(); - - if (settings.LoggingCategories.Count == 0) - { - settings.LoggingCategories.Add(LogCategory.Critical); - settings.LoggingCategories.Add(LogCategory.Error); - settings.LoggingCategories.Add(LogCategory.Info); - settings.LoggingCategories.Add(LogCategory.Warning); - } - - settings.Save(); - - LogManager.Categories.AddRange(settings.LoggingCategories); - WebRequest.DefaultWebProxy = null; } -- cgit v1.3.1 From 3c4ff5beaa41a376ce42fa400d36d7a5a74330ec Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Sun, 22 Mar 2020 19:08:50 +0200 Subject: PPC v1.1.9 MS v4.1.6 --- .../Machine Studio Installer.aip | 6 +- .../PPC Installer-cache/cacheIndex.txt | Bin 52 -> 52 bytes .../Advanced Installer Projects/PPC Installer.aip | 24 ++++--- .../Properties/AssemblyInfo.cs | 2 +- .../PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs | 2 +- Software/Visual_Studio/Tango.sln | 75 ++------------------- 6 files changed, 26 insertions(+), 83 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip index 9f9bf3aaa..5f4ddcaa1 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip @@ -16,10 +16,10 @@ - + - + @@ -815,7 +815,7 @@ - + diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt index 993ced97e..a603ff06b 100644 Binary files a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt and b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt differ diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip index 95770a1c1..2bb218378 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip @@ -18,10 +18,10 @@ - + - + @@ -200,11 +200,13 @@ + + + + - - @@ -448,6 +450,10 @@ + + + + @@ -457,7 +463,7 @@ - + @@ -525,8 +531,6 @@ - - @@ -715,8 +719,10 @@ - - + + + + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index cdd3a51e3..c2cad8ab1 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("4.1.5.0")] +[assembly: AssemblyVersion("4.1.6.0")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs index bbd22a233..ce71639e7 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs @@ -8,4 +8,4 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango PPC Application")] -[assembly: AssemblyVersion("1.1.8.0")] +[assembly: AssemblyVersion("1.1.9.0")] diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln index 42e7d8f3d..bded5d0bb 100644 --- a/Software/Visual_Studio/Tango.sln +++ b/Software/Visual_Studio/Tango.sln @@ -369,8 +369,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.SystemInfo", "Tango.S EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.FileSystem", "Tango.FileSystem\Tango.FileSystem.csproj", "{C6EBBBBE-2123-44DC-AEF7-A0D47D736AC0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Priority Queue", "SideChains\Priority Queue\Priority Queue.csproj", "{1531C1EA-BD53-41D1-A34B-CFCDF79D2651}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution AppVeyor|Any CPU = AppVeyor|Any CPU @@ -9729,66 +9727,6 @@ Global {C6EBBBBE-2123-44DC-AEF7-A0D47D736AC0}.Release|x64.Build.0 = Release|Any CPU {C6EBBBBE-2123-44DC-AEF7-A0D47D736AC0}.Release|x86.ActiveCfg = Release|Any CPU {C6EBBBBE-2123-44DC-AEF7-A0D47D736AC0}.Release|x86.Build.0 = Release|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.AppVeyor|Any CPU.ActiveCfg = Release 2.0|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.AppVeyor|Any CPU.Build.0 = Release 2.0|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.AppVeyor|ARM.ActiveCfg = Release 2.0|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.AppVeyor|ARM.Build.0 = Release 2.0|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.AppVeyor|ARM64.ActiveCfg = Release 2.0|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.AppVeyor|ARM64.Build.0 = Release 2.0|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.AppVeyor|x64.ActiveCfg = Release 2.0|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.AppVeyor|x64.Build.0 = Release 2.0|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.AppVeyor|x86.ActiveCfg = Release 2.0|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.AppVeyor|x86.Build.0 = Release 2.0|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Debug|ARM.ActiveCfg = Debug|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Debug|ARM.Build.0 = Debug|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Debug|ARM64.Build.0 = Debug|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Debug|x64.ActiveCfg = Debug|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Debug|x64.Build.0 = Debug|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Debug|x86.ActiveCfg = Debug|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Debug|x86.Build.0 = Debug|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.DefaultBuild|Any CPU.ActiveCfg = Debug|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.DefaultBuild|Any CPU.Build.0 = Debug|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.DefaultBuild|ARM.ActiveCfg = Debug|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.DefaultBuild|ARM.Build.0 = Debug|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.DefaultBuild|ARM64.ActiveCfg = Debug|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.DefaultBuild|ARM64.Build.0 = Debug|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.DefaultBuild|x64.ActiveCfg = Debug|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.DefaultBuild|x64.Build.0 = Debug|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.DefaultBuild|x86.ActiveCfg = Debug|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.DefaultBuild|x86.Build.0 = Debug|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release 2.0|Any CPU.ActiveCfg = Release 2.0|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release 2.0|Any CPU.Build.0 = Release 2.0|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release 2.0|ARM.ActiveCfg = Release 2.0|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release 2.0|ARM.Build.0 = Release 2.0|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release 2.0|ARM64.ActiveCfg = Release 2.0|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release 2.0|ARM64.Build.0 = Release 2.0|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release 2.0|x64.ActiveCfg = Release 2.0|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release 2.0|x64.Build.0 = Release 2.0|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release 2.0|x86.ActiveCfg = Release 2.0|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release 2.0|x86.Build.0 = Release 2.0|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release 4.5|Any CPU.ActiveCfg = Release 4.5|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release 4.5|Any CPU.Build.0 = Release 4.5|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release 4.5|ARM.ActiveCfg = Release 4.5|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release 4.5|ARM.Build.0 = Release 4.5|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release 4.5|ARM64.ActiveCfg = Release 4.5|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release 4.5|ARM64.Build.0 = Release 4.5|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release 4.5|x64.ActiveCfg = Release 4.5|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release 4.5|x64.Build.0 = Release 4.5|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release 4.5|x86.ActiveCfg = Release 4.5|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release 4.5|x86.Build.0 = Release 4.5|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release|Any CPU.Build.0 = Release|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release|ARM.ActiveCfg = Release|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release|ARM.Build.0 = Release|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release|ARM64.ActiveCfg = Release|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release|ARM64.Build.0 = Release|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release|x64.ActiveCfg = Release|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release|x64.Build.0 = Release|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release|x86.ActiveCfg = Release|Any CPU - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -9911,15 +9849,14 @@ Global {834C81C3-09B5-45D7-BE12-E7D1E6655A7C} = {004337EB-0761-4D30-B9F5-AE6E1CFC6013} {866B916A-207C-43F0-B403-7C4A820C2E11} = {4EE6DBA1-71BC-49E2-8DC7-266487E61050} {A07E6CB4-0132-4EB1-9A38-C8C057884DC2} = {EC62BC9C-F2FE-4333-B7E4-110E38D43958} - {1531C1EA-BD53-41D1-A34B-CFCDF79D2651} = {EC62BC9C-F2FE-4333-B7E4-110E38D43958} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6} - BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear - BuildVersion_UpdateAssemblyVersion = True - BuildVersion_UpdateFileVersion = False - BuildVersion_StartDate = 2000/1/1 - BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs BuildVersion_UseGlobalSettings = False + BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs + BuildVersion_StartDate = 2000/1/1 + BuildVersion_UpdateFileVersion = False + BuildVersion_UpdateAssemblyVersion = True + BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear + SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6} EndGlobalSection EndGlobal -- cgit v1.3.1 From 0826ff68565e476c5990945ed0cf8dacb2feee5b Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Wed, 25 Mar 2020 14:36:26 +0200 Subject: Machine studio. Add format to dataPicker. Related Work Items: #2662 --- .../MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs index 915deb484..28d0d84db 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs @@ -1,8 +1,10 @@ using MahApps.Metro.Controls; using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Text; +using System.Threading; using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; @@ -81,6 +83,10 @@ namespace Tango.MachineStudio.UI this.Loaded += MainWindow_Loaded; this.SizeChanged += MainWindow_SizeChanged; ContentRendered += MainWindow_ContentRendered; + + CultureInfo ci = CultureInfo.CreateSpecificCulture(CultureInfo.CurrentCulture.Name); + ci.DateTimeFormat.ShortDatePattern = "MMM dd yyyy"; + Thread.CurrentThread.CurrentCulture = ci; } private void MainWindow_ContentRendered(object sender, EventArgs e) -- cgit v1.3.1