diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-01-08 17:59:31 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-01-08 17:59:31 +0200 |
| commit | aeebb8d47e1d78b50d9ae5afd9df6eaf9765ed87 (patch) | |
| tree | ac65520ce09b073a5adf3fe01a81634e9381e7af | |
| parent | b76a8d009b807ddbbb21386ad362deb786c506f4 (diff) | |
| download | Tango-aeebb8d47e1d78b50d9ae5afd9df6eaf9765ed87.tar.gz Tango-aeebb8d47e1d78b50d9ae5afd9df6eaf9765ed87.zip | |
Started working on power module...
29 files changed, 835 insertions, 14 deletions
diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf Binary files differindex 9416e9791..da2a4f089 100644 --- a/Software/DB/PPC/Tango.mdf +++ b/Software/DB/PPC/Tango.mdf diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf Binary files differindex 5e303d76f..504852cbf 100644 --- a/Software/DB/PPC/Tango_log.ldf +++ b/Software/DB/PPC/Tango_log.ldf 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 Binary files differnew file mode 100644 index 000000000..a49dbdd14 --- /dev/null +++ b/Software/Graphics/Mobile/063b918959b2e0b74d0b8ccc29164c73-gaming-tablet-stroke-icon-by-vexels.png diff --git a/Software/Graphics/Mobile/power-module.png b/Software/Graphics/Mobile/power-module.png Binary files differnew file mode 100644 index 000000000..9d993ab83 --- /dev/null +++ b/Software/Graphics/Mobile/power-module.png diff --git a/Software/Graphics/Mobile/tablet.png b/Software/Graphics/Mobile/tablet.png Binary files differnew file mode 100644 index 000000000..17122678e --- /dev/null +++ b/Software/Graphics/Mobile/tablet.png 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 @@ +<Application x:Class="Tango.PPC.Power.App" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> + <Application.Resources> + <ResourceDictionary> + <ResourceDictionary.MergedDictionaries> + <ResourceDictionary Source="pack://application:,,,/Tango.PPC.Common;component/Resources/Merged.xaml" /> + </ResourceDictionary.MergedDictionaries> + </ResourceDictionary> + </Application.Resources> +</Application>
\ 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 Binary files differnew file mode 100644 index 000000000..52c2252c9 --- /dev/null +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Images/machine.png 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 Binary files differnew file mode 100644 index 000000000..9d993ab83 --- /dev/null +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Images/power-module.png 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 Binary files differnew file mode 100644 index 000000000..17122678e --- /dev/null +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Images/tablet.png 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 +{ + /// <summary> + /// Represents a PPC <see cref="PowerModule"/>. + /// </summary> + /// <seealso cref="Tango.PPC.Common.PPCModuleBase" /> + [PPCModule(100, DockToBottom = true)] + public class PowerModule : PPCModuleBase + { + /// <summary> + /// Gets the module name. + /// </summary> + public override string Name + { + get + { + return "Power"; + } + } + + /// <summary> + /// Gets the module description. + /// </summary> + public override string Description + { + get + { + return "Tango Power Module"; + } + } + + /// <summary> + /// Gets the module cover image. + /// </summary> + public override BitmapSource Image + { + get + { + return ResourceHelper.GetImageFromResources("Images/power-module.png"); + } + } + + /// <summary> + /// Gets the module entry point view type. + /// </summary> + public override Type MainViewType + { + get + { + return typeof(MainView); + } + } + + /// <summary> + /// Gets the permission required to see and load this module. + /// </summary> + public override Permissions Permission + { + get + { + return Permissions.RunPPC; + } + } + + /// <summary> + /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. + /// </summary> + 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 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// 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. +// </auto-generated> +//------------------------------------------------------------------------------ + +namespace Tango.PPC.Power.Properties { + using System; + + + /// <summary> + /// A strongly-typed resource class, for looking up localized strings, etc. + /// </summary> + // 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() { + } + + /// <summary> + /// Returns the cached ResourceManager instance used by this class. + /// </summary> + [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; + } + } + + /// <summary> + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// </summary> + [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 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root>
\ 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 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// 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. +// </auto-generated> +//------------------------------------------------------------------------------ + +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 @@ +<?xml version='1.0' encoding='utf-8'?> +<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)"> + <Profiles> + <Profile Name="(Default)" /> + </Profiles> + <Settings /> +</SettingsFile>
\ 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProjectGuid>{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}</ProjectGuid> + <OutputType>library</OutputType> + <RootNamespace>Tango.PPC.Power</RootNamespace> + <AssemblyName>Tango.PPC.Power</AssemblyName> + <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <WarningLevel>4</WarningLevel> + <TargetFrameworkProfile /> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>..\..\..\Build\PPC\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>..\..\..\Build\PPC\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <ItemGroup> + <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.dll</HintPath> + <Private>True</Private> + </Reference> + <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.SqlServer.dll</HintPath> + </Reference> + <Reference Include="FontAwesome.WPF, Version=4.7.0.37774, Culture=neutral, PublicKeyToken=0758b07a11a4f466, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\FontAwesome.WPF.4.7.0.9\lib\net40\FontAwesome.WPF.dll</HintPath> + </Reference> + <Reference Include="Google.Protobuf, Version=3.4.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\Google.Protobuf.3.4.1\lib\net45\Google.Protobuf.dll</HintPath> + </Reference> + <Reference Include="System" /> + <Reference Include="System.ComponentModel.DataAnnotations" /> + <Reference Include="System.Data" /> + <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> + <HintPath>..\..\..\packages\Expression.Blend.Sdk.1.0.2\lib\net45\System.Windows.Interactivity.dll</HintPath> + </Reference> + <Reference Include="System.Xml" /> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System.Core" /> + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Data.DataSetExtensions" /> + <Reference Include="System.Net.Http" /> + <Reference Include="System.Xaml"> + <RequiredTargetFramework>4.0</RequiredTargetFramework> + </Reference> + <Reference Include="WindowsBase" /> + <Reference Include="PresentationCore" /> + <Reference Include="PresentationFramework" /> + </ItemGroup> + <ItemGroup> + <Page Include="App.xaml"> + <Generator>MSBuild:Compile</Generator> + <SubType>Designer</SubType> + </Page> + <Page Include="Views\MainView.xaml"> + <SubType>Designer</SubType> + <Generator>MSBuild:Compile</Generator> + </Page> + </ItemGroup> + <ItemGroup> + <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs"> + <Link>GlobalVersionInfo.cs</Link> + </Compile> + <Compile Include="PowerModule.cs" /> + <Compile Include="Properties\AssemblyInfo.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="Properties\Resources.Designer.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>Resources.resx</DependentUpon> + </Compile> + <Compile Include="Properties\Settings.Designer.cs"> + <AutoGen>True</AutoGen> + <DependentUpon>Settings.settings</DependentUpon> + <DesignTimeSharedInput>True</DesignTimeSharedInput> + </Compile> + <Compile Include="ViewModelLocator.cs" /> + <Compile Include="ViewModels\MainViewVM.cs" /> + <Compile Include="Views\MainView.xaml.cs"> + <DependentUpon>MainView.xaml</DependentUpon> + </Compile> + <EmbeddedResource Include="Properties\Resources.resx"> + <Generator>ResXFileCodeGenerator</Generator> + <LastGenOutput>Resources.Designer.cs</LastGenOutput> + </EmbeddedResource> + <None Include="app.config" /> + <None Include="packages.config" /> + <None Include="Properties\Settings.settings"> + <Generator>SettingsSingleFileGenerator</Generator> + <LastGenOutput>Settings.Designer.cs</LastGenOutput> + </None> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\..\Tango.BL\Tango.BL.csproj"> + <Project>{f441feee-322a-4943-b566-110e12fd3b72}</Project> + <Name>Tango.BL</Name> + </ProjectReference> + <ProjectReference Include="..\..\..\Tango.Core\Tango.Core.csproj"> + <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project> + <Name>Tango.Core</Name> + </ProjectReference> + <ProjectReference Include="..\..\..\Tango.DragAndDrop\Tango.DragAndDrop.csproj"> + <Project>{b112d89a-a106-41ae-a0c1-4abc84c477f5}</Project> + <Name>Tango.DragAndDrop</Name> + </ProjectReference> + <ProjectReference Include="..\..\..\Tango.Integration\Tango.Integration.csproj"> + <Project>{4206ac58-3b57-4699-8835-90bf6db01a61}</Project> + <Name>Tango.Integration</Name> + </ProjectReference> + <ProjectReference Include="..\..\..\Tango.Logging\Tango.Logging.csproj"> + <Project>{bc932dbd-7cdb-488c-99e4-f02cf441f55e}</Project> + <Name>Tango.Logging</Name> + </ProjectReference> + <ProjectReference Include="..\..\..\Tango.PMR\Tango.PMR.csproj"> + <Project>{e4927038-348d-4295-aaf4-861c58cb3943}</Project> + <Name>Tango.PMR</Name> + </ProjectReference> + <ProjectReference Include="..\..\..\Tango.Settings\Tango.Settings.csproj"> + <Project>{d8f1ad85-526a-4f50-b6dc-d437af63d8d8}</Project> + <Name>Tango.Settings</Name> + </ProjectReference> + <ProjectReference Include="..\..\..\Tango.SharedUI\Tango.SharedUI.csproj"> + <Project>{8491d07b-c1f6-4b62-a412-41b9fd2d6538}</Project> + <Name>Tango.SharedUI</Name> + </ProjectReference> + <ProjectReference Include="..\..\..\Tango.Touch\Tango.Touch.csproj"> + <Project>{fd86424c-6e84-491b-8df9-3d0f5c236a2a}</Project> + <Name>Tango.Touch</Name> + </ProjectReference> + <ProjectReference Include="..\..\..\Tango.Transport\Tango.Transport.csproj"> + <Project>{74e700b0-1156-4126-be40-ee450d3c3026}</Project> + <Name>Tango.Transport</Name> + </ProjectReference> + <ProjectReference Include="..\..\Tango.PPC.Common\Tango.PPC.Common.csproj"> + <Project>{0be74eee-22cb-4dba-b896-793b9e1a3ac0}</Project> + <Name>Tango.PPC.Common</Name> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <Resource Include="Images\power-module.png" /> + </ItemGroup> + <ItemGroup> + <Resource Include="Images\tablet.png" /> + </ItemGroup> + <ItemGroup> + <Resource Include="Images\machine.png" /> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> + <ProjectExtensions> + <VisualStudio> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> + </VisualStudio> + </ProjectExtensions> +</Project>
\ 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 + { + /// <summary> + /// Initializes a new instance of the ViewModelLocator class. + /// </summary> + static ViewModelLocator() + { + TangoIOC.Default.Register<MainViewVM>(); + } + + /// <summary> + /// Gets the main view VM. + /// </summary> + public static MainViewVM MainViewVM + { + get + { + return TangoIOC.Default.GetInstance<MainViewVM>(); + } + } + } +} 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 +{ + /// <summary> + /// Represents the main view VM and entry point for <see cref="Synchronization.MyModule"/>. + /// </summary> + /// <seealso cref="Tango.PPC.Common.PPCViewModel" /> + public class MainViewVM : PPCViewModel + { + /// <summary> + /// Called when the application has been started + /// </summary> + 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 @@ +<UserControl x:Class="Tango.PPC.Power.Views.MainView" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:vm="clr-namespace:Tango.PPC.Power.ViewModels" + xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI" + xmlns:global="clr-namespace:Tango.PPC.Power" + xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch" + xmlns:local="clr-namespace:Tango.PPC.Power.Views" + mc:Ignorable="d" + d:DesignHeight="1280" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}"> + + <Grid Background="{StaticResource TangoMidBackgroundBrush}"> + <Grid.RowDefinitions> + <RowDefinition Height="Auto"/> + <RowDefinition Height="1*"/> + </Grid.RowDefinitions> + + <Border Padding="20" Background="{StaticResource TangoPrimaryBackgroundBrush}" BorderThickness="0 0 0 1" BorderBrush="{StaticResource TangoDividerBrush}"> + <Border.Effect> + <DropShadowEffect Color="Silver" ShadowDepth="0" BlurRadius="20" Opacity="1" /> + </Border.Effect> + <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoHeaderFontSize}" FontWeight="SemiBold">Power</TextBlock> + </Border> + + <UniformGrid Grid.Row="1" Rows="2" Margin="20 50 20 20"> + + <StackPanel Margin="-90 0 0 0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"> + <Image Source="../Images/tablet.png" Width="256" RenderOptions.BitmapScalingMode="Fant" VerticalAlignment="Top" HorizontalAlignment="Left" /> + + <Grid VerticalAlignment="Top" Margin="40 0 0 0"> + <StackPanel> + <controls:TableGrid RowHeight="40" MakeFirstColumnVerticalAlignmentBottom="False"> + <TextBlock FontWeight="SemiBold">CPU:</TextBlock> + <TextBlock>38%</TextBlock> + <TextBlock FontWeight="SemiBold">RAM:</TextBlock> + <TextBlock>50%</TextBlock> + <TextBlock FontWeight="SemiBold">UWF:</TextBlock> + <TextBlock>Active</TextBlock> + <TextBlock FontWeight="SemiBold">Free Space:</TextBlock> + <touch:TouchProgressBar Margin="10 5 0 0" Height="10" VerticalAlignment="Top" Maximum="100" Value="60" Foreground="{StaticResource TangoSuccessBrush}" /> + </controls:TableGrid> + + <touch:TouchButton Height="60" Margin="0 0 0 0" CornerRadius="30" Width="250">RESTART</touch:TouchButton> + </StackPanel> + </Grid> + </StackPanel> + + <Grid> + <Rectangle VerticalAlignment="Top" HorizontalAlignment="Stretch" Margin="100 0" StrokeThickness="1" Stroke="{StaticResource TangoDividerBrush}"></Rectangle> + <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"> + <Image Source="../Images/machine.png" Width="256" RenderOptions.BitmapScalingMode="Fant" VerticalAlignment="Top" HorizontalAlignment="Left" /> + + <Grid Margin="0 0 0 0" VerticalAlignment="Top"> + <StackPanel Margin="20 0 0 0"> + <controls:TableGrid RowHeight="40" MakeFirstColumnVerticalAlignmentBottom="False" HorizontalAlignment="Left"> + <TextBlock FontWeight="SemiBold">Firmware Version:</TextBlock> + <TextBlock Text="{Binding MachineProvider.MachineOperator.DeviceInformation.Version,TargetNullValue='N/A',FallbackValue='N/A'}"></TextBlock> + <TextBlock FontWeight="SemiBold">Status:</TextBlock> + <TextBlock Text="{Binding MachineProvider.MachineOperator.Status,Converter={StaticResource EnumToDescriptionConverter}}"></TextBlock> + </controls:TableGrid> + + <UniformGrid Columns="3"> + <touch:TouchButton Style="{StaticResource TangoRoundTouchButton}" Background="{StaticResource TangoErrorBrush}" Width="90" Height="90">TURN OFF</touch:TouchButton> + <touch:TouchButton Margin="10 0 0 0" Style="{StaticResource TangoRoundTouchButton}" Background="{StaticResource TangoWarningBrush}" Width="90" Height="90">STAND BY</touch:TouchButton> + <touch:TouchButton Margin="10 0 0 0" Style="{StaticResource TangoRoundTouchButton}" Background="{StaticResource TangoSuccessBrush}" Width="90" Height="90">GET READY</touch:TouchButton> + </UniformGrid> + </StackPanel> + </Grid> + </StackPanel> + </Grid> + </UniformGrid> + </Grid> +</UserControl> 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 +{ + /// <summary> + /// Interaction logic for MainView.xaml + /// </summary> + 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<configuration> + <configSections> + <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --> + <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/> + </configSections> + <runtime> + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> + <dependentAssembly> + <assemblyIdentity name="System.Reactive.Core" publicKeyToken="94bc3704cddfc263" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-1.2.2.0" newVersion="1.2.2.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-1.4.2.0" newVersion="1.4.2.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Console" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> + <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/> + </dependentAssembly> + </assemblyBinding> + </runtime> + <entityFramework> + <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/> + <providers> + <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/> + </providers> + </entityFramework> +<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration> 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="EntityFramework" version="6.0.0" targetFramework="net46" /> + <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net46" /> + <package id="FontAwesome.WPF" version="4.7.0.9" targetFramework="net46" /> + <package id="Google.Protobuf" version="3.4.1" targetFramework="net46" /> +</packages>
\ 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 @@ -47,6 +47,11 @@ namespace Tango.PPC.Common bool IsVisibleInMenu { get; } /// <summary> + /// Gets a value indicating whether to dock this module menu item to the bottom. + /// </summary> + bool DockToBottom { get; } + + /// <summary> /// Called when the application has entered the technician mode. /// </summary> void OnTechnicianEntered(); 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 @@ -24,6 +24,11 @@ namespace Tango.PPC.Common public String HomeViewName { get; set; } /// <summary> + /// Gets or sets a value indicating whether to dock this module menu item to the bottom.. + /// </summary> + public bool DockToBottom { get; set; } + + /// <summary> /// Initializes a new instance of the <see cref="PPCModuleAttribute"/> class. /// </summary> /// <param name="index">The module index.</param> @@ -41,5 +46,16 @@ namespace Tango.PPC.Common { HomeViewName = homeViewName; } + + /// <summary> + /// Initializes a new instance of the <see cref="PPCModuleAttribute"/> class. + /// </summary> + /// <param name="index">The module index.</param> + /// <param name="homeViewName">Name of the home view.</param> + 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 { @@ -28,6 +29,14 @@ namespace Tango.PPC.Common } /// <summary> + /// Gets a value indicating whether to dock this module menu item to the bottom. + /// </summary> + public bool DockToBottom + { + get { return this.GetType().GetCustomAttribute<PPCModuleAttribute>().DockToBottom; } + } + + /// <summary> /// Gets the module name. /// </summary> public abstract string Name { get; } 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 @@ <Project>{91b70e9b-66a7-4873-ae10-400e71cf404f}</Project> <Name>Tango.PPC.MachineSettings</Name> </ProjectReference> + <ProjectReference Include="..\Modules\Tango.PPC.Power\Tango.PPC.Power.csproj"> + <Project>{1d0f15b7-c1f3-4b9e-b0bc-a5b9e50c91d0}</Project> + <Name>Tango.PPC.Power</Name> + </ProjectReference> <ProjectReference Include="..\Modules\Tango.PPC.Storage\Tango.PPC.Storage.csproj"> <Project>{04febb02-f782-4b96-b47d-f6902afa43be}</Project> <Name>Tango.PPC.Storage</Name> @@ -491,7 +495,7 @@ del "$(TargetDir)firmware_package.tfp"</PostBuildEvent> </PropertyGroup> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> </VisualStudio> </ProjectExtensions> </Project>
\ 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 @@ <ItemsControl ItemsSource="{Binding ModuleLoader.UserModules}"> <ItemsControl.ItemTemplate> <DataTemplate> - <Border> + <Border Visibility="{Binding DockToBottom,Converter={StaticResource BooleanToVisibilityInverseConverter}}"> <Border BorderBrush="{StaticResource TangoDividerBrush}" BorderThickness="0 1 0 0" Visibility="{Binding IsVisibleInMenu,Converter={StaticResource BooleanToVisibilityConverter}}"> <touch:TouchButton Margin="0 0 0 0" Padding="30" Foreground="{StaticResource TangoDarkForegroundBrush}" Style="{StaticResource TangoFlatButton}" FontSize="{StaticResource TangoHeaderFontSize}" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ModuleNavigationCommand}" CommandParameter="{Binding Name}"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> @@ -76,15 +76,32 @@ </StackPanel> </StackPanel> - <!--<StackPanel DockPanel.Dock="Bottom"> - <Separator Margin="0 10 0 0" Background="#505050" /> - <touch:TouchButton Style="{StaticResource TangoFlatButton}" Padding="30" Command="{Binding SignOutCommand}" FontSize="{StaticResource TangoHeaderFontSize}" Foreground="{StaticResource TangoDarkForegroundBrush}"> + <StackPanel DockPanel.Dock="Bottom"> + <Separator Margin="0 10 0 0" Background="{StaticResource TangoDividerBrush}" /> + <!--<touch:TouchButton Style="{StaticResource TangoFlatButton}" Padding="30" Command="{Binding SignOutCommand}" FontSize="{StaticResource TangoHeaderFontSize}" Foreground="{StaticResource TangoDarkForegroundBrush}"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Center"> <touch:TouchIcon VerticalAlignment="Center" Angle="180" Icon="Logout" Width="32" Height="32"></touch:TouchIcon> <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">Sign Out</TextBlock> </StackPanel> - </touch:TouchButton> - </StackPanel>--> + </touch:TouchButton>--> + + <ItemsControl ItemsSource="{Binding ModuleLoader.UserModules}"> + <ItemsControl.ItemTemplate> + <DataTemplate> + <Border Visibility="{Binding DockToBottom,Converter={StaticResource BooleanToVisibilityConverter}}"> + <Border BorderBrush="{StaticResource TangoDividerBrush}" BorderThickness="0 1 0 0" Visibility="{Binding IsVisibleInMenu,Converter={StaticResource BooleanToVisibilityConverter}}"> + <touch:TouchButton Margin="0 0 0 0" Padding="30" Foreground="{StaticResource TangoDarkForegroundBrush}" Style="{StaticResource TangoFlatButton}" FontSize="{StaticResource TangoHeaderFontSize}" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ModuleNavigationCommand}" CommandParameter="{Binding Name}"> + <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> + <Image VerticalAlignment="Center" Source="{Binding Image}" Width="48" Height="48"></Image> + <TextBlock VerticalAlignment="Center" Margin="20 0 0 0" Text="{Binding Name}"></TextBlock> + </StackPanel> + </touch:TouchButton> + </Border> + </Border> + </DataTemplate> + </ItemsControl.ItemTemplate> + </ItemsControl> + </StackPanel> </DockPanel> </Border> </touch:TouchSideMenu.MenuContent> 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 |
