diff options
17 files changed, 759 insertions, 19 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs index 8b75b4517..95aed6c44 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs @@ -91,7 +91,7 @@ namespace Tango.PPC.UI TangoIOC.Default.Unregister<IFileSystemService>(); TangoIOC.Default.Unregister<IRemoteJobService>(); - if (App.StartupArgs.Contains("-webDebug")) + if (App.StartupArgs != null && App.StartupArgs.Contains("-webDebug")) { TangoIOC.Default.Register<PPCWebClient, PPCWebClient>(new PPCWebClient("http://localhost:1111", null)); } diff --git a/Software/Visual_Studio/Tango.Core/DI/TangoIOC.cs b/Software/Visual_Studio/Tango.Core/DI/TangoIOC.cs index 9ddf588f0..19e1e91bc 100644 --- a/Software/Visual_Studio/Tango.Core/DI/TangoIOC.cs +++ b/Software/Visual_Studio/Tango.Core/DI/TangoIOC.cs @@ -48,6 +48,11 @@ namespace Tango.Core.DI private List<Tuple<Type, Action<Object>>> _waitingRetrivals; /// <summary> + /// Gets or sets a value indicating whether to throw an exception when a type is requested but not registered. + /// </summary> + public bool ThrowOnRequestedTypeNotFound { get; set; } = true; + + /// <summary> /// Initializes a new instance of the <see cref="TangoIOC"/> class. /// </summary> public TangoIOC() @@ -200,7 +205,7 @@ namespace Tango.Core.DI return registeredType.Instance; } - if (!DesignMode) + if (!DesignMode && ThrowOnRequestedTypeNotFound) { throw new InvalidOperationException(String.Format("Requested type '{0}' could not be found.", type.Name)); } diff --git a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs index 3ea57de7f..e9be05cc3 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs @@ -17,15 +17,15 @@ namespace Tango.Integration.Operation /// <seealso cref="Tango.Core.ExtendedObject" /> public class JobHandler : ExtendedObject { - private Action _cancelAction; - private List<Segment> _effectiveSegments; - private String _lastStatusMessage; - private int _last_unit; - private bool _finalizing; - private JobHandlerModes _mode; - private double _last_progress; - private const int PROGRESS_REPORT_RANGE_METERS = 5; - private bool loggedContinueMessage; + protected Action _cancelAction; + protected List<Segment> _effectiveSegments; + protected String _lastStatusMessage; + protected int _last_unit; + protected bool _finalizing; + protected JobHandlerModes _mode; + protected double _last_progress; + protected const int PROGRESS_REPORT_RANGE_METERS = 5; + protected bool loggedContinueMessage; #region Events @@ -98,7 +98,6 @@ namespace Tango.Integration.Operation set { _jobStatus = value; RaisePropertyChangedAuto(); } } - /// <summary> /// Gets a value indicating whether this handler job has been canceled. /// </summary> @@ -328,7 +327,7 @@ namespace Tango.Integration.Operation #region Private Methods - private void InvalidateJobProgress(JobStatus s) + protected virtual void InvalidateJobProgress(JobStatus s) { JobStatus = s; bool invalidProgress = false; diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln index 948c210d0..941effb79 100644 --- a/Software/Visual_Studio/Tango.sln +++ b/Software/Visual_Studio/Tango.sln @@ -389,6 +389,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.ColorPickers", "Tango EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.FSE.UsersAndRoles", "FSE\Modules\Tango.FSE.UsersAndRoles\Tango.FSE.UsersAndRoles.csproj", "{D509DDAA-AA70-4B2A-8D6A-8C94F057A9C1}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.JobProgressTester.UI", "Utilities\Tango.JobProgressTester.UI\Tango.JobProgressTester.UI.csproj", "{A248FF61-94E5-428C-B30C-25CB433C5F53}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -3642,6 +3644,26 @@ Global {D509DDAA-AA70-4B2A-8D6A-8C94F057A9C1}.Release|x64.Build.0 = Release|Any CPU {D509DDAA-AA70-4B2A-8D6A-8C94F057A9C1}.Release|x86.ActiveCfg = Release|Any CPU {D509DDAA-AA70-4B2A-8D6A-8C94F057A9C1}.Release|x86.Build.0 = Release|Any CPU + {A248FF61-94E5-428C-B30C-25CB433C5F53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A248FF61-94E5-428C-B30C-25CB433C5F53}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A248FF61-94E5-428C-B30C-25CB433C5F53}.Debug|ARM.ActiveCfg = Debug|Any CPU + {A248FF61-94E5-428C-B30C-25CB433C5F53}.Debug|ARM.Build.0 = Debug|Any CPU + {A248FF61-94E5-428C-B30C-25CB433C5F53}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {A248FF61-94E5-428C-B30C-25CB433C5F53}.Debug|ARM64.Build.0 = Debug|Any CPU + {A248FF61-94E5-428C-B30C-25CB433C5F53}.Debug|x64.ActiveCfg = Debug|Any CPU + {A248FF61-94E5-428C-B30C-25CB433C5F53}.Debug|x64.Build.0 = Debug|Any CPU + {A248FF61-94E5-428C-B30C-25CB433C5F53}.Debug|x86.ActiveCfg = Debug|Any CPU + {A248FF61-94E5-428C-B30C-25CB433C5F53}.Debug|x86.Build.0 = Debug|Any CPU + {A248FF61-94E5-428C-B30C-25CB433C5F53}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A248FF61-94E5-428C-B30C-25CB433C5F53}.Release|Any CPU.Build.0 = Release|Any CPU + {A248FF61-94E5-428C-B30C-25CB433C5F53}.Release|ARM.ActiveCfg = Release|Any CPU + {A248FF61-94E5-428C-B30C-25CB433C5F53}.Release|ARM.Build.0 = Release|Any CPU + {A248FF61-94E5-428C-B30C-25CB433C5F53}.Release|ARM64.ActiveCfg = Release|Any CPU + {A248FF61-94E5-428C-B30C-25CB433C5F53}.Release|ARM64.Build.0 = Release|Any CPU + {A248FF61-94E5-428C-B30C-25CB433C5F53}.Release|x64.ActiveCfg = Release|Any CPU + {A248FF61-94E5-428C-B30C-25CB433C5F53}.Release|x64.Build.0 = Release|Any CPU + {A248FF61-94E5-428C-B30C-25CB433C5F53}.Release|x86.ActiveCfg = Release|Any CPU + {A248FF61-94E5-428C-B30C-25CB433C5F53}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -3773,14 +3795,15 @@ Global {1754F846-4763-4000-807F-C7BFAA145DB2} = {4EE6DBA1-71BC-49E2-8DC7-266487E61050} {8D8F06ED-7F75-4933-B0C5-829B0FF654D0} = {3D750293-C243-48F6-9112-A6B3FF650C0D} {D509DDAA-AA70-4B2A-8D6A-8C94F057A9C1} = {4EE6DBA1-71BC-49E2-8DC7-266487E61050} + {A248FF61-94E5-428C-B30C-25CB433C5F53} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - 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} + 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 EndGlobalSection EndGlobal diff --git a/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/App.config b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/App.config new file mode 100644 index 000000000..731f6de6c --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/App.config @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <startup> + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /> + </startup> +</configuration>
\ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/App.xaml b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/App.xaml new file mode 100644 index 000000000..66f763000 --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/App.xaml @@ -0,0 +1,24 @@ +<Application x:Class="Tango.JobProgressTester.UI.App" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:local="clr-namespace:Tango.JobProgressTester.UI" + StartupUri="MainWindow.xaml"> + <Application.Resources> + <ResourceDictionary> + <ResourceDictionary.MergedDictionaries> + + <!--Touch--> + <ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Resources/Colors.xaml"/> + + <!--Common--> + <ResourceDictionary Source="pack://application:,,,/Tango.PPC.Common;component/Resources/Merged.xaml" /> + + <!--Local--> + <!--<ResourceDictionary Source="Resources/Colors.xaml"></ResourceDictionary> + <ResourceDictionary Source="Resources/Fonts.xaml"></ResourceDictionary> + <ResourceDictionary Source="Resources/Styles.xaml"></ResourceDictionary>--> + + </ResourceDictionary.MergedDictionaries> + </ResourceDictionary> + </Application.Resources> +</Application> diff --git a/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/App.xaml.cs b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/App.xaml.cs new file mode 100644 index 000000000..b7efa1e9e --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/App.xaml.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Data; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; + +namespace Tango.JobProgressTester.UI +{ + /// <summary> + /// Interaction logic for App.xaml + /// </summary> + public partial class App : Application + { + } +} diff --git a/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/JobHandler2.cs b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/JobHandler2.cs new file mode 100644 index 000000000..bc50cc3a9 --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/JobHandler2.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.BL.Entities; +using Tango.Integration.Operation; +using Tango.PMR.Printing; + +namespace Tango.JobProgressTester.UI +{ + public class JobHandler2 : JobHandler + { + public JobHandler2(Action cancelAction, Job job, JobTicket jobTicket, ProcessParametersTable processParameters, JobHandlerModes mode) + : base(cancelAction, job, jobTicket, processParameters, mode) + { + + } + + protected override void InvalidateJobProgress(JobStatus s) + { + base.InvalidateJobProgress(s); + } + } +} diff --git a/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/MainWindow.xaml b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/MainWindow.xaml new file mode 100644 index 000000000..9b3d292b0 --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/MainWindow.xaml @@ -0,0 +1,38 @@ +<Window x:Class="Tango.JobProgressTester.UI.MainWindow" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:jobViews="clr-namespace:Tango.PPC.Jobs.Views;assembly=Tango.PPC.Jobs" + xmlns:local="clr-namespace:Tango.JobProgressTester.UI" + mc:Ignorable="d" + Title="Job Progress Tester" Height="800" Width="600" d:DataContext="{d:DesignInstance Type=local:MainWindowVM,IsDesignTimeCreatable=False}"> + <Grid IsEnabled="{Binding IsFree}"> + <Grid> + <Grid.RowDefinitions> + <RowDefinition Height="90"/> + <RowDefinition Height="600*"/> + <RowDefinition Height="90"/> + </Grid.RowDefinitions> + + <ComboBox FontSize="20" VerticalAlignment="Center" HorizontalAlignment="Center" Width="350" ItemsSource="{Binding Jobs}" SelectedItem="{Binding SelectedJob}" DisplayMemberPath="Name" Margin="96,28"></ComboBox> + + <Grid Grid.Row="1"> + <Viewbox Stretch="Uniform"> + <jobViews:JobProgressView Width="800" Height="1000" DataContext="{Binding JobProgressViewVM}" /> + </Viewbox> + </Grid> + + <Grid Grid.Row="2"> + <StackPanel Margin="20"> + <TextBlock HorizontalAlignment="Center"> + <Run Text="{Binding Progress,Mode=OneWay,StringFormat='0.0'}"></Run> + <Run>/</Run> + <Run Text="{Binding JobHandler.Status.TotalProgress,Mode=OneWay,StringFormat='0.0'}"></Run> + </TextBlock> + <Slider VerticalAlignment="Center" Margin="0 10 0 0" Maximum="{Binding JobHandler.Status.TotalProgress}" Value="{Binding Progress,Mode=TwoWay}"></Slider> + </StackPanel> + </Grid> + </Grid> + </Grid> +</Window> diff --git a/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/MainWindow.xaml.cs b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/MainWindow.xaml.cs new file mode 100644 index 000000000..2bfbf4101 --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/MainWindow.xaml.cs @@ -0,0 +1,31 @@ +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; +using Tango.Core.DI; + +namespace Tango.JobProgressTester.UI +{ + /// <summary> + /// Interaction logic for MainWindow.xaml + /// </summary> + public partial class MainWindow : Window + { + public MainWindow() + { + TangoIOC.Default.ThrowOnRequestedTypeNotFound = false; + InitializeComponent(); + DataContext = new MainWindowVM(); + } + } +} diff --git a/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/MainWindowVM.cs b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/MainWindowVM.cs new file mode 100644 index 000000000..914e4cf34 --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/MainWindowVM.cs @@ -0,0 +1,153 @@ +using System; +using System.Collections.Generic; +using System.Data.Entity; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using Tango.BL; +using Tango.BL.Builders; +using Tango.BL.Entities; +using Tango.Core; +using Tango.Integration.Operation; +using Tango.PMR.Printing; +using Tango.PPC.Jobs.ViewModels; +using Tango.SharedUI; + +namespace Tango.JobProgressTester.UI +{ + public class MainWindowVM : ViewModel + { + private DataSource _dataSource; + + private List<Job> _jobs; + public List<Job> Jobs + { + get { return _jobs; } + set { _jobs = value; RaisePropertyChangedAuto(); } + } + + private Job _selectedJob; + public Job SelectedJob + { + get { return _selectedJob; } + set { _selectedJob = value; RaisePropertyChangedAuto(); OnSelectedJobChanged(); } + } + + private Job _activeJob; + public Job ActiveJob + { + get { return _activeJob; } + set { _activeJob = value; RaisePropertyChangedAuto(); } + } + + private JobProgressViewVM _jobProgressViewVM; + public JobProgressViewVM JobProgressViewVM + { + get { return _jobProgressViewVM; } + set { _jobProgressViewVM = value; RaisePropertyChangedAuto(); } + } + + private JobHandler2 _jobHandler; + public JobHandler2 JobHandler + { + get { return _jobHandler; } + set { _jobHandler = value; RaisePropertyChangedAuto(); } + } + + private double _progress; + public double Progress + { + get { return _progress; } + set { _progress = value; RaisePropertyChangedAuto(); OnProgressChanged(); } + } + + public MainWindowVM() + { + Application.Current.MainWindow.ContentRendered += (_, __) => Init(); + } + + private async void Init() + { + _dataSource = new DataSource() + { + Address = "localhost\\SQLPPC", + Catalog = "Tango", + IntegratedSecurity = true + }; + + try + { + IsFree = false; + ObservablesContext.OverrideSettingsDataSource(_dataSource); + + using (ObservablesContext db = ObservablesContext.CreateDefault()) + { + Jobs = await db.Jobs.ToListAsync(); + } + } + catch (Exception ex) + { + ShowError(ex.FlattenMessage()); + } + finally + { + IsFree = true; + } + } + + private async void OnSelectedJobChanged() + { + if (SelectedJob != null) + { + try + { + IsFree = false; + + using (ObservablesContext db = ObservablesContext.CreateDefault()) + { + ActiveJob = await new JobBuilder(db) + .Set(SelectedJob) + .WithConfiguration() + .WithBrushStops() + .WithRML() + .WithSegments() + .WithUser() + .BuildAsync(); + + JobHandler = new JobHandler2(() => { }, ActiveJob, null, ActiveJob.Rml.GetActiveProcessGroup().ProcessParametersTables.First(), JobHandlerModes.SettingUp); + + JobProgressViewVM = new JobProgressViewVM() + { + Job = ActiveJob, + RunningJobStatus = JobHandler.Status, + }; + + Progress = 0.1; + } + } + catch (Exception ex) + { + ShowError(ex.FlattenMessage()); + } + finally + { + IsFree = true; + } + } + } + + private void OnProgressChanged() + { + JobHandler.RaiseStatusReceived(new JobStatus() + { + Progress = Progress, + }); + } + + private void ShowError(String message) + { + MessageBox.Show(Application.Current.MainWindow, message, "Job Progress Tester", MessageBoxButton.OK, MessageBoxImage.Error); + } + } +} diff --git a/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..a8f112331 --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/Properties/AssemblyInfo.cs @@ -0,0 +1,55 @@ +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.JobProgressTester.UI")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Tango.JobProgressTester.UI")] +[assembly: AssemblyCopyright("Copyright © 2020")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +//In order to begin building localizable applications, set +//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file +//inside a <PropertyGroup>. For example, if you are using US english +//in your source files, set the <UICulture> to en-US. Then uncomment +//the NeutralResourceLanguage attribute below. Update the "en-US" in +//the line below to match the UICulture setting in the project file. + +//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] + + +[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) +)] + + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/Properties/Resources.Designer.cs b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/Properties/Resources.Designer.cs new file mode 100644 index 000000000..d11849c50 --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/Properties/Resources.Designer.cs @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// <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.JobProgressTester.UI.Properties +{ + + + /// <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", "4.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 ((resourceMan == null)) + { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Tango.JobProgressTester.UI.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/Utilities/Tango.JobProgressTester.UI/Properties/Resources.resx b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/Properties/Resources.resx new file mode 100644 index 000000000..af7dbebba --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/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/Utilities/Tango.JobProgressTester.UI/Properties/Settings.Designer.cs b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/Properties/Settings.Designer.cs new file mode 100644 index 000000000..832cab525 --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/Properties/Settings.Designer.cs @@ -0,0 +1,30 @@ +//------------------------------------------------------------------------------ +// <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.JobProgressTester.UI.Properties +{ + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.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/Utilities/Tango.JobProgressTester.UI/Properties/Settings.settings b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/Properties/Settings.settings new file mode 100644 index 000000000..033d7a5e9 --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/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/Utilities/Tango.JobProgressTester.UI/Tango.JobProgressTester.UI.csproj b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/Tango.JobProgressTester.UI.csproj new file mode 100644 index 000000000..fdc878103 --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.JobProgressTester.UI/Tango.JobProgressTester.UI.csproj @@ -0,0 +1,139 @@ +<?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>{A248FF61-94E5-428C-B30C-25CB433C5F53}</ProjectGuid> + <OutputType>WinExe</OutputType> + <RootNamespace>Tango.JobProgressTester.UI</RootNamespace> + <AssemblyName>Tango.JobProgressTester.UI</AssemblyName> + <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <WarningLevel>4</WarningLevel> + <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> + <Deterministic>true</Deterministic> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.Data" /> + <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> + <ApplicationDefinition Include="App.xaml"> + <Generator>MSBuild:Compile</Generator> + <SubType>Designer</SubType> + </ApplicationDefinition> + <Page Include="MainWindow.xaml"> + <Generator>MSBuild:Compile</Generator> + <SubType>Designer</SubType> + </Page> + <Compile Include="App.xaml.cs"> + <DependentUpon>App.xaml</DependentUpon> + <SubType>Code</SubType> + </Compile> + <Compile Include="JobHandler2.cs" /> + <Compile Include="MainWindow.xaml.cs"> + <DependentUpon>MainWindow.xaml</DependentUpon> + <SubType>Code</SubType> + </Compile> + </ItemGroup> + <ItemGroup> + <Compile Include="MainWindowVM.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> + <EmbeddedResource Include="Properties\Resources.resx"> + <Generator>ResXFileCodeGenerator</Generator> + <LastGenOutput>Resources.Designer.cs</LastGenOutput> + </EmbeddedResource> + <None Include="Properties\Settings.settings"> + <Generator>SettingsSingleFileGenerator</Generator> + <LastGenOutput>Settings.Designer.cs</LastGenOutput> + </None> + </ItemGroup> + <ItemGroup> + <None Include="App.config" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\PPC\Modules\Tango.PPC.Jobs\Tango.PPC.Jobs.csproj"> + <Project>{096f16c8-6d06-4b5f-9496-b9d2df2d94a3}</Project> + <Name>Tango.PPC.Jobs</Name> + </ProjectReference> + <ProjectReference Include="..\..\PPC\Tango.PPC.Common\Tango.PPC.Common.csproj"> + <Project>{0be74eee-22cb-4dba-b896-793b9e1a3ac0}</Project> + <Name>Tango.PPC.Common</Name> + </ProjectReference> + <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.Integration\Tango.Integration.csproj"> + <Project>{4206ac58-3b57-4699-8835-90bf6db01a61}</Project> + <Name>Tango.Integration</Name> + </ProjectReference> + <ProjectReference Include="..\..\Tango.PMR\Tango.PMR.csproj"> + <Project>{e4927038-348d-4295-aaf4-861c58cb3943}</Project> + <Name>Tango.PMR</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> + </ItemGroup> + <ItemGroup> + <PackageReference Include="EntityFramework"> + <Version>6.2.0</Version> + </PackageReference> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> +</Project>
\ No newline at end of file |