From 882a6d54d60f05f3bf542ab43c3681f64152df41 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Thu, 27 Feb 2020 00:34:46 +0200 Subject: Added thread parameters DB, PMR, MachineOperator merging, Machine Studio. --- .../Views/ThreadParametersView.xaml | 82 ++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ThreadParametersView.xaml (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ThreadParametersView.xaml') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ThreadParametersView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ThreadParametersView.xaml new file mode 100644 index 000000000..ef2923303 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ThreadParametersView.xaml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + THREAD PARAMETERS + + + + + + + + + FEEDER + + + + + + + + + + + + + + PULLER + + + + + + + + + + + + + + WINDER + + + + + + + + + + + + + + + + + + -- cgit v1.3.1 From 1b0bdf6f8148e9cc4e7e07e41e9e2d75039c1349 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 3 Mar 2020 13:31:43 +0200 Subject: Added Bypass Rockers to Thread Parameters. Added RML Spools to DTO Action Logs. --- Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 22675456 -> 22675456 bytes .../PMR/Messages/Printing/ThreadParameters.proto | 2 + .../Views/ThreadParametersView.xaml | 94 +++++++------ .../PPC/Tango.PPC.Common/Tango.PPC.Common.csproj | 2 +- Software/Visual_Studio/Tango.BL/DTO/RmlDTO.cs | 3 + Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs | 8 ++ .../Visual_Studio/Tango.BL/DTO/RmlsSpoolDTO.cs | 7 + .../Visual_Studio/Tango.BL/Entities/RmlBase.cs | 38 +++++ Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs | 1 + .../Tango.DAL.Remote/DB/RemoteADO.Designer.cs | 2 +- .../Tango.DAL.Remote/DB/RemoteADO.edmx | 3 + .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram | 154 ++++++++++----------- .../Tango.PMR/Printing/ThreadParameters.cs | 37 ++++- 14 files changed, 229 insertions(+), 122 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ThreadParametersView.xaml') diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index 6a0f75636..523dccb23 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index ef5f47cb0..5ad20f32a 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/PMR/Messages/Printing/ThreadParameters.proto b/Software/PMR/Messages/Printing/ThreadParameters.proto index f5d18d1fe..19775db32 100644 --- a/Software/PMR/Messages/Printing/ThreadParameters.proto +++ b/Software/PMR/Messages/Printing/ThreadParameters.proto @@ -16,4 +16,6 @@ message ThreadParameters int32 WinderP = 7; int32 WinderI = 8; int32 WinderD = 9; + + bool BypassRockers = 10; } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ThreadParametersView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ThreadParametersView.xaml index ef2923303..7f1ca2262 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ThreadParametersView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ThreadParametersView.xaml @@ -29,53 +29,69 @@ - - - - - FEEDER - - - + + + + + + FEEDER + + + - - + + - - - - + + + + - - PULLER - - - + + PULLER + + + - - + + - - - - + + + + - - WINDER - - - + + WINDER + + + - - + + - - - - - - - + + + + + + + + + + + + + ROCKERS + + + + + + + + + diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj index e4d49491c..382405705 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj @@ -427,7 +427,7 @@ - + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlDTO.cs index 8931a4b3e..928d2142d 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/RmlDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlDTO.cs @@ -17,10 +17,13 @@ namespace Tango.BL.DTO [ObservableDTOProperty(MapsTo = nameof(Rml.Cct) + "." + nameof(Rml.Cct.FileName))] public String CctFileName { get; set; } + public List RmlsSpools { get; set; } + public RmlDTO() { ProcessParametersTablesGroups = new List(); LiquidTypesRmls = new List(); + RmlsSpools = new List(); } protected override string OnGetActionLogName() diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs index 7ffc640f1..c30f9c42b 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs @@ -341,5 +341,13 @@ namespace Tango.BL.DTO get; set; } + /// + /// bypass rockers + /// + public Boolean BypassRockers + { + get; set; + } + } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTO.cs index c2839f8a0..9f2ff491e 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTO.cs @@ -4,11 +4,18 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Tango.BL.Entities; namespace Tango.BL.DTO { public class RmlsSpoolDTO : RmlsSpoolDTOBase { + [ObservableDTOProperty(MapsTo = nameof(RmlsSpool.SpoolType) + "." + nameof(RmlsSpool.SpoolType.Name))] + public String SpoolTypeName { get; set; } + protected override string OnGetActionLogName() + { + return $"'{(SpoolTypeName != null ? SpoolTypeName : SpoolTypeGuid)}' Calibration"; + } } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs index 758c7fa41..f56de3208 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs @@ -93,6 +93,8 @@ namespace Tango.BL.Entities public event EventHandler WinderDChanged; + public event EventHandler BypassRockersChanged; + public event EventHandler> CatsChanged; public event EventHandler CctChanged; @@ -1194,6 +1196,33 @@ namespace Tango.BL.Entities } } + protected Boolean _bypassrockers; + + /// + /// Gets or sets the rmlbase bypass rockers. + /// + + [Column("BYPASS_ROCKERS")] + + public Boolean BypassRockers + { + get + { + return _bypassrockers; + } + + set + { + if (_bypassrockers != value) + { + _bypassrockers = value; + + OnBypassRockersChanged(value); + + } + } + } + protected SynchronizedObservableCollection _cats; /// @@ -1890,6 +1919,15 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(WinderD)); } + /// + /// Called when the BypassRockers has changed. + /// + protected virtual void OnBypassRockersChanged(Boolean bypassrockers) + { + BypassRockersChanged?.Invoke(this, bypassrockers); + RaisePropertyChanged(nameof(BypassRockers)); + } + /// /// Called when the Cats has changed. /// diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs index 6f5119865..17eb2ec66 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs @@ -69,6 +69,7 @@ namespace Tango.DAL.Remote.DB public int WINDER_P { get; set; } public int WINDER_I { get; set; } public int WINDER_D { get; set; } + public bool BYPASS_ROCKERS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection CATS { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs index d26e67908..17bc2683d 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs @@ -1,4 +1,4 @@ -// T4 code generation is enabled for model 'C:\DATA\Development\Tango\Software\Visual_Studio\Tango.DAL.Remote\DB\RemoteADO.edmx'. +// T4 code generation is enabled for model 'D:\Development\Tango\Software\Visual_Studio\Tango.DAL.Remote\DB\RemoteADO.edmx'. // To enable legacy code generation, change the value of the 'Code Generation Strategy' designer // property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model // is open in the designer. diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx index f10a28eee..41f24052a 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -942,6 +942,7 @@ + @@ -4275,6 +4276,7 @@ + @@ -6688,6 +6690,7 @@ + diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram index 6785d4c6e..95c9f4744 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,85 +5,85 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/Tango.PMR/Printing/ThreadParameters.cs b/Software/Visual_Studio/Tango.PMR/Printing/ThreadParameters.cs index 3c927627f..edfd5c457 100644 --- a/Software/Visual_Studio/Tango.PMR/Printing/ThreadParameters.cs +++ b/Software/Visual_Studio/Tango.PMR/Printing/ThreadParameters.cs @@ -23,15 +23,16 @@ namespace Tango.PMR.Printing { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChZUaHJlYWRQYXJhbWV0ZXJzLnByb3RvEhJUYW5nby5QTVIuUHJpbnRpbmci", - "qwEKEFRocmVhZFBhcmFtZXRlcnMSDwoHRmVlZGVyUBgBIAEoBRIPCgdGZWVk", + "wgEKEFRocmVhZFBhcmFtZXRlcnMSDwoHRmVlZGVyUBgBIAEoBRIPCgdGZWVk", "ZXJJGAIgASgFEg8KB0ZlZWRlckQYAyABKAUSDwoHUHVsbGVyUBgEIAEoBRIP", "CgdQdWxsZXJJGAUgASgFEg8KB1B1bGxlckQYBiABKAUSDwoHV2luZGVyUBgH", - "IAEoBRIPCgdXaW5kZXJJGAggASgFEg8KB1dpbmRlckQYCSABKAVCHgocY29t", - "LnR3aW5lLnRhbmdvLnBtci5wcmludGluZ2IGcHJvdG8z")); + "IAEoBRIPCgdXaW5kZXJJGAggASgFEg8KB1dpbmRlckQYCSABKAUSFQoNQnlw", + "YXNzUm9ja2VycxgKIAEoCEIeChxjb20udHdpbmUudGFuZ28ucG1yLnByaW50", + "aW5nYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.ThreadParameters), global::Tango.PMR.Printing.ThreadParameters.Parser, new[]{ "FeederP", "FeederI", "FeederD", "PullerP", "PullerI", "PullerD", "WinderP", "WinderI", "WinderD" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.ThreadParameters), global::Tango.PMR.Printing.ThreadParameters.Parser, new[]{ "FeederP", "FeederI", "FeederD", "PullerP", "PullerI", "PullerD", "WinderP", "WinderI", "WinderD", "BypassRockers" }, null, null, null) })); } #endregion @@ -71,6 +72,7 @@ namespace Tango.PMR.Printing { winderP_ = other.winderP_; winderI_ = other.winderI_; winderD_ = other.winderD_; + bypassRockers_ = other.bypassRockers_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -177,6 +179,17 @@ namespace Tango.PMR.Printing { } } + /// Field number for the "BypassRockers" field. + public const int BypassRockersFieldNumber = 10; + private bool bypassRockers_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool BypassRockers { + get { return bypassRockers_; } + set { + bypassRockers_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as ThreadParameters); @@ -199,6 +212,7 @@ namespace Tango.PMR.Printing { if (WinderP != other.WinderP) return false; if (WinderI != other.WinderI) return false; if (WinderD != other.WinderD) return false; + if (BypassRockers != other.BypassRockers) return false; return true; } @@ -214,6 +228,7 @@ namespace Tango.PMR.Printing { if (WinderP != 0) hash ^= WinderP.GetHashCode(); if (WinderI != 0) hash ^= WinderI.GetHashCode(); if (WinderD != 0) hash ^= WinderD.GetHashCode(); + if (BypassRockers != false) hash ^= BypassRockers.GetHashCode(); return hash; } @@ -260,6 +275,10 @@ namespace Tango.PMR.Printing { output.WriteRawTag(72); output.WriteInt32(WinderD); } + if (BypassRockers != false) { + output.WriteRawTag(80); + output.WriteBool(BypassRockers); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -292,6 +311,9 @@ namespace Tango.PMR.Printing { if (WinderD != 0) { size += 1 + pb::CodedOutputStream.ComputeInt32Size(WinderD); } + if (BypassRockers != false) { + size += 1 + 1; + } return size; } @@ -327,6 +349,9 @@ namespace Tango.PMR.Printing { if (other.WinderD != 0) { WinderD = other.WinderD; } + if (other.BypassRockers != false) { + BypassRockers = other.BypassRockers; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -373,6 +398,10 @@ namespace Tango.PMR.Printing { WinderD = input.ReadInt32(); break; } + case 80: { + BypassRockers = input.ReadBool(); + break; + } } } } -- cgit v1.3.1