diff options
Diffstat (limited to 'Software/Visual_Studio')
12 files changed, 74 insertions, 25 deletions
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Models/StopModel.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Models/StopModel.cs index 527794e75..fe240f18d 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Models/StopModel.cs +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Models/StopModel.cs @@ -29,7 +29,7 @@ namespace Tango.FSE.Statistics.Models public JobRunExtendedInfo ExtendedInfo { get; set; } public bool IsAdvancedMode { get; set; } public VectorFineTuningRunModel FineTuningModel { get; set; } - public bool IsEureka { get; set; } + public MachineTypes MachineType { get; set; } public bool IsFineTuning { @@ -135,7 +135,7 @@ namespace Tango.FSE.Statistics.Models { get { - var length = IsEureka ? JobRun.JobLogicalLength * 4 : JobRun.JobLogicalLength; + var length = MachineType == MachineTypes.Eureka ? JobRun.JobLogicalLength * 4 : JobRun.JobLogicalLength; return JobRun.NumberOfUnits > 1 ? $"{length} x{JobRun.NumberOfUnits}" : length.ToString(); } } @@ -144,23 +144,23 @@ namespace Tango.FSE.Statistics.Models { get { - return (IsEureka ? JobRun.JobLogicalLength * 4 : JobRun.JobLogicalLength); + return (MachineType == MachineTypes.Eureka ? JobRun.JobLogicalLength * 4 : JobRun.JobLogicalLength); } } public double JobLength { - get { return IsEureka ? JobRun.JobLength * 4 : JobRun.JobLength; } + get { return MachineType == MachineTypes.Eureka ? JobRun.JobLength * 4 : JobRun.JobLength; } } public double EndPosition { - get { return IsEureka ? JobRun.EndPosition * 4 : JobRun.EndPosition; } + get { return MachineType == MachineTypes.Eureka ? JobRun.EndPosition * 4 : JobRun.EndPosition; } } public double ActualStartPosition { - get { return IsEureka ? JobRun.ActualStartPosition * 4 : JobRun.ActualStartPosition; } + get { return MachineType == MachineTypes.Eureka ? JobRun.ActualStartPosition * 4 : JobRun.ActualStartPosition; } } public double ActualEndPosition @@ -169,11 +169,11 @@ namespace Tango.FSE.Statistics.Models { if (JobRun.ActualEndPosition > 0) { - return IsEureka ? JobRun.ActualEndPosition * 4 : JobRun.ActualEndPosition; + return MachineType == MachineTypes.Eureka ? JobRun.ActualEndPosition * 4 : JobRun.ActualEndPosition; } else { - return IsEureka ? JobRun.EndPosition * 4 : JobRun.EndPosition; + return MachineType == MachineTypes.Eureka ? JobRun.EndPosition * 4 : JobRun.EndPosition; } } } @@ -257,5 +257,6 @@ namespace Tango.FSE.Statistics.Models return ActualEndPosition - ActualStartPosition; } } + } } diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs index cec9551f0..a45f65a54 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs @@ -436,7 +436,7 @@ namespace Tango.FSE.Statistics.ViewModels stop.ThreadName = rmlName; stop.IsAdvancedMode = !BuildProvider.IsTwineRSM && CurrentUser.HasRole(Roles.FSEAdvancedTechnician); stop.FineTuningModel = fineTuningModel; - stop.IsEureka = MachineProvider.MachineOperator.MachineType == MachineTypes.Eureka; + stop.MachineType = MachineProvider.MachineOperator.MachineType; if (fineTuningModel != null) { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/JobRunModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/JobRunModel.cs index 38005f2bc..7f9d0e57d 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/JobRunModel.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/JobRunModel.cs @@ -22,19 +22,17 @@ namespace Tango.MachineStudio.Statistics.Models public RmlModel Rml { get; set; } - public bool IsEureka { get; set; } - public String Gen { get { - return JobRun.MachineType == (int)MachineTypes.Eureka ? "X4" : "X1"; + return JobRun.MachineTypeEnum.ToShortName(); } } public double ActualStartPosition { - get { return IsEureka ? JobRun.ActualStartPosition * 4 : JobRun.ActualStartPosition; } + get { return JobRun.MachineTypeEnum == MachineTypes.Eureka ? JobRun.ActualStartPosition * 4 : JobRun.ActualStartPosition; } } public double ActualEndPosition @@ -43,11 +41,11 @@ namespace Tango.MachineStudio.Statistics.Models { if (JobRun.ActualEndPosition > 0) { - return IsEureka ? JobRun.ActualEndPosition * 4 : JobRun.ActualEndPosition; + return JobRun.MachineTypeEnum == MachineTypes.Eureka ? JobRun.ActualEndPosition * 4 : JobRun.ActualEndPosition; } else { - return IsEureka ? JobRun.EndPosition * 4 : JobRun.EndPosition; + return JobRun.MachineTypeEnum == MachineTypes.Eureka ? JobRun.EndPosition * 4 : JobRun.EndPosition; } } } @@ -64,7 +62,7 @@ namespace Tango.MachineStudio.Statistics.Models { get { - return (IsEureka ? JobRun.JobLogicalLength * 4 : JobRun.JobLogicalLength); + return (JobRun.MachineTypeEnum == MachineTypes.Eureka ? JobRun.JobLogicalLength * 4 : JobRun.JobLogicalLength); } } @@ -85,12 +83,11 @@ namespace Tango.MachineStudio.Statistics.Models HeatingDuration = JobRun.ActualStartDate - JobRun.HeatingStartDate; } - if (JobRun.MachineType == (int)MachineTypes.Eureka) + if (JobRun.MachineTypeEnum == MachineTypes.Eureka) { JobRun.JobLogicalLength *= 4; JobRun.JobLength *= 4; JobRun.EndPosition *= 4; - IsEureka = true; } } } diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.BugReporting/TFS/TeamFoundationServicePPCClient.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.BugReporting/TFS/TeamFoundationServicePPCClient.cs index c21d56f2a..c9e39b02b 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.BugReporting/TFS/TeamFoundationServicePPCClient.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.BugReporting/TFS/TeamFoundationServicePPCClient.cs @@ -102,7 +102,7 @@ namespace Tango.PPC.BugReporting.TFS item.Type = WorkItemType.Bug; item.Environment = SettingsManager.Default.GetOrCreate<PPCSettings>().DeploymentSlot.ToDescription(); - item.MachineType = _buildProvider.IsEureka ? MachineType.TwineX4 : MachineType.TS1800; + item.MachineType = (MachineType)_buildProvider.BuildType; FileLogger appFileLogger = LogManager.Default.RegisteredLoggers.FirstOrDefault(x => x.GetType() == typeof(FileLogger)) as FileLogger; FileLogger embeddedFileLogger = MachineOperator.EmbeddedLogManager.RegisteredLoggers.FirstOrDefault(x => x.GetType() == typeof(FileLogger)) as FileLogger; diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs index db5085b09..3446fe55d 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs @@ -448,7 +448,7 @@ namespace Tango.PPC.Common.Connection MachineConnected?.Invoke(this, new EventArgs()); - if (Machine.Type == BL.Enumerations.MachineTypes.Eureka) + if (Machine.Type.IsXMachine()) { try { diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs b/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs index 4aae63562..73be1c9d8 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs @@ -169,6 +169,16 @@ namespace Tango.BL.Entities } } + [NotMapped] + [JsonIgnore] + public MachineTypes MachineTypeEnum + { + get + { + return (MachineTypes)MachineType; + } + } + /// <summary> /// Initializes a new instance of the <see cref="JobRun" /> class. diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs index 694ee1f37..501dc7fd9 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs @@ -26,7 +26,10 @@ namespace Tango.BL.Entities [JsonIgnore] public MachineTypes MachineType { - get { return Version == 1 ? MachineTypes.TS1800 : MachineTypes.Eureka; } + get + { + return (MachineTypes)(Version + 1); + } } } } diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/MachineTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/MachineTypes.cs index 381b87cbc..1684d14d2 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/MachineTypes.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/MachineTypes.cs @@ -7,11 +7,26 @@ using System.Threading.Tasks; namespace Tango.BL.Enumerations { + public class MachineTypeAttribute : Attribute + { + public String ShortName { get; set; } + + public MachineTypeAttribute(String shortName) + { + ShortName = shortName; + } + } + public enum MachineTypes { + [MachineType("TS")] [Description("TS-1800")] TS1800 = 0, + [MachineType("X4")] [Description("Twine X4")] Eureka = 1, + [MachineType("X1")] + [Description("Twine X1")] + X1 = 2, } } diff --git a/Software/Visual_Studio/Tango.BL/ExtensionMethods/MachineTypesExtensions.cs b/Software/Visual_Studio/Tango.BL/ExtensionMethods/MachineTypesExtensions.cs new file mode 100644 index 000000000..d8b5b519d --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/ExtensionMethods/MachineTypesExtensions.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.BL.Enumerations; + +public static class MachineTypesExtensions +{ + public static bool IsXMachine(this MachineTypes machineType) + { + return machineType != MachineTypes.TS1800; + } + + public static String ToShortName(this MachineTypes machineType) + { + return machineType.GetAttribute<MachineTypeAttribute>().ShortName; + } +} diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj index dabc0455e..042105f11 100644 --- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj +++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj @@ -604,6 +604,7 @@ <Compile Include="Enumerations\YarnUnits.cs" /> <Compile Include="ExtensionMethods\ColorCatalogItemsExtensions.cs" /> <Compile Include="ExtensionMethods\ColorMineExtensions.cs" /> + <Compile Include="ExtensionMethods\MachineTypesExtensions.cs" /> <Compile Include="FineTuning\FineTuningTypes.cs" /> <Compile Include="FineTuning\VectorFineTuningRunModel.cs" /> <Compile Include="Helpers\EventTypeTextConverter.cs" /> @@ -837,7 +838,7 @@ </Target> <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" /> + <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Tango.PMR/Common/MachineType.cs b/Software/Visual_Studio/Tango.PMR/Common/MachineType.cs index 4ef97d168..6049ccefc 100644 --- a/Software/Visual_Studio/Tango.PMR/Common/MachineType.cs +++ b/Software/Visual_Studio/Tango.PMR/Common/MachineType.cs @@ -22,9 +22,9 @@ namespace Tango.PMR.Common { static MachineTypeReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChFNYWNoaW5lVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbiolCgtNYWNo", - "aW5lVHlwZRIKCgZUUzE4MDAQABIKCgZFdXJla2EQAUIcChpjb20udHdpbmUu", - "dGFuZ28ucG1yLmNvbW1vbmIGcHJvdG8z")); + "ChFNYWNoaW5lVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbiotCgtNYWNo", + "aW5lVHlwZRIKCgZUUzE4MDAQABIKCgZFdXJla2EQARIGCgJYMRACQhwKGmNv", + "bS50d2luZS50YW5nby5wbXIuY29tbW9uYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Common.MachineType), }, null)); @@ -36,6 +36,7 @@ namespace Tango.PMR.Common { public enum MachineType { [pbr::OriginalName("TS1800")] Ts1800 = 0, [pbr::OriginalName("Eureka")] Eureka = 1, + [pbr::OriginalName("X1")] X1 = 2, } #endregion diff --git a/Software/Visual_Studio/Tango.TFS/MachineType.cs b/Software/Visual_Studio/Tango.TFS/MachineType.cs index 044155b2b..9e8b20f3c 100644 --- a/Software/Visual_Studio/Tango.TFS/MachineType.cs +++ b/Software/Visual_Studio/Tango.TFS/MachineType.cs @@ -13,5 +13,7 @@ namespace Tango.TFS TS1800 = 0, [Description("Twine X4")] TwineX4 = 1, + [Description("Twine X1")] + TwineX1 = 2, } } |