From ff4ff38b6c497103ed80583277fc465bbeda833c Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Tue, 10 Oct 2023 17:38:50 +0300 Subject: Restart menu pop up - cuts menu text. Related Work Items: #9123 --- Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI') 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 3664e3997..1196a2c0e 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml @@ -177,7 +177,7 @@ - + @@ -196,16 +196,16 @@ - + - + - Restart + Restart -- cgit v1.3.1 From 81875b89c85e0785e4f575a6f24e05435cdec0af Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Wed, 18 Oct 2023 11:30:52 +0300 Subject: Added update version/update db icons to x4 --- .../PPC/Tango.PPC.UI/Images/Menu/updateDB.png | Bin 0 -> 568 bytes .../PPC/Tango.PPC.UI/Images/Menu/updateVersion.png | Bin 0 -> 457 bytes .../PPC/Tango.PPC.UI/Tango.PPC.UI.csproj | 4 +- .../PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs | 44 +++++++++++++++++++++ .../PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml | 4 +- 5 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Menu/updateDB.png create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Menu/updateVersion.png (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI') diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Menu/updateDB.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Menu/updateDB.png new file mode 100644 index 000000000..519f570fc Binary files /dev/null and b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Menu/updateDB.png differ diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Menu/updateVersion.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Menu/updateVersion.png new file mode 100644 index 000000000..5510f1006 Binary files /dev/null and b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Menu/updateVersion.png differ 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 a0fba3632..8f65f225b 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 @@ -646,6 +646,8 @@ + + @@ -991,7 +993,7 @@ if $(ConfigurationName) == Eureka copy /Y "$(ProjectDir)Intro.wmv" "$(TargetDir) - + diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs index 17b676499..56314414a 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs @@ -14,8 +14,10 @@ using Tango.Integration.Operation; using Tango.PMR.IFS; using Tango.PPC.Common; using Tango.PPC.Common.Connection; +using Tango.PPC.Common.MachineUpdate; using Tango.PPC.Common.Modules; using Tango.PPC.Common.Navigation; +using Tango.PPC.Common.Web; using Tango.PPC.UI.Dialogs; using Tango.PPC.UI.Views; using Tango.PPC.UI.ViewsContracts; @@ -39,6 +41,9 @@ namespace Tango.PPC.UI.ViewModels [TangoInject] public IPPCModuleLoader ModuleLoader { get; set; } + [TangoInject] + public IMachineUpdateManager MachineUpdateManager { get; set; } + #region Classes public class CartridgeModel : ExtendedObject @@ -230,6 +235,26 @@ namespace Tango.PPC.UI.ViewModels set { _currentDateTime = value; RaisePropertyChangedAuto(); } } + private bool _enableDBUpdate; + /// + /// Gets or sets a value indicating whether to automatically check for new application updates. + /// + public bool EnableDBUpdate + { + get { return _enableDBUpdate; } + set { _enableDBUpdate = value; RaisePropertyChangedAuto(); } + } + + private bool _enableVersionUpdate; + /// + /// Gets or sets a value indicating whether to automatically check for new application updates. + /// + public bool EnableVersionUpdate + { + get { return _enableVersionUpdate; } + set { _enableVersionUpdate = value; RaisePropertyChangedAuto(); } + } + #endregion #region Commands @@ -327,6 +352,8 @@ namespace Tango.PPC.UI.ViewModels _date_timer.Interval = TimeSpan.FromSeconds(1); _date_timer.Tick += _date_timer_Tick; _date_timer.Start(); + + _enableDBUpdate = _enableVersionUpdate = false; } #endregion @@ -564,6 +591,22 @@ namespace Tango.PPC.UI.ViewModels MachineProvider.MachineOperator.InkFillingStatusChanged += MachineOperator_InkFillingStatusChanged; } + private void MachineUpdateManager_UpdateAvailable(object sender, CheckForUpdateResponse e) + { + EnableVersionUpdate = false; + EnableDBUpdate = false; + + if(e.IsUpdateAvailable) + { + EnableVersionUpdate = true; + return; + } + else if (e.IsDatabaseUpdateAvailable) + { + EnableDBUpdate = true; + } + } + private void MachineOperator_InkFillingStatusChanged(object sender, InkFillingStatusChangedEventArgs e) { if (Cartridges == null) @@ -618,6 +661,7 @@ namespace Tango.PPC.UI.ViewModels { base.OnApplicationReady(); MachineProvider.MachineOperator.StatusChanged += MachineOperator_StatusChanged; + MachineUpdateManager.UpdateAvailable += MachineUpdateManager_UpdateAvailable; } private void MachineOperator_StatusChanged(object sender, MachineStatuses e) diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml index 049f2268d..62538d9d6 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml @@ -119,7 +119,9 @@ - Update + Update + + -- cgit v1.3.1 From 648437dec6e56e32218d88b7a85e70ac00b6e98a Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Sun, 22 Oct 2023 13:54:49 +0300 Subject: Changed Number of Spools in Converters and GUI PPC. --- .../Tango.PPC.JobsV2/ViewModels/JobViewVM.cs | 5 +++-- .../Modules/Tango.PPC.JobsV2/Views/JobsView.xaml | 4 ++-- .../Converters/ProgressLengthSpoolConverter.cs | 12 +++++++----- .../Converters/ProgressUnitSpoolConverter.cs | 6 +++--- .../Converters/ProgressWeightSpoolConverter.cs | 12 +++++++----- .../PPC/Tango.PPC.UI/Views/MachineStatusView.xaml | 13 +++++++++---- Software/Visual_Studio/Tango.BL/Entities/Job.cs | 21 +++++++-------------- 7 files changed, 38 insertions(+), 35 deletions(-) (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI') diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs index dffa9b241..8a01e07cc 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs @@ -632,8 +632,8 @@ namespace Tango.PPC.Jobs.ViewModels JobType = Job.JobType, InterSegmentLength = Job.InterSegmentLength, EnableInterSegment = Job.EnableInterSegment, - NumberSpools = (BuildProvider.IsEureka ? Job.Spools : 1), - Copies = (BuildProvider.IsEureka ? Job.NumberOfUnits * Job.Spools : Job.NumberOfUnits) + NumberSpools = (BuildProvider.IsEureka ? Job.NumberOfSpools : 1), + Copies = (BuildProvider.IsEureka ? Job.NumberOfUnits * Job.NumberOfSpools : Job.NumberOfUnits) }; Dictionary guidToGroup = new Dictionary(); if (Job.Version < 2) @@ -1607,6 +1607,7 @@ namespace Tango.PPC.Jobs.ViewModels { Job.SpoolType = _spoolTypes.FirstOrDefault(x => x.Code == (int)BL.Enumerations.SpoolTypes.StandardSpool); } + Job.NumberOfSpools = JobModel.NumberSpools; var oldSegments = Job.Segments.ToList(); diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml index b57619c8c..ec080ebed 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml @@ -285,7 +285,7 @@ - + @@ -408,7 +408,7 @@ - + diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/ProgressLengthSpoolConverter.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/ProgressLengthSpoolConverter.cs index 377d02d81..f43405085 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/ProgressLengthSpoolConverter.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/ProgressLengthSpoolConverter.cs @@ -15,11 +15,12 @@ namespace Tango.PPC.UI.Converters { try { - if (values.Count() == 2) + if (values.Count() == 3) { double length = System.Convert.ToDouble(values[0]); bool forOneSpool = System.Convert.ToBoolean(values[1]); - var totalBy4Spools = (double)length*4;// spools ; + int number_of_spools = System.Convert.ToInt16(values[2]); + var totalBy4Spools = (double)length* number_of_spools; if (forOneSpool) { return (double)totalBy4Spools / 4; @@ -27,14 +28,15 @@ namespace Tango.PPC.UI.Converters return totalBy4Spools; } - if (values.Count() == 3) + if (values.Count() == 4) { double length = System.Convert.ToDouble(values[0]); bool forOneSpool = System.Convert.ToBoolean(values[1]); double currentProgresslength = System.Convert.ToDouble(values[2]) ; + int number_of_spools = System.Convert.ToInt16(values[3]); - var totalBy4Spools = (double)length * 4; - var currentProgressBy4Spools = (double)currentProgresslength * 4 ; + var totalBy4Spools = (double)length * number_of_spools; + var currentProgressBy4Spools = (double)currentProgresslength * number_of_spools; int coeff = (int)currentProgressBy4Spools / (int)totalBy4Spools; var progressCurrent = (coeff == 0 || coeff == 1) ? currentProgressBy4Spools : currentProgressBy4Spools % (coeff * totalBy4Spools);//show for progress diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/ProgressUnitSpoolConverter.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/ProgressUnitSpoolConverter.cs index d0cc8284e..66303ab27 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/ProgressUnitSpoolConverter.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/ProgressUnitSpoolConverter.cs @@ -14,11 +14,11 @@ namespace Tango.PPC.UI.Converters { try { - if (values.Count() == 1)//may be added count of spools + if (values.Count() == 2)//may be added count of spools { int CurrentUnit = System.Convert.ToInt16(values[0]); - - var totalBy4Spools = (double)CurrentUnit * 4;// spools ; + int number_of_spools = System.Convert.ToInt16(values[1]); + var totalBy4Spools = (double)CurrentUnit * number_of_spools; return totalBy4Spools.ToString(); diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/ProgressWeightSpoolConverter.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/ProgressWeightSpoolConverter.cs index f451fe0d9..7ffb1e8a7 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/ProgressWeightSpoolConverter.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/ProgressWeightSpoolConverter.cs @@ -16,12 +16,13 @@ namespace Tango.PPC.UI.Converters { try { - if (values.Count() == 3) + if (values.Count() == 4) { double length = System.Convert.ToDouble(values[0]); bool forOneSpool = System.Convert.ToBoolean(values[1]); double coef = System.Convert.ToDouble(values[2]); - var totalBy4Spools = (double)length * 4;// spools ; + int number_of_spools = System.Convert.ToInt16(values[3]); + var totalBy4Spools = (double)length * number_of_spools; var weight = ((double)totalBy4Spools * coef) / (1000);//(g) if (forOneSpool) @@ -31,15 +32,16 @@ namespace Tango.PPC.UI.Converters return weight; } - if (values.Count() == 4) + if (values.Count() == 5) { double length = System.Convert.ToDouble(values[0]); bool forOneSpool = System.Convert.ToBoolean(values[1]); double currentProgresslength = System.Convert.ToDouble(values[2]); double coef = System.Convert.ToDouble(values[3]); + int number_of_spools = System.Convert.ToInt16(values[4]); - var totalBy4Spools = (double)length * 4; - var currentProgressBy4Spools = (double)currentProgresslength * 4; + var totalBy4Spools = (double)length * number_of_spools; + var currentProgressBy4Spools = (double)currentProgresslength * number_of_spools; int coeff = (int)currentProgressBy4Spools / (int)totalBy4Spools; var progressCurrent = (coeff == 0 || coeff == 1) ? currentProgressBy4Spools : currentProgressBy4Spools % (coeff * totalBy4Spools);//show for progress diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml index 0436cdab6..f9338b813 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml @@ -558,7 +558,7 @@ Spools - + @@ -650,6 +650,7 @@ + @@ -659,6 +660,7 @@ + @@ -673,6 +675,7 @@ + @@ -683,6 +686,7 @@ + @@ -792,7 +796,7 @@ - + @@ -807,7 +811,7 @@ - + @@ -830,6 +834,7 @@ + @@ -1019,7 +1024,7 @@ - + diff --git a/Software/Visual_Studio/Tango.BL/Entities/Job.cs b/Software/Visual_Studio/Tango.BL/Entities/Job.cs index 29f7e1054..328d74f0c 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Job.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Job.cs @@ -99,9 +99,9 @@ namespace Tango.BL.Entities { get { - if (Spools >= 4) + if (NumberOfSpools >= 4) { - return LengthIncludingNumberOfUnits * Spools; + return LengthIncludingNumberOfUnits * NumberOfSpools; } return LengthIncludingNumberOfUnits; @@ -129,9 +129,9 @@ namespace Tango.BL.Entities { get { - if (Spools >= 4) + if (NumberOfSpools >= 4) { - return WeightIncludingNumberOfUnits * Spools; + return WeightIncludingNumberOfUnits * NumberOfSpools; } return WeightIncludingNumberOfUnits; @@ -144,9 +144,9 @@ namespace Tango.BL.Entities { get { - if (Spools >= 4) + if (NumberOfSpools >= 4) { - return NumberOfUnits * Spools; + return NumberOfUnits * NumberOfSpools; } return NumberOfUnits; } @@ -218,14 +218,7 @@ namespace Tango.BL.Entities RaisePropertyChangedAuto(); } } - - [NotMapped] - [JsonIgnore] - public int Spools - { - get { return 4; }//headunits? - } - + /// /// Gets or sets the effective segments. /// -- cgit v1.3.1 From 7f2ff77f2fe695c13e9c36a9706ed6e63d0ece24 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Sun, 22 Oct 2023 17:34:14 +0300 Subject: Added Number of spools to PMR. --- Software/PMR/Messages/Exports/JobFile.proto | 1 + .../Modules/Tango.PPC.JobsV2/Models/JobModel.cs | 12 ++++++-- .../Tango.PPC.JobsV2/ViewModels/JobViewVM.cs | 1 + .../PPC/Tango.PPC.UI/Views/MachineStatusView.xaml | 2 +- Software/Visual_Studio/Tango.BL/Entities/Job.cs | 2 ++ .../Visual_Studio/Tango.PMR/Exports/JobFile.cs | 36 +++++++++++++++++++--- 6 files changed, 46 insertions(+), 8 deletions(-) (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI') diff --git a/Software/PMR/Messages/Exports/JobFile.proto b/Software/PMR/Messages/Exports/JobFile.proto index f409e09f5..8b9af7c99 100644 --- a/Software/PMR/Messages/Exports/JobFile.proto +++ b/Software/PMR/Messages/Exports/JobFile.proto @@ -30,4 +30,5 @@ message JobFile repeated JobFileSegment Segments = 21; string ColorCatalogGuid = 22; int32 Version = 23; + int32 NumberOfSpools = 24; } \ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/JobModel.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/JobModel.cs index 983719e57..35569d74f 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/JobModel.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/JobModel.cs @@ -362,7 +362,6 @@ namespace Tango.PPC.Jobs.Models _numberSpools = value; RaisePropertyChangedAuto(); OnNumberOfSpoolsChanged(); - RaisePropertyChanged(nameof(Copies)); OnUpdateLengthhWeight(); } } @@ -897,7 +896,13 @@ namespace Tango.PPC.Jobs.Models private void OnEnableInterSegmentChanged() { + if(EnableInterSegment == false && InterSegmentLength > 0) + { + _intersegmentlength = 0; + RaisePropertyChanged(nameof(InterSegmentLength)); + } _groupingSegments.ToList().ForEach(x => x.EnableInterSegment = EnableInterSegment); + OnLengthChanged(); UpdateEffectiveSegments(); } @@ -1141,10 +1146,11 @@ namespace Tango.PPC.Jobs.Models private void OnNumberOfSpoolsChanged() { - if(NumberSpools > 0) + if(NumberSpools >= 4) { int coeff = (int)(Copies + NumberSpools -1) / NumberSpools; - Copies = coeff * NumberSpools; + _copies = coeff * NumberSpools; + RaisePropertyChanged(nameof(Copies)); } } diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs index 8a01e07cc..2ffa84992 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs @@ -258,6 +258,7 @@ namespace Tango.PPC.Jobs.ViewModels SetOrDiscardAll(); return; } + JobModel.EnableInterSegment = false; } _isBasicMode = value; RaisePropertyChangedAuto(); diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml index f9338b813..f3d3e021a 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml @@ -1177,7 +1177,7 @@ - Winder + Winder BTSR diff --git a/Software/Visual_Studio/Tango.BL/Entities/Job.cs b/Software/Visual_Studio/Tango.BL/Entities/Job.cs index 328d74f0c..3139a5a5b 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Job.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Job.cs @@ -937,6 +937,7 @@ namespace Tango.BL.Entities jobFile.Type = job.Type; jobFile.WindingMethodGuid = job.WindingMethodGuid; jobFile.ColorCatalogGuid = job.ColorCatalogGuid.ToStringOrEmpty(); + jobFile.NumberOfSpools = job.NumberOfSpools; jobFile.Version = job.Version; foreach (var segm in job.OrderedSegmentsWithGroups) @@ -1055,6 +1056,7 @@ namespace Tango.BL.Entities job.LengthPercentageFactor = jobFile.LengthPercentageFactor; job.Name = jobFile.Name.ToNullIfEmpty(); job.NumberOfUnits = jobFile.NumberOfUnits; + job.NumberOfSpools = jobFile.NumberOfSpools; job.Version = jobFile.Version; var job_rml = db.Rmls.SingleOrDefault(x => x.Guid == jobFile.RmlGuid); diff --git a/Software/Visual_Studio/Tango.PMR/Exports/JobFile.cs b/Software/Visual_Studio/Tango.PMR/Exports/JobFile.cs index dda4e2441..3087bd921 100644 --- a/Software/Visual_Studio/Tango.PMR/Exports/JobFile.cs +++ b/Software/Visual_Studio/Tango.PMR/Exports/JobFile.cs @@ -23,7 +23,7 @@ namespace Tango.PMR.Exports { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "Cg1Kb2JGaWxlLnByb3RvEhFUYW5nby5QTVIuRXhwb3J0cxoUSm9iRmlsZVNl", - "Z21lbnQucHJvdG8izAQKB0pvYkZpbGUSDAoETmFtZRgBIAEoCRITCgtEZXNj", + "Z21lbnQucHJvdG8i5AQKB0pvYkZpbGUSDAoETmFtZRgBIAEoCRITCgtEZXNj", "cmlwdGlvbhgCIAEoCRIaChJFbmFibGVJbnRlclNlZ21lbnQYAyABKAgSGgoS", "SW50ZXJTZWdtZW50TGVuZ3RoGAQgASgBEg8KB1JtbEd1aWQYBSABKAkSGQoR", "V2luZGluZ01ldGhvZEd1aWQYBiABKAkSFQoNU3Bvb2xUeXBlR3VpZBgHIAEo", @@ -36,12 +36,12 @@ namespace Tango.PMR.Exports { "YW1wbGVVbml0c09yTWV0ZXJzGBMgASgFEh4KFkxlbmd0aFBlcmNlbnRhZ2VG", "YWN0b3IYFCABKAESMwoIU2VnbWVudHMYFSADKAsyIS5UYW5nby5QTVIuRXhw", "b3J0cy5Kb2JGaWxlU2VnbWVudBIYChBDb2xvckNhdGFsb2dHdWlkGBYgASgJ", - "Eg8KB1ZlcnNpb24YFyABKAVCHQobY29tLnR3aW5lLnRhbmdvLnBtci5leHBv", - "cnRzYgZwcm90bzM=")); + "Eg8KB1ZlcnNpb24YFyABKAUSFgoOTnVtYmVyT2ZTcG9vbHMYGCABKAVCHQob", + "Y29tLnR3aW5lLnRhbmdvLnBtci5leHBvcnRzYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Tango.PMR.Exports.JobFileSegmentReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Exports.JobFile), global::Tango.PMR.Exports.JobFile.Parser, new[]{ "Name", "Description", "EnableInterSegment", "InterSegmentLength", "RmlGuid", "WindingMethodGuid", "SpoolTypeGuid", "EnableLubrication", "HasEmbroideryFile", "EmbroideryFileData", "EmbroideryFileName", "EmbroideryJpeg", "ColorSpaceGuid", "NumberOfUnits", "Type", "Customer", "SpoolsDistribution", "NumberOfHeads", "SampleUnitsOrMeters", "LengthPercentageFactor", "Segments", "ColorCatalogGuid", "Version" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Exports.JobFile), global::Tango.PMR.Exports.JobFile.Parser, new[]{ "Name", "Description", "EnableInterSegment", "InterSegmentLength", "RmlGuid", "WindingMethodGuid", "SpoolTypeGuid", "EnableLubrication", "HasEmbroideryFile", "EmbroideryFileData", "EmbroideryFileName", "EmbroideryJpeg", "ColorSpaceGuid", "NumberOfUnits", "Type", "Customer", "SpoolsDistribution", "NumberOfHeads", "SampleUnitsOrMeters", "LengthPercentageFactor", "Segments", "ColorCatalogGuid", "Version", "NumberOfSpools" }, null, null, null) })); } #endregion @@ -95,6 +95,7 @@ namespace Tango.PMR.Exports { segments_ = other.segments_.Clone(); colorCatalogGuid_ = other.colorCatalogGuid_; version_ = other.version_; + numberOfSpools_ = other.numberOfSpools_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -354,6 +355,17 @@ namespace Tango.PMR.Exports { } } + /// Field number for the "NumberOfSpools" field. + public const int NumberOfSpoolsFieldNumber = 24; + private int numberOfSpools_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int NumberOfSpools { + get { return numberOfSpools_; } + set { + numberOfSpools_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as JobFile); @@ -390,6 +402,7 @@ namespace Tango.PMR.Exports { if(!segments_.Equals(other.segments_)) return false; if (ColorCatalogGuid != other.ColorCatalogGuid) return false; if (Version != other.Version) return false; + if (NumberOfSpools != other.NumberOfSpools) return false; return true; } @@ -419,6 +432,7 @@ namespace Tango.PMR.Exports { hash ^= segments_.GetHashCode(); if (ColorCatalogGuid.Length != 0) hash ^= ColorCatalogGuid.GetHashCode(); if (Version != 0) hash ^= Version.GetHashCode(); + if (NumberOfSpools != 0) hash ^= NumberOfSpools.GetHashCode(); return hash; } @@ -518,6 +532,10 @@ namespace Tango.PMR.Exports { output.WriteRawTag(184, 1); output.WriteInt32(Version); } + if (NumberOfSpools != 0) { + output.WriteRawTag(192, 1); + output.WriteInt32(NumberOfSpools); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -590,6 +608,9 @@ namespace Tango.PMR.Exports { if (Version != 0) { size += 2 + pb::CodedOutputStream.ComputeInt32Size(Version); } + if (NumberOfSpools != 0) { + size += 2 + pb::CodedOutputStream.ComputeInt32Size(NumberOfSpools); + } return size; } @@ -665,6 +686,9 @@ namespace Tango.PMR.Exports { if (other.Version != 0) { Version = other.Version; } + if (other.NumberOfSpools != 0) { + NumberOfSpools = other.NumberOfSpools; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -767,6 +791,10 @@ namespace Tango.PMR.Exports { Version = input.ReadInt32(); break; } + case 192: { + NumberOfSpools = input.ReadInt32(); + break; + } } } } -- cgit v1.3.1 From 91851a079afd4b3956753b7e393c63ae631b6df8 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Sun, 22 Oct 2023 18:18:15 +0300 Subject: Bug in converter --- .../PPC/Tango.PPC.UI/Converters/ProgressLengthSpoolConverter.cs | 4 ++-- .../PPC/Tango.PPC.UI/Converters/ProgressWeightSpoolConverter.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI') diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/ProgressLengthSpoolConverter.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/ProgressLengthSpoolConverter.cs index f43405085..3dd91806d 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/ProgressLengthSpoolConverter.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/ProgressLengthSpoolConverter.cs @@ -23,7 +23,7 @@ namespace Tango.PPC.UI.Converters var totalBy4Spools = (double)length* number_of_spools; if (forOneSpool) { - return (double)totalBy4Spools / 4; + return (double)totalBy4Spools / number_of_spools; } return totalBy4Spools; @@ -43,7 +43,7 @@ namespace Tango.PPC.UI.Converters if (forOneSpool) { - return (double)progressCurrent / 4; + return (double)progressCurrent / number_of_spools; } return progressCurrent; diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/ProgressWeightSpoolConverter.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/ProgressWeightSpoolConverter.cs index 7ffb1e8a7..f93e34c7d 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/ProgressWeightSpoolConverter.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/ProgressWeightSpoolConverter.cs @@ -27,7 +27,7 @@ namespace Tango.PPC.UI.Converters var weight = ((double)totalBy4Spools * coef) / (1000);//(g) if (forOneSpool) { - return (double)weight / 4; + return (double)weight / number_of_spools; } return weight; @@ -48,7 +48,7 @@ namespace Tango.PPC.UI.Converters var weight = ((double)progressCurrent * coef) / (1000);//(g) if (forOneSpool) { - return (double)weight / 4; + return (double)weight / number_of_spools; } return weight; -- cgit v1.3.1 From 8be305698d1e20aa42150a80ec44413294c99a64 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Mon, 23 Oct 2023 14:32:17 +0300 Subject: Gui update for filling mid tank Related Work Items: #9189 --- Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI') diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml index f3d3e021a..ada513879 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml @@ -129,7 +129,7 @@ - + @@ -208,7 +208,7 @@ - + -- cgit v1.3.1 From b428d54cba43ad40cf422ef6e69ccb85d8f4a146 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Mon, 23 Oct 2023 21:18:50 +0300 Subject: PPC. New images - backup_restore, machine-image and machine for X4. --- .../Images/backup-restoreX4.png | Bin 0 -> 143486 bytes .../Tango.PPC.BackupRestore.csproj | 3 +++ .../Tango.PPC.BackupRestore/Views/MainView.xaml | 13 ++++++++++++- .../Images/Guides/machine-image-X4.png | Bin 0 -> 99444 bytes .../Tango.PPC.Maintenance/Tango.PPC.Maintenance.csproj | 5 ++++- .../PPC/Modules/Tango.PPC.Power/Images/machine-X4.png | Bin 0 -> 36278 bytes .../PPC/Tango.PPC.UI/Images/machine-X4.png | Bin 0 -> 36278 bytes .../PPC/Tango.PPC.UI/Images/machine-image-X4.png | Bin 0 -> 99444 bytes .../Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj | 4 +++- .../PPC/Tango.PPC.UI/Views/EmergencyView.xaml | 13 ++++++++++++- .../PPC/Tango.PPC.UI/Views/ExternalBridgeView.xaml | 13 ++++++++++++- .../PPC/Tango.PPC.UI/Views/RestartingSystemView.xaml | 13 ++++++++++++- .../PPC/Tango.PPC.UI/Views/RestartingView.xaml | 13 ++++++++++++- 13 files changed, 70 insertions(+), 7 deletions(-) create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Images/backup-restoreX4.png create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/Guides/machine-image-X4.png create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Images/machine-X4.png create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.UI/Images/machine-X4.png create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.UI/Images/machine-image-X4.png (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI') diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Images/backup-restoreX4.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Images/backup-restoreX4.png new file mode 100644 index 000000000..65ebb2b1d Binary files /dev/null and b/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Images/backup-restoreX4.png differ diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Tango.PPC.BackupRestore.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Tango.PPC.BackupRestore.csproj index 99ac13ae4..b3fbdd624 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Tango.PPC.BackupRestore.csproj +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Tango.PPC.BackupRestore.csproj @@ -237,6 +237,9 @@ + + + diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Views/MainView.xaml index 0caabd0e1..9aac37f7b 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Views/MainView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Views/MainView.xaml @@ -15,7 +15,18 @@ - + + + + + diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/Guides/machine-image-X4.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/Guides/machine-image-X4.png new file mode 100644 index 000000000..5a6095e4c Binary files /dev/null and b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/Guides/machine-image-X4.png differ diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Tango.PPC.Maintenance.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Tango.PPC.Maintenance.csproj index bebdd63c7..6ede5f25b 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Tango.PPC.Maintenance.csproj +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Tango.PPC.Maintenance.csproj @@ -323,10 +323,13 @@ + + + - + \ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Images/machine-X4.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Images/machine-X4.png new file mode 100644 index 000000000..25e4697fd Binary files /dev/null and b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Images/machine-X4.png differ diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/machine-X4.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/machine-X4.png new file mode 100644 index 000000000..25e4697fd Binary files /dev/null and b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/machine-X4.png differ diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/machine-image-X4.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/machine-image-X4.png new file mode 100644 index 000000000..5a6095e4c Binary files /dev/null and b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/machine-image-X4.png differ 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 8f65f225b..a63c0fca2 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 @@ -648,6 +648,8 @@ + + @@ -993,7 +995,7 @@ if $(ConfigurationName) == Eureka copy /Y "$(ProjectDir)Intro.wmv" "$(TargetDir) - + diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/EmergencyView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/EmergencyView.xaml index f2b018bfa..e4f55915c 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/EmergencyView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/EmergencyView.xaml @@ -20,7 +20,18 @@ 2. Release the emergency button. 3. Press the power button to power up the system. - + + + + + diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/ExternalBridgeView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/ExternalBridgeView.xaml index fddd15fe7..7276d7d4c 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/ExternalBridgeView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/ExternalBridgeView.xaml @@ -18,7 +18,18 @@ - + + + + + + + diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/RestartingView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/RestartingView.xaml index 41017f629..9e7abdca2 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/RestartingView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/RestartingView.xaml @@ -14,7 +14,18 @@ - + + + + + -- cgit v1.3.1