From aeebb8d47e1d78b50d9ae5afd9df6eaf9765ed87 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 8 Jan 2019 17:59:31 +0200 Subject: Started working on power module... --- Software/DB/PPC/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/PPC/Tango_log.ldf | Bin 53673984 -> 53673984 bytes ...9164c73-gaming-tablet-stroke-icon-by-vexels.png | Bin 0 -> 64315 bytes Software/Graphics/Mobile/power-module.png | Bin 0 -> 3212 bytes Software/Graphics/Mobile/tablet.png | Bin 0 -> 3768 bytes .../PPC/Modules/Tango.PPC.Power/App.xaml | 11 ++ .../PPC/Modules/Tango.PPC.Power/Images/machine.png | Bin 0 -> 37326 bytes .../Tango.PPC.Power/Images/power-module.png | Bin 0 -> 3212 bytes .../PPC/Modules/Tango.PPC.Power/Images/tablet.png | Bin 0 -> 3768 bytes .../PPC/Modules/Tango.PPC.Power/PowerModule.cs | 84 ++++++++++ .../Tango.PPC.Power/Properties/AssemblyInfo.cs | 20 +++ .../Properties/Resources.Designer.cs | 63 ++++++++ .../Tango.PPC.Power/Properties/Resources.resx | 117 ++++++++++++++ .../Properties/Settings.Designer.cs | 26 ++++ .../Tango.PPC.Power/Properties/Settings.settings | 7 + .../Modules/Tango.PPC.Power/Tango.PPC.Power.csproj | 172 +++++++++++++++++++++ .../Modules/Tango.PPC.Power/ViewModelLocator.cs | 32 ++++ .../Tango.PPC.Power/ViewModels/MainViewVM.cs | 24 +++ .../Modules/Tango.PPC.Power/Views/MainView.xaml | 75 +++++++++ .../Modules/Tango.PPC.Power/Views/MainView.xaml.cs | 28 ++++ .../PPC/Modules/Tango.PPC.Power/app.config | 61 ++++++++ .../PPC/Modules/Tango.PPC.Power/packages.config | 7 + .../PPC/Tango.PPC.Common/IPPCModule.cs | 5 + .../PPC/Tango.PPC.Common/PPCModuleAttribute.cs | 16 ++ .../PPC/Tango.PPC.Common/PPCModuleBase.cs | 9 ++ .../PPC/Tango.PPC.UI/Tango.PPC.UI.csproj | 6 +- .../PPC/Tango.PPC.UI/Views/LayoutView.xaml | 29 +++- .../Visual_Studio/Tango.BL/Builders/JobBuilder.cs | 2 +- Software/Visual_Studio/Tango.sln | 55 ++++++- 29 files changed, 835 insertions(+), 14 deletions(-) create mode 100644 Software/Graphics/Mobile/063b918959b2e0b74d0b8ccc29164c73-gaming-tablet-stroke-icon-by-vexels.png create mode 100644 Software/Graphics/Mobile/power-module.png create mode 100644 Software/Graphics/Mobile/tablet.png create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/App.xaml create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Images/machine.png create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Images/power-module.png create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Images/tablet.png create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/PowerModule.cs create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Properties/AssemblyInfo.cs create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Properties/Resources.Designer.cs create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Properties/Resources.resx create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Properties/Settings.Designer.cs create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Properties/Settings.settings create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Tango.PPC.Power.csproj create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/ViewModelLocator.cs create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/ViewModels/MainViewVM.cs create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Views/MainView.xaml create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Views/MainView.xaml.cs create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/app.config create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/packages.config (limited to 'Software') diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf index 9416e9791..da2a4f089 100644 Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf index 5e303d76f..504852cbf 100644 Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ diff --git a/Software/Graphics/Mobile/063b918959b2e0b74d0b8ccc29164c73-gaming-tablet-stroke-icon-by-vexels.png b/Software/Graphics/Mobile/063b918959b2e0b74d0b8ccc29164c73-gaming-tablet-stroke-icon-by-vexels.png new file mode 100644 index 000000000..a49dbdd14 Binary files /dev/null and b/Software/Graphics/Mobile/063b918959b2e0b74d0b8ccc29164c73-gaming-tablet-stroke-icon-by-vexels.png differ diff --git a/Software/Graphics/Mobile/power-module.png b/Software/Graphics/Mobile/power-module.png new file mode 100644 index 000000000..9d993ab83 Binary files /dev/null and b/Software/Graphics/Mobile/power-module.png differ diff --git a/Software/Graphics/Mobile/tablet.png b/Software/Graphics/Mobile/tablet.png new file mode 100644 index 000000000..17122678e Binary files /dev/null and b/Software/Graphics/Mobile/tablet.png differ diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/App.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/App.xaml new file mode 100644 index 000000000..783dfaf12 --- /dev/null +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/App.xaml @@ -0,0 +1,11 @@ + + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Images/machine.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Images/machine.png new file mode 100644 index 000000000..52c2252c9 Binary files /dev/null and b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Images/machine.png differ diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Images/power-module.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Images/power-module.png new file mode 100644 index 000000000..9d993ab83 Binary files /dev/null and b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Images/power-module.png differ diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Images/tablet.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Images/tablet.png new file mode 100644 index 000000000..17122678e Binary files /dev/null and b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Images/tablet.png differ diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/PowerModule.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/PowerModule.cs new file mode 100644 index 000000000..c69f38b45 --- /dev/null +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/PowerModule.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Media.Imaging; +using Tango.BL.Enumerations; +using Tango.PPC.Common; +using Tango.PPC.Power.Views; +using Tango.SharedUI.Helpers; + +namespace Tango.PPC.Power +{ + /// + /// Represents a PPC . + /// + /// + [PPCModule(100, DockToBottom = true)] + public class PowerModule : PPCModuleBase + { + /// + /// Gets the module name. + /// + public override string Name + { + get + { + return "Power"; + } + } + + /// + /// Gets the module description. + /// + public override string Description + { + get + { + return "Tango Power Module"; + } + } + + /// + /// Gets the module cover image. + /// + public override BitmapSource Image + { + get + { + return ResourceHelper.GetImageFromResources("Images/power-module.png"); + } + } + + /// + /// Gets the module entry point view type. + /// + public override Type MainViewType + { + get + { + return typeof(MainView); + } + } + + /// + /// Gets the permission required to see and load this module. + /// + public override Permissions Permission + { + get + { + return Permissions.RunPPC; + } + } + + /// + /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. + /// + public override void Dispose() + { + //Dispose module here... + } + } +} diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..a88d39005 --- /dev/null +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Properties/AssemblyInfo.cs @@ -0,0 +1,20 @@ +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Windows; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Tango Power Module")] +[assembly: AssemblyVersion("2.0.1.1407")] + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Properties/Resources.Designer.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Properties/Resources.Designer.cs new file mode 100644 index 000000000..666e2da56 --- /dev/null +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Properties/Resources.Designer.cs @@ -0,0 +1,63 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.PPC.Power.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Tango.PPC.Power.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Properties/Resources.resx b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Properties/Resources.resx new file mode 100644 index 000000000..af7dbebba --- /dev/null +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Properties/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Properties/Settings.Designer.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Properties/Settings.Designer.cs new file mode 100644 index 000000000..fb4440018 --- /dev/null +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Properties/Settings.Designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.PPC.Power.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default { + get { + return defaultInstance; + } + } + } +} diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Properties/Settings.settings b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Properties/Settings.settings new file mode 100644 index 000000000..033d7a5e9 --- /dev/null +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Tango.PPC.Power.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Tango.PPC.Power.csproj new file mode 100644 index 000000000..a2b7ca909 --- /dev/null +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Tango.PPC.Power.csproj @@ -0,0 +1,172 @@ + + + + + Debug + AnyCPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0} + library + Tango.PPC.Power + Tango.PPC.Power + v4.6.1 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + + + + true + full + false + ..\..\..\Build\PPC\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + ..\..\..\Build\PPC\Release\ + TRACE + prompt + 4 + + + + ..\..\..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.dll + True + + + ..\..\..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.SqlServer.dll + + + ..\..\..\packages\FontAwesome.WPF.4.7.0.9\lib\net40\FontAwesome.WPF.dll + + + ..\..\..\packages\Google.Protobuf.3.4.1\lib\net45\Google.Protobuf.dll + + + + + + ..\..\..\packages\Expression.Blend.Sdk.1.0.2\lib\net45\System.Windows.Interactivity.dll + + + + + + + + + 4.0 + + + + + + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + + + GlobalVersionInfo.cs + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + + + MainView.xaml + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + {f441feee-322a-4943-b566-110e12fd3b72} + Tango.BL + + + {a34ee0f0-649d-41c8-8489-b6f1cc6924ee} + Tango.Core + + + {b112d89a-a106-41ae-a0c1-4abc84c477f5} + Tango.DragAndDrop + + + {4206ac58-3b57-4699-8835-90bf6db01a61} + Tango.Integration + + + {bc932dbd-7cdb-488c-99e4-f02cf441f55e} + Tango.Logging + + + {e4927038-348d-4295-aaf4-861c58cb3943} + Tango.PMR + + + {d8f1ad85-526a-4f50-b6dc-d437af63d8d8} + Tango.Settings + + + {8491d07b-c1f6-4b62-a412-41b9fd2d6538} + Tango.SharedUI + + + {fd86424c-6e84-491b-8df9-3d0f5c236a2a} + Tango.Touch + + + {74e700b0-1156-4126-be40-ee450d3c3026} + Tango.Transport + + + {0be74eee-22cb-4dba-b896-793b9e1a3ac0} + Tango.PPC.Common + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/ViewModelLocator.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/ViewModelLocator.cs new file mode 100644 index 000000000..9dfe88cce --- /dev/null +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/ViewModelLocator.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Core.DI; +using Tango.PPC.Power.ViewModels; + +namespace Tango.PPC.Power +{ + public static class ViewModelLocator + { + /// + /// Initializes a new instance of the ViewModelLocator class. + /// + static ViewModelLocator() + { + TangoIOC.Default.Register(); + } + + /// + /// Gets the main view VM. + /// + public static MainViewVM MainViewVM + { + get + { + return TangoIOC.Default.GetInstance(); + } + } + } +} diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/ViewModels/MainViewVM.cs new file mode 100644 index 000000000..b92a43489 --- /dev/null +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/ViewModels/MainViewVM.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.PPC.Common; + +namespace Tango.PPC.Power.ViewModels +{ + /// + /// Represents the main view VM and entry point for . + /// + /// + public class MainViewVM : PPCViewModel + { + /// + /// Called when the application has been started + /// + public override void OnApplicationStarted() + { + //Start initializing here rather then in the constructor. + } + } +} diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Views/MainView.xaml new file mode 100644 index 000000000..42c43eb32 --- /dev/null +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Views/MainView.xaml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + Power + + + + + + + + + + + CPU: + 38% + RAM: + 50% + UWF: + Active + Free Space: + + + + RESTART + + + + + + + + + + + + + Firmware Version: + + Status: + + + + + TURN OFF + STAND BY + GET READY + + + + + + + + diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Views/MainView.xaml.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Views/MainView.xaml.cs new file mode 100644 index 000000000..e1ce28414 --- /dev/null +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Views/MainView.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Tango.PPC.Power.Views +{ + /// + /// Interaction logic for MainView.xaml + /// + public partial class MainView : UserControl + { + public MainView() + { + InitializeComponent(); + } + } +} diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/app.config b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/app.config new file mode 100644 index 000000000..1e22e6a88 --- /dev/null +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/app.config @@ -0,0 +1,61 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/packages.config b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/packages.config new file mode 100644 index 000000000..80367fdd2 --- /dev/null +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/packages.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/IPPCModule.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/IPPCModule.cs index 51f361cfb..cd328fabd 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/IPPCModule.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/IPPCModule.cs @@ -46,6 +46,11 @@ namespace Tango.PPC.Common /// bool IsVisibleInMenu { get; } + /// + /// Gets a value indicating whether to dock this module menu item to the bottom. + /// + bool DockToBottom { get; } + /// /// Called when the application has entered the technician mode. /// diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCModuleAttribute.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCModuleAttribute.cs index e166fef04..f175b11d8 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCModuleAttribute.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCModuleAttribute.cs @@ -23,6 +23,11 @@ namespace Tango.PPC.Common /// public String HomeViewName { get; set; } + /// + /// Gets or sets a value indicating whether to dock this module menu item to the bottom.. + /// + public bool DockToBottom { get; set; } + /// /// Initializes a new instance of the class. /// @@ -41,5 +46,16 @@ namespace Tango.PPC.Common { HomeViewName = homeViewName; } + + /// + /// Initializes a new instance of the class. + /// + /// The module index. + /// Name of the home view. + public PPCModuleAttribute(int index, String homeViewName, bool dockToBottom) : this(index, homeViewName) + { + HomeViewName = homeViewName; + DockToBottom = dockToBottom; + } } } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCModuleBase.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCModuleBase.cs index 5aa003c1e..7053e8356 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCModuleBase.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCModuleBase.cs @@ -8,6 +8,7 @@ using System.Windows.Media.Imaging; using Tango.Core; using Tango.BL.Entities; using Tango.BL.Enumerations; +using System.Reflection; namespace Tango.PPC.Common { @@ -27,6 +28,14 @@ namespace Tango.PPC.Common protected set { _isVisibleInMenu = value; RaisePropertyChangedAuto(); } } + /// + /// Gets a value indicating whether to dock this module menu item to the bottom. + /// + public bool DockToBottom + { + get { return this.GetType().GetCustomAttribute().DockToBottom; } + } + /// /// Gets the module name. /// diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj index 93a2e6c6a..12465fee3 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj @@ -359,6 +359,10 @@ {91b70e9b-66a7-4873-ae10-400e71cf404f} Tango.PPC.MachineSettings + + {1d0f15b7-c1f3-4b9e-b0bc-a5b9e50c91d0} + Tango.PPC.Power + {04febb02-f782-4b96-b47d-f6902afa43be} Tango.PPC.Storage @@ -491,7 +495,7 @@ del "$(TargetDir)firmware_package.tfp" - + \ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml index 872b6b71e..0b3e0b1ee 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml @@ -49,7 +49,7 @@ - + @@ -76,15 +76,32 @@ - + --> + + + + + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/Tango.BL/Builders/JobBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/JobBuilder.cs index 3b0d1b0e1..b75f7a452 100644 --- a/Software/Visual_Studio/Tango.BL/Builders/JobBuilder.cs +++ b/Software/Visual_Studio/Tango.BL/Builders/JobBuilder.cs @@ -47,7 +47,7 @@ namespace Tango.BL.Builders { return AddStep(3, () => { - new MachineBuilder(Context).Set(Entity.MachineGuid).Build(); + new MachineBuilder(Context).Set(Entity.MachineGuid).WithSpools().Build(); new ConfigurationBuilder(Context) .Set(Entity.Machine.ConfigurationGuid) diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln index c605b3ea9..46873f7e6 100644 --- a/Software/Visual_Studio/Tango.sln +++ b/Software/Visual_Studio/Tango.sln @@ -252,6 +252,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Firmware", "Firmware", "{AD EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tango.FirmwareUpdateLib", "Firmware\Tango.FirmwareUpdateLib\Tango.FirmwareUpdateLib.vcxproj", "{DB79FB33-CE7A-49CF-AA89-F697E5CDB0F6}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.PPC.Power", "PPC\Modules\Tango.PPC.Power\Tango.PPC.Power.csproj", "{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution AppVeyor|Any CPU = AppVeyor|Any CPU @@ -4489,6 +4491,46 @@ Global {DB79FB33-CE7A-49CF-AA89-F697E5CDB0F6}.Release|x64.Build.0 = Release|x64 {DB79FB33-CE7A-49CF-AA89-F697E5CDB0F6}.Release|x86.ActiveCfg = Release|Win32 {DB79FB33-CE7A-49CF-AA89-F697E5CDB0F6}.Release|x86.Build.0 = Release|Win32 + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.AppVeyor|Any CPU.ActiveCfg = Release|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.AppVeyor|Any CPU.Build.0 = Release|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.AppVeyor|ARM.ActiveCfg = Release|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.AppVeyor|ARM.Build.0 = Release|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.AppVeyor|ARM64.ActiveCfg = Release|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.AppVeyor|ARM64.Build.0 = Release|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.AppVeyor|x64.ActiveCfg = Release|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.AppVeyor|x64.Build.0 = Release|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.AppVeyor|x86.ActiveCfg = Release|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.AppVeyor|x86.Build.0 = Release|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Debug|ARM.ActiveCfg = Debug|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Debug|ARM.Build.0 = Debug|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Debug|ARM64.Build.0 = Debug|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Debug|x64.ActiveCfg = Debug|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Debug|x64.Build.0 = Debug|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Debug|x86.ActiveCfg = Debug|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Debug|x86.Build.0 = Debug|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.DefaultBuild|Any CPU.ActiveCfg = Debug|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.DefaultBuild|Any CPU.Build.0 = Debug|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.DefaultBuild|ARM.ActiveCfg = Debug|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.DefaultBuild|ARM.Build.0 = Debug|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.DefaultBuild|ARM64.ActiveCfg = Debug|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.DefaultBuild|ARM64.Build.0 = Debug|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.DefaultBuild|x64.ActiveCfg = Debug|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.DefaultBuild|x64.Build.0 = Debug|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.DefaultBuild|x86.ActiveCfg = Debug|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.DefaultBuild|x86.Build.0 = Debug|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Release|Any CPU.Build.0 = Release|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Release|ARM.ActiveCfg = Release|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Release|ARM.Build.0 = Release|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Release|ARM64.ActiveCfg = Release|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Release|ARM64.Build.0 = Release|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Release|x64.ActiveCfg = Release|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Release|x64.Build.0 = Release|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Release|x86.ActiveCfg = Release|Any CPU + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -4567,14 +4609,15 @@ Global {D2EE865B-B006-487A-9487-60A663636AC3} = {0048447D-1D94-4E60-9DAD-7349C777CB4E} {F69DA3A8-F823-461E-87CF-A9275ABC0B15} = {B2AF4F3F-2828-47C3-8F3E-A0EA0BD66FF8} {DB79FB33-CE7A-49CF-AA89-F697E5CDB0F6} = {AD8721D6-D728-4D58-A0D8-BE2E3FF7A9BC} + {1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0} = {0048447D-1D94-4E60-9DAD-7349C777CB4E} 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