From bc2d3eb5ec8c7176627dcb8f5c02cc085b2db584 Mon Sep 17 00:00:00 2001 From: Roy Date: Sat, 20 Jan 2018 21:30:53 +0200 Subject: Implemented new CATS. Implemented Process Parameters View on DB Module. Implemented RML Process Parameters View on DB Module. Modified DB Module table initials letter casing. Moved observables generator to CLI. --- .../Modules/Tango.MachineStudio.DB/Controls/DbTableView.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Controls/DbTableView.xaml') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Controls/DbTableView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Controls/DbTableView.xaml index d1c62ed7e..f3e13e338 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Controls/DbTableView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Controls/DbTableView.xaml @@ -5,7 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" mc:Ignorable="d" - d:DesignHeight="720" d:DesignWidth="1280"> + d:DesignHeight="720" d:DesignWidth="1000" MaxWidth="1000"> -- cgit v1.3.1 From 68dca419117f9336d0fe21f9f04903906eeeef02 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Sun, 21 Jan 2018 13:24:53 +0200 Subject: Fixed max width of DB table view. Added FindAncestor on UIHelper. --- Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 8388608 -> 8388608 bytes .../Controls/DbTableView.xaml | 2 +- .../Managers/RegisteredView.cs | 6 ++++++ .../ObservablesEntitiesAdapter.cs | 2 +- .../Tango.SharedUI/Helpers/UIHelper.cs | 10 ++++++++++ .../Web/Tango.MachineService/App_Data/Tango.db | Bin 602112 -> 602112 bytes 7 files changed, 18 insertions(+), 2 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Controls/DbTableView.xaml') diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index dedfe10f7..51d4999ac 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 579e80a02..c011e8db7 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.DB/Controls/DbTableView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Controls/DbTableView.xaml index f3e13e338..d0f6b045a 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Controls/DbTableView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Controls/DbTableView.xaml @@ -5,7 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" mc:Ignorable="d" - d:DesignHeight="720" d:DesignWidth="1000" MaxWidth="1000"> + d:DesignHeight="720" d:DesignWidth="1300"> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Managers/RegisteredView.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Managers/RegisteredView.cs index cd53ff8d8..7f6d84ecf 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Managers/RegisteredView.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Managers/RegisteredView.cs @@ -43,6 +43,8 @@ namespace Tango.MachineStudio.DB.Managers View = view; + View.MaxWidth = 1500; + if (action != null) { AddCommand = new RelayCommand(action); @@ -54,6 +56,8 @@ namespace Tango.MachineStudio.DB.Managers if (!ViewsManager.DisplayedViews.Contains(this)) { ViewsManager.DisplayedViews.Add(this); + View.BringIntoView(); + View.Focus(); } else { @@ -76,6 +80,8 @@ namespace Tango.MachineStudio.DB.Managers header = header.ToUpper(); } + view.MaxWidth = 1500; + Header = header; View = view; } diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs index b78ebcdbc..ed834c2a5 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs @@ -28,7 +28,7 @@ namespace Tango.DAL.Observables private static ObservablesEntitiesAdapter _instance; /// - /// Gets the singelton instance. + /// Gets the singleton instance. /// public static ObservablesEntitiesAdapter Instance { diff --git a/Software/Visual_Studio/Tango.SharedUI/Helpers/UIHelper.cs b/Software/Visual_Studio/Tango.SharedUI/Helpers/UIHelper.cs index 945137316..547b63381 100644 --- a/Software/Visual_Studio/Tango.SharedUI/Helpers/UIHelper.cs +++ b/Software/Visual_Studio/Tango.SharedUI/Helpers/UIHelper.cs @@ -419,5 +419,15 @@ namespace Tango.SharedUI.Helpers return foundChild; } + + public static T FindAncestor(DependencyObject dependencyObject) where T : DependencyObject + { + var parent = VisualTreeHelper.GetParent(dependencyObject); + + if (parent == null) return null; + + var parentT = parent as T; + return parentT ?? FindAncestor(parent); + } } } diff --git a/Software/Visual_Studio/Web/Tango.MachineService/App_Data/Tango.db b/Software/Visual_Studio/Web/Tango.MachineService/App_Data/Tango.db index 147c930c6..0693a2623 100644 Binary files a/Software/Visual_Studio/Web/Tango.MachineService/App_Data/Tango.db and b/Software/Visual_Studio/Web/Tango.MachineService/App_Data/Tango.db differ -- cgit v1.3.1