From bf66536228666d733475f4ccdb248e5cec74c0aa Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Tue, 5 Nov 2019 11:38:50 +0200 Subject: Done Related Work Items: #1277 --- .../Modules/Tango.MachineStudio.Developer/Views/MainView.xaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml index 08ba5b699..abea6aec9 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml @@ -555,15 +555,15 @@ - - - Job Aborted By User + + + Job Aborted By User -- cgit v1.3.1 From 1c9bea6d04dcfbfd1fbf0e1c437c110bc7dafa3e Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 7 Nov 2019 17:39:00 +0200 Subject: Fixed issue with job completion on emulator. Added liquid volumes grid full step. Added full step to dispensing calculations. Fixed issue with gradient generation progress on MS. Worked on software items doc. --- .../ViewModels/MainViewVM.cs | 12 +++---- .../Views/JobView.xaml | 35 +++++++++++++++++++++ .../Twine Software Items (version 1).xlsb.xlsx | Bin 18776 -> 20410 bytes .../Tango.BL/Dispensing/DispensingCalcBase.cs | 10 ++++++ .../Tango.BL/Dispensing/DispensingCalcService.cs | 11 +++++++ .../Tango.BL/Dispensing/IDispensingCalc.cs | 7 +++++ .../Dispensing/TransparentLiquidDispensingCalc.cs | 6 ++-- Software/Visual_Studio/Tango.BL/LiquidVolume.cs | 12 ++++++- .../Tango.Emulations/Emulators/MachineEmulator.cs | 2 +- .../Tango.Integration/Operation/MachineOperator.cs | 9 +++++- 10 files changed, 91 insertions(+), 13 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs index c9483b9a2..fec02529b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs @@ -1034,6 +1034,11 @@ namespace Tango.MachineStudio.Developer.ViewModels { var percent = (e.Progress / e.Total * 100d); + if (_preparingTaskItem != null) + { + _preparingTaskItem.Message = $"Preparing job for printing {(e.Progress / e.Total * 100d).ToString("0.0")}%..."; + } + if (_preparingTaskItem == null && percent == 0) { _preparingTaskItem = _notification.PushTaskItem("Preparing job for printing..."); @@ -1043,13 +1048,6 @@ namespace Tango.MachineStudio.Developer.ViewModels _preparingTaskItem.Pop(); _preparingTaskItem = null; } - else - { - if (_preparingTaskItem != null) - { - _preparingTaskItem.Message = $"Preparing job for printing {(e.Progress / e.Total * 100d).ToString("0.0")}%..."; - } - } } private void MachineOperator_ResumingJob(object sender, ResumingJobEventArgs e) diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml index 3bda86036..e1bbad6a7 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml @@ -1179,6 +1179,41 @@ + + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml.cs index 171cb754e..51cfb1e73 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml.cs @@ -33,7 +33,7 @@ namespace Tango.MachineStudio.Developer.Views Grid parent = border.Parent as Grid; IDSPackLevel packLevel = border.DataContext as IDSPackLevel; - border.Height = ((double)packLevel.Current / (double)MachineOperator.MAX_DISPENSER_NANOLITER) * parent.ActualHeight; + border.Width = ((double)packLevel.Current / (double)MachineOperator.MAX_DISPENSER_NANOLITER) * parent.ActualWidth; } private void Limit_Loaded(object sender, RoutedEventArgs e) @@ -42,8 +42,8 @@ namespace Tango.MachineStudio.Developer.Views Grid parent = rect.Parent as Grid; IDSPackLevel packLevel = rect.DataContext as IDSPackLevel; - var top = ((double)packLevel.Required / (double)MachineOperator.MAX_DISPENSER_NANOLITER) * parent.ActualHeight; - rect.Margin = new Thickness(0, 0, 0, top); + var left = ((double)packLevel.Required / (double)MachineOperator.MAX_DISPENSER_NANOLITER) * parent.ActualWidth; + rect.Margin = new Thickness(left, 0, 0, 0); if (packLevel.IsValid) { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml index abea6aec9..d0caa2447 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml @@ -330,31 +330,36 @@ - - - + + + Finalizing... + + + + + @@ -408,8 +413,7 @@ - Finalizing... - + diff --git a/Software/Visual_Studio/Tango.Integration/Operation/InsufficientLiquidQuantityException.cs b/Software/Visual_Studio/Tango.Integration/Operation/InsufficientLiquidQuantityException.cs index a1c18370b..3e4758c58 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/InsufficientLiquidQuantityException.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/InsufficientLiquidQuantityException.cs @@ -14,11 +14,19 @@ namespace Tango.Integration.Operation public IdsPack IdsPack { get; set; } public int Current { get; set; } public int Required { get; set; } + public int Maximum { get; set; } public bool IsValid { get { return Current >= Required; } } + + public bool IsOverMax + { + get { return Required > Maximum; } + } + + public String Message { get; set; } } public InsufficientLiquidQuantityException(String message) : base(message) diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs index 451ed8219..ebbf520c3 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs @@ -1425,9 +1425,9 @@ namespace Tango.Integration.Operation { var segment = job.Segments[segmentIndex]; var segment_length_cm = segment.Length * 100d; - + List orderedBrushCollection = segment.BrushStops.OrderBy(x => x.OffsetMeters).ToList(); - + int solid_gradient_oeff = orderedBrushCollection.Count == 1 ? 1 : 2; double prev_offset_cm = 0; for (int brushIndex = 0; brushIndex < orderedBrushCollection.Count; brushIndex++) @@ -1450,7 +1450,7 @@ namespace Tango.Integration.Operation brush_length_centimeters -= resolution; } prev_offset_cm = brush_offset_cm; - + foreach (var liquidVolumes in brush.LiquidVolumes) { liquidQuantities[liquidVolumes.IdsPack.PackIndex] += liquidVolumes.NanoliterPerCentimeter * (brush_length_centimeters / solid_gradient_oeff); @@ -1477,12 +1477,20 @@ namespace Tango.Integration.Operation { IdsPack = idsPack, Current = packLevel.DispenserLevel, - Required = (int)liquidQuantities[index] + Required = (int)liquidQuantities[index], + Maximum = MAX_DISPENSER_NANOLITER, }; - if (liquidQuantities[index] > packLevel.DispenserLevel) + if (idsLevel.Required > idsLevel.Current) { shouldThrow = true; + + idsLevel.Message = $"Missing {idsLevel.Required - idsLevel.Current} nanoliters to complete the job."; + + if (idsLevel.Required > idsLevel.Maximum) + { + idsLevel.Message = $"Required ink exceeds the maximum capacity of the dispenser by {idsLevel.Required - idsLevel.Maximum} nanoliters. Please reduce the segment length."; + } } exception.IdsPackLevels.Add(idsLevel); @@ -1769,7 +1777,7 @@ namespace Tango.Integration.Operation if (EnableJobLiquidQuantityValidation) { - ValidateJobLiquidQuantity(job, processParameters, job.Machine.Configuration); + ValidateJobLiquidQuantity(job, processParameters, job.Machine.Configuration); } var originalJob = job; -- cgit v1.3.1 From ebcd646d565cc251d808048fc7ffa2bacbeaeca2 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Thu, 14 Nov 2019 11:38:18 +0200 Subject: Changed color of text and format in InsufficientLiquidQuantityException dialog --- .../Views/InsufficientLiquidQuantityView.xaml | 33 ++++++++++++++-------- .../InsufficientLiquidQuantityException.cs | 8 ++++++ .../Tango.Integration/Operation/MachineOperator.cs | 11 +++++--- 3 files changed, 36 insertions(+), 16 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml index fa85ea598..c0cb963e7 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml @@ -25,7 +25,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -43,7 +43,7 @@ + - - + @@ -97,14 +104,16 @@ - - - - - + + + + + + + - + diff --git a/Software/Visual_Studio/Tango.Integration/Operation/InsufficientLiquidQuantityException.cs b/Software/Visual_Studio/Tango.Integration/Operation/InsufficientLiquidQuantityException.cs index 3e4758c58..797d4f498 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/InsufficientLiquidQuantityException.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/InsufficientLiquidQuantityException.cs @@ -27,6 +27,12 @@ namespace Tango.Integration.Operation } public String Message { get; set; } + public IDSPackLevel() + { + Maximum = 130000000; + Required = 0; + Current = 0; + } } public InsufficientLiquidQuantityException(String message) : base(message) @@ -35,5 +41,7 @@ namespace Tango.Integration.Operation } public List IdsPackLevels { get; internal set; } + + } } diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs index ebbf520c3..9a5c7ff9b 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs @@ -40,6 +40,7 @@ using Tango.Integration.Emergency; using Tango.PMR.MachineStatus; using Newtonsoft.Json; using Tango.PMR.Integration; +using System.Globalization; namespace Tango.Integration.Operation { @@ -1484,12 +1485,13 @@ namespace Tango.Integration.Operation if (idsLevel.Required > idsLevel.Current) { shouldThrow = true; - - idsLevel.Message = $"Missing {idsLevel.Required - idsLevel.Current} nanoliters to complete the job."; + string display_value = (((double)(idsLevel.Required - idsLevel.Current)/ 1000000000)).ToString("N2", CultureInfo.InvariantCulture); + idsLevel.Message = $"Missing {display_value} liters to complete the job."; if (idsLevel.Required > idsLevel.Maximum) { - idsLevel.Message = $"Required ink exceeds the maximum capacity of the dispenser by {idsLevel.Required - idsLevel.Maximum} nanoliters. Please reduce the segment length."; + display_value = (((double)(idsLevel.Required - idsLevel.Maximum))/ 1000000000).ToString("N2", CultureInfo.InvariantCulture); + idsLevel.Message = $"Required ink exceeds the maximum capacity of the dispenser by {display_value} liters. Please reduce the segment length."; } } @@ -1569,7 +1571,8 @@ namespace Tango.Integration.Operation { IdsPack = idsPack, Current = packLevel.DispenserLevel, - Required = (int)liquidQuantities[index] + Required = (int)liquidQuantities[index], + Maximum = MAX_DISPENSER_NANOLITER, }; if (liquidQuantities[index] > packLevel.DispenserLevel) -- cgit v1.3.1 From 856d12b6cc813697451fa200fb437c84ff2640c7 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 14 Nov 2019 17:00:20 +0200 Subject: Refactored IsLiquidVolumesOutOfRange to use process parameters. --- Software/DB/PPC/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/PPC/Tango_log.ldf | Bin 53673984 -> 53673984 bytes Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 22675456 -> 22675456 bytes .../ViewModels/MainViewVM.cs | 2 +- .../Views/JobView.xaml | 152 +++++++++++---------- .../ViewModels/ColorConversionViewVM.cs | 15 +- .../UWF/AlternativeUnifiedWriteFilterManager.cs | 13 +- .../PPC/Tango.PPC.UI/Resources/Colors.xaml | 2 + .../Visual_Studio/Tango.BL/Entities/BrushStop.cs | 19 ++- 10 files changed, 119 insertions(+), 84 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views') diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf index d5304a381..b7604d584 100644 Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf index c5bc583ac..ecab6b86c 100644 Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index 849baff99..34ed04aa3 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 4c1df436f..38dc8f93b 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs index fd20a0b1c..63cfa10b8 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs @@ -873,7 +873,7 @@ namespace Tango.MachineStudio.Developer.ViewModels foreach (var stop in stops) { - if (stop.ColorSpace.Code == BL.Enumerations.ColorSpaces.Volume.ToInt32() && !stop.IsLiquidVolumesOutOfRange) + if (stop.ColorSpace.Code == BL.Enumerations.ColorSpaces.Volume.ToInt32()) { try { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml index e1bbad6a7..3e6ffd396 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml @@ -241,91 +241,93 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Liquid volumes exceeds the maximum range for color conversion! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - + Total: % ( nl ) - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + Liquid volumes exceeds the maximum range for color conversion! + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs index b68239b4b..f583fa15e 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs @@ -309,6 +309,19 @@ namespace Tango.MachineStudio.RML.ViewModels } } + private double GetTotalMaximumLiquidVolumeLimit() + { + try + { + var tables = RML.GetActiveProcessGroup().ProcessParametersTables.OrderBy(x => x.TableIndex).ToList(); + return (tables[1].MaxInkUptake / tables[0].MaxInkUptake) * 100; + } + catch + { + return BrushStop.MAX_TOTAL_LIQUID_VOLUME; + } + } + private void OnLiquidVolumeChanged() { try @@ -316,7 +329,7 @@ namespace Tango.MachineStudio.RML.ViewModels if (LiquidsCalibrationData == null || _prevent_inverse_conversion) return; //TODO: This is temporary because of out of range volumes. - if (LiquidVolumes.Where(x => x.LiquidType.HasPigment).Sum(x => x.Volume) > 200) + if (LiquidVolumes.Where(x => x.LiquidType.HasPigment).Sum(x => x.Volume) > GetTotalMaximumLiquidVolumeLimit()) { IsVolumesOutOfRange = true; return; diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/UWF/AlternativeUnifiedWriteFilterManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/UWF/AlternativeUnifiedWriteFilterManager.cs index 5fb74b2fe..828bccf83 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/UWF/AlternativeUnifiedWriteFilterManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/UWF/AlternativeUnifiedWriteFilterManager.cs @@ -47,14 +47,15 @@ namespace Tango.PPC.Common.UWF command.OutputEncoding = CmdCommand.OutEncoding.Unicode; await command.Run(); - command = new CmdCommand("wmic", $"computersystem where name=\"%computername%\" set AutomaticManagedPagefile=False"); - await command.Run(); + //We don't use page file anymore since upgrade to 4GB RAM. But keep this just in case. + //command = new CmdCommand("wmic", $"computersystem where name=\"%computername%\" set AutomaticManagedPagefile=False"); + //await command.Run(); - command = new CmdCommand("wmic", $"pagefileset create name=\"p:\\pagefile.sys\""); - await command.Run(); + //command = new CmdCommand("wmic", $"pagefileset create name=\"p:\\pagefile.sys\""); + //await command.Run(); - command = new CmdCommand("wmic", $"pagefileset where name=\"p:\\\\pagefile.sys\" set InitialSize=16,MaximumSize=3870"); - await command.Run(); + //command = new CmdCommand("wmic", $"pagefileset where name=\"p:\\\\pagefile.sys\" set InitialSize=16,MaximumSize=3870"); + //await command.Run(); } /// diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/Colors.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/Colors.xaml index f0e872285..a0db8e2aa 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/Colors.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/Colors.xaml @@ -13,4 +13,6 @@ + + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs index d23e9b1f2..8c755455f 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs @@ -111,7 +111,7 @@ namespace Tango.BL.Entities { get { - return LiquidVolumes != null ? LiquidVolumes.Where(x => x.IdsPack.IdsPackFormula.Code == IdsPackFormulas.StandardColor.ToInt32()).Sum(x => x.Volume) > MAX_TOTAL_LIQUID_VOLUME : false; + return LiquidVolumes != null ? LiquidVolumes.Where(x => x.IdsPack.IdsPackFormula.Code == IdsPackFormulas.StandardColor.ToInt32()).Sum(x => x.Volume) > GetTotalMaximumLiquidVolumeLimit() : false; } } @@ -709,5 +709,22 @@ namespace Tango.BL.Entities } #endregion + + #region Private Methods + + private double GetTotalMaximumLiquidVolumeLimit() + { + try + { + var tables = Segment.Job.Rml.GetActiveProcessGroup().ProcessParametersTables.OrderBy(x => x.TableIndex).ToList(); + return (tables[1].MaxInkUptake / tables[0].MaxInkUptake) * 100; + } + catch + { + return MAX_TOTAL_LIQUID_VOLUME; + } + } + + #endregion } } -- cgit v1.3.1 From 09d432566f696f0eeb3fce97d2c870cfd1c91f89 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Sun, 19 Jan 2020 12:05:37 +0200 Subject: Improved ms logging screen. Improved ObservableStaticCollection init speed. --- .../Views/MachineJobSelectionView.xaml | 2 +- .../Authentication/IAuthenticationProvider.cs | 2 +- .../DefaultAuthenticationProvider.cs | 12 +++++- .../Tango.MachineStudio.UI.csproj | 2 +- .../ViewModels/LoginViewVM.cs | 14 +++++-- .../Tango.MachineStudio.UI/Views/LoginView.xaml | 7 +++- .../Tango.BL/ObservablesStaticCollections.cs | 44 +++++++++++++++++----- 7 files changed, 63 insertions(+), 20 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml index f8a10e7c4..bf626f462 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml @@ -64,7 +64,7 @@ - + MACHINE JOBS diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs index cb231fa05..2929ea405 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs @@ -29,7 +29,7 @@ namespace Tango.MachineStudio.Common.Authentication /// The email. /// The password. /// - AuthenticationLoginResult Login(String email, String password, LoginMethod method, bool bypassVersionCheck = false); + AuthenticationLoginResult Login(String email, String password, LoginMethod method, bool bypassVersionCheck = false, Action logAction = null); /// /// Logs-out the current logged-in user. diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs index 209b26505..0131cd209 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs @@ -90,7 +90,7 @@ namespace Tango.MachineStudio.UI.Authentication /// The password. /// /// Login failed for user " + email - public AuthenticationLoginResult Login(string email, string password, LoginMethod method, bool bypassVersionCheck = false) + public AuthenticationLoginResult Login(string email, string password, LoginMethod method, bool bypassVersionCheck = false, Action logAction = null) { _refreshTokenTimer.Stop(); @@ -112,6 +112,8 @@ namespace Tango.MachineStudio.UI.Authentication try { + logAction?.Invoke("Logging in to machine service..."); + response = _client.Login(new LoginRequest() { @@ -147,7 +149,10 @@ namespace Tango.MachineStudio.UI.Authentication try { - ObservablesStaticCollections.Instance.Initialize(); + ObservablesStaticCollections.Instance.Initialize((x) => + { + logAction.Invoke(x); + }); } catch (Exception ex) { @@ -156,6 +161,7 @@ namespace Tango.MachineStudio.UI.Authentication using (ObservablesContext db = ObservablesContext.CreateDefault()) { + logAction.Invoke("Loading user permissions..."); User user = new UserBuilder(db).Set(x => x.Email.ToLower() == email.ToLower()).WithRolesAndPermissions().WithOrganization().Build(); if (user == null) @@ -167,6 +173,8 @@ namespace Tango.MachineStudio.UI.Authentication _refreshTokenTimer.Start(); + logAction.Invoke("Starting application..."); + return new AuthenticationLoginResult() { User = user, diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj index efe8fc6b1..13f22dfda 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj @@ -679,7 +679,7 @@ if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)Roslyn\" - + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs index 9c2367f93..dce469dbd 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs @@ -116,7 +116,12 @@ namespace Tango.MachineStudio.UI.ViewModels set { _isStandardUser = value; RaisePropertyChangedAuto(); if (value) IsActiveDirectory = false; } } - + private String _progressLog; + public String ProgressLog + { + get { return _progressLog; } + set { _progressLog = value; RaisePropertyChangedAuto(); } + } /// /// Gets or sets the login command. @@ -146,7 +151,7 @@ namespace Tango.MachineStudio.UI.ViewModels Email = _settings.LastLoginEmail; DeploymentSlot = _settings.DeploymentSlot; RememberMe = _settings.RememberMe; - + if (_settings.LastLoginMethod == LoginMethod.ActiveDirectory) { IsActiveDirectory = true; @@ -184,7 +189,10 @@ namespace Tango.MachineStudio.UI.ViewModels { _settings.DeploymentSlot = DeploymentSlot; - LoginResponse result = _authenticationProvider.Login(Email, Password, loginMethod, _settings.ByPassEnvironmentVersionCheck).Response; + LoginResponse result = _authenticationProvider.Login(Email, Password, loginMethod, _settings.ByPassEnvironmentVersionCheck, (progress) => + { + ProgressLog = progress; + }).Response; if (result.VersionChangeRequired && !_settings.ByPassEnvironmentVersionCheck) { diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoginView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoginView.xaml index e7428dd28..ff13ec2c7 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoginView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoginView.xaml @@ -91,8 +91,11 @@ - - Logging you in... + + + + + diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs index 5d1c3e148..1b45e959d 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs @@ -52,55 +52,79 @@ namespace Tango.BL /// /// Initializes this instance. /// - public void Initialize() + public void Initialize(Action progressLog = null) { if (!_initialized) { + progressLog.Invoke("Loading static collections..."); db = ObservablesContext.CreateDefault(); WindingMethods = db.WindingMethods.ToObservableCollection(); + progressLog.Invoke("Loading color spaces..."); ColorSpaces = db.ColorSpaces.ToObservableCollection(); + + progressLog.Invoke("Loading spools..."); SpoolTypes = db.SpoolTypes.ToObservableCollection(); + progressLog.Invoke("Loading event..."); EventTypes = db.EventTypes.ToObservableCollection(); + progressLog.Invoke("Loading blowers..."); HardwareBlowerTypes = db.HardwareBlowerTypes.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection(); - HardwareBlowers = db.HardwareBlowers.ToObservableCollection(); + //HardwareBlowers = db.HardwareBlowers.ToObservableCollection(); + progressLog.Invoke("Loading break sensors..."); HardwareBreakSensorTypes = db.HardwareBreakSensorTypes.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection(); - HardwareBreakSensors = db.HardwareBreakSensors.ToObservableCollection(); + //HardwareBreakSensors = db.HardwareBreakSensors.ToObservableCollection(); + progressLog.Invoke("Loading dancers..."); HardwareDancerTypes = db.HardwareDancerTypes.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection(); - HardwareDancers = db.HardwareDancers.ToObservableCollection(); + //HardwareDancers = db.HardwareDancers.ToObservableCollection(); + progressLog.Invoke("Loading motors..."); HardwareMotorTypes = db.HardwareMotorTypes.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection(); - HardwareMotors = db.HardwareMotors.ToObservableCollection(); + //HardwareMotors = db.HardwareMotors.ToObservableCollection(); + progressLog.Invoke("Loading pid controls..."); HardwarePidControlTypes = db.HardwarePidControlTypes.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection(); - HardwarePidControls = db.HardwarePidControls.ToObservableCollection(); + //HardwarePidControls = db.HardwarePidControls.ToObservableCollection(); + progressLog.Invoke("Loading speed sensors..."); HardwareSpeedSensorTypes = db.HardwareSpeedSensorTypes.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection(); - HardwareSpeedSensors = db.HardwareSpeedSensors.ToObservableCollection(); + //HardwareSpeedSensors = db.HardwareSpeedSensors.ToObservableCollection(); + progressLog.Invoke("Loading winders..."); HardwareWinderTypes = db.HardwareWinderTypes.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection(); - HardwareWinders = db.HardwareWinders.ToObservableCollection(); + //HardwareWinders = db.HardwareWinders.ToObservableCollection(); + progressLog.Invoke("Loading tech controllers..."); TechControllers = db.TechControllers.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection(); + + progressLog.Invoke("Loading tech dispensers..."); TechDispensers = db.TechDispensers.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection(); + + progressLog.Invoke("Loading tech io's..."); TechIos = db.TechIos.ToObservableCollection(); + + progressLog.Invoke("Loading tech monitors..."); TechMonitors = db.TechMonitors.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection(); + + progressLog.Invoke("Loading tech valves..."); TechValves = db.TechValves.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection(); + + progressLog.Invoke("Loading tech heaters..."); TechHeaters = db.TechHeaters.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection(); + progressLog.Invoke("Loading machines..."); Machines = db.Machines.Include(x => x.Organization).ToObservableCollection(); + progressLog.Invoke("Loading users..."); Users = db.Users.Where(x => !x.Deleted).Include(x => x.Contact).ToObservableCollection(); + progressLog.Invoke("Loading machine versions..."); MachineVersions = db.MachineVersions.ToObservableCollection(); - - //Load later... Task.Factory.StartNew(() => { -- cgit v1.3.1 From bf432bf7b7faa7c51e74462e19eb3e50c28b4aa8 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Wed, 22 Jan 2020 18:00:55 +0200 Subject: Implemented StringFormat control for db properties. Added StringFormat 0.000 for FeederTension on ProcessParameters. --- .../Views/JobView.xaml | 2 +- .../Views/ProcessParametersView.xaml | 2 +- .../Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs | 5 --- .../Tango.BL/DTO/HardwareBlowerDTOBase.cs | 5 --- .../Tango.BL/DTO/HardwareMotorDTOBase.cs | 5 --- Software/Visual_Studio/Tango.BL/DTO/JobDTOBase.cs | 5 --- .../Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs | 5 --- .../Visual_Studio/Tango.BL/DTO/TechValveDTOBase.cs | 5 --- .../Tango.BL/Entities/ActionLogBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/AddressBase.cs | 1 + .../Entities/ApplicationDisplayPanelVersionBase.cs | 1 + .../Entities/ApplicationFirmwareVersionBase.cs | 1 + .../Tango.BL/Entities/ApplicationOsVersionBase.cs | 1 + .../Tango.BL/Entities/BrushStopBase.cs | 1 + .../Tango.BL/Entities/CartridgeTypeBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/CatBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/CctBase.cs | 1 + .../Tango.BL/Entities/ColorCatalogBase.cs | 1 + .../Tango.BL/Entities/ColorCatalogsGroupBase.cs | 1 + .../Tango.BL/Entities/ColorCatalogsItemBase.cs | 1 + .../Entities/ColorCatalogsItemsRecipeBase.cs | 1 + .../Tango.BL/Entities/ColorSpaceBase.cs | 1 + .../Tango.BL/Entities/ConfigurationBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/ContactBase.cs | 1 + .../Tango.BL/Entities/CustomerBase.cs | 1 + .../Tango.BL/Entities/DispenserBase.cs | 1 + .../Tango.BL/Entities/DispenserTypeBase.cs | 1 + .../Entities/EmbeddedFirmwareVersionBase.cs | 1 + .../Tango.BL/Entities/EventTypeBase.cs | 6 +--- .../Tango.BL/Entities/FiberShapeBase.cs | 1 + .../Tango.BL/Entities/FiberSynthBase.cs | 1 + .../Tango.BL/Entities/HardwareBlowerBase.cs | 9 +++--- .../Tango.BL/Entities/HardwareBlowerTypeBase.cs | 1 + .../Tango.BL/Entities/HardwareBreakSensorBase.cs | 1 + .../Entities/HardwareBreakSensorTypeBase.cs | 1 + .../Tango.BL/Entities/HardwareDancerBase.cs | 1 + .../Tango.BL/Entities/HardwareDancerTypeBase.cs | 1 + .../Tango.BL/Entities/HardwareMotorBase.cs | 6 +--- .../Tango.BL/Entities/HardwareMotorTypeBase.cs | 1 + .../Tango.BL/Entities/HardwarePidControlBase.cs | 1 + .../Entities/HardwarePidControlTypeBase.cs | 1 + .../Tango.BL/Entities/HardwareSpeedSensorBase.cs | 1 + .../Entities/HardwareSpeedSensorTypeBase.cs | 1 + .../Tango.BL/Entities/HardwareVersionBase.cs | 1 + .../Tango.BL/Entities/HardwareWinderBase.cs | 1 + .../Tango.BL/Entities/HardwareWinderTypeBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/IdsPackBase.cs | 1 + .../Tango.BL/Entities/IdsPackFormulaBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/JobBase.cs | 6 +--- .../Visual_Studio/Tango.BL/Entities/JobRunBase.cs | 6 +--- .../Tango.BL/Entities/LinearMassDensityUnitBase.cs | 1 + .../Tango.BL/Entities/LiquidTypeBase.cs | 1 + .../Tango.BL/Entities/LiquidTypesRmlBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/MachineBase.cs | 1 + .../Tango.BL/Entities/MachineStudioVersionBase.cs | 1 + .../Tango.BL/Entities/MachineVersionBase.cs | 1 + .../Tango.BL/Entities/MachinesEventBase.cs | 1 + .../Tango.BL/Entities/MediaConditionBase.cs | 1 + .../Tango.BL/Entities/MediaMaterialBase.cs | 1 + .../Tango.BL/Entities/MediaPurposBase.cs | 1 + .../Tango.BL/Entities/MidTankTypeBase.cs | 1 + .../Tango.BL/Entities/OrganizationBase.cs | 1 + .../Tango.BL/Entities/PermissionBase.cs | 1 + .../Entities/ProcessParametersTableBase.cs | 3 ++ .../Entities/ProcessParametersTablesGroupBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/RmlBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/RoleBase.cs | 1 + .../Tango.BL/Entities/RolesPermissionBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/SegmentBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/SiteBase.cs | 1 + .../Tango.BL/Entities/SitesCatalogBase.cs | 1 + .../Tango.BL/Entities/SitesRmlBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/SpoolBase.cs | 1 + .../Tango.BL/Entities/SpoolTypeBase.cs | 1 + .../Tango.BL/Entities/SyncConfigurationBase.cs | 1 + .../Tango.BL/Entities/SysdiagramBase.cs | 1 + .../Tango.BL/Entities/TangoUpdateBase.cs | 1 + .../Tango.BL/Entities/TangoVersionBase.cs | 1 + .../Tango.BL/Entities/TechControllerBase.cs | 1 + .../Tango.BL/Entities/TechDispenserBase.cs | 1 + .../Tango.BL/Entities/TechHeaterBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/TechIoBase.cs | 1 + .../Tango.BL/Entities/TechMonitorBase.cs | 1 + .../Tango.BL/Entities/TechValveBase.cs | 6 +--- .../Visual_Studio/Tango.BL/Entities/UserBase.cs | 1 + .../Tango.BL/Entities/UsersRoleBase.cs | 1 + .../Tango.BL/Entities/WindingMethodBase.cs | 1 + .../DbPropertyExtensionModel.cs | 36 ++++++++++++++++++++++ .../Tango.CodeGeneration/EntityCodeFile.cs | 2 +- .../Tango.CodeGeneration/RangeDescriptionModel.cs | 15 --------- .../Tango.CodeGeneration.csproj | 4 +-- .../Templates/EntityCodeFile.cshtml | 25 ++++++++++++--- .../CustomAttributes/StringFormatAttribute.cs | 24 +++++++++++++++ .../ExtensionMethods/IParameterizedExtensions.cs | 7 +++++ Software/Visual_Studio/Tango.Core/ParameterItem.cs | 13 ++++++++ .../Visual_Studio/Tango.Core/Tango.Core.csproj | 3 +- .../ObservablesGenerator.cs | 21 ++++++++----- .../Utilities/Tango.PMRGenerator.CLI/Program.cs | 4 +-- 98 files changed, 207 insertions(+), 95 deletions(-) create mode 100644 Software/Visual_Studio/Tango.CodeGeneration/DbPropertyExtensionModel.cs delete mode 100644 Software/Visual_Studio/Tango.CodeGeneration/RangeDescriptionModel.cs create mode 100644 Software/Visual_Studio/Tango.Core/CustomAttributes/StringFormatAttribute.cs (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml index 3e6ffd396..b49f1407c 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml @@ -1553,7 +1553,7 @@ - + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ProcessParametersView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ProcessParametersView.xaml index b85fd2c12..cae614aeb 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ProcessParametersView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ProcessParametersView.xaml @@ -70,7 +70,7 @@ - + diff --git a/Software/Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs index 7b8e30dff..a708cccaf 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs @@ -18,11 +18,6 @@ using Tango.BL.Entities; namespace Tango.BL.DTO { - - /// - /// - /// - public abstract class EventTypeDTOBase : ObservableEntityDTO { diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareBlowerDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareBlowerDTOBase.cs index 9fb6b0bdd..4420c2d2c 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/HardwareBlowerDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareBlowerDTOBase.cs @@ -18,11 +18,6 @@ using Tango.BL.Entities; namespace Tango.BL.DTO { - - /// - /// - /// - public abstract class HardwareBlowerDTOBase : ObservableEntityDTO { diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTOBase.cs index 4c3125bf7..fcd36bb5d 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTOBase.cs @@ -18,11 +18,6 @@ using Tango.BL.Entities; namespace Tango.BL.DTO { - - /// - /// - /// - public abstract class HardwareMotorDTOBase : ObservableEntityDTO { diff --git a/Software/Visual_Studio/Tango.BL/DTO/JobDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/JobDTOBase.cs index 073d833f2..ddf76bff0 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/JobDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/JobDTOBase.cs @@ -18,11 +18,6 @@ using Tango.BL.Entities; namespace Tango.BL.DTO { - - /// - /// - /// - public abstract class JobDTOBase : ObservableEntityDTO { diff --git a/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs index 40d0a14c4..61d36d1e5 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs @@ -18,11 +18,6 @@ using Tango.BL.Entities; namespace Tango.BL.DTO { - - /// - /// - /// - public abstract class JobRunDTOBase : ObservableEntityDTO { diff --git a/Software/Visual_Studio/Tango.BL/DTO/TechValveDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/TechValveDTOBase.cs index 2e28dfce7..a7b07fb0c 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/TechValveDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/TechValveDTOBase.cs @@ -18,11 +18,6 @@ using Tango.BL.Entities; namespace Tango.BL.DTO { - - /// - /// - /// - public abstract class TechValveDTOBase : ObservableEntityDTO { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ActionLogBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ActionLogBase.cs index 077c834d2..060d81f8b 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ActionLogBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ActionLogBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/AddressBase.cs b/Software/Visual_Studio/Tango.BL/Entities/AddressBase.cs index f88efdb71..7e1229b98 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/AddressBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/AddressBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ApplicationDisplayPanelVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ApplicationDisplayPanelVersionBase.cs index 1671069b3..82a5ea94b 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ApplicationDisplayPanelVersionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ApplicationDisplayPanelVersionBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ApplicationFirmwareVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ApplicationFirmwareVersionBase.cs index c54fe23d6..a816c7ad3 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ApplicationFirmwareVersionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ApplicationFirmwareVersionBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ApplicationOsVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ApplicationOsVersionBase.cs index 0e06e48db..20b58dbf2 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ApplicationOsVersionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ApplicationOsVersionBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs b/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs index 0f742cc0b..89114f2c3 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/CartridgeTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/CartridgeTypeBase.cs index 6281c7606..e0684e304 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/CartridgeTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/CartridgeTypeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/CatBase.cs b/Software/Visual_Studio/Tango.BL/Entities/CatBase.cs index 17bfd3f87..0c73be9ab 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/CatBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/CatBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/CctBase.cs b/Software/Visual_Studio/Tango.BL/Entities/CctBase.cs index 92f4f17b9..158615777 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/CctBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/CctBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogBase.cs index f19eda455..df1056469 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroupBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroupBase.cs index 3e0491ec5..bc20a0c2e 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroupBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroupBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs index fe026fc32..30d77a051 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemsRecipeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemsRecipeBase.cs index a0a324b9f..19b3aed14 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemsRecipeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemsRecipeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorSpaceBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorSpaceBase.cs index 9098a2eab..b35ca0431 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ColorSpaceBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ColorSpaceBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ConfigurationBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ConfigurationBase.cs index 6b19ebb7f..d7a90bcfd 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ConfigurationBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ConfigurationBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ContactBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ContactBase.cs index 610fcc27b..6fd8c9f4c 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ContactBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ContactBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/CustomerBase.cs b/Software/Visual_Studio/Tango.BL/Entities/CustomerBase.cs index 1d3dd576c..68e6b2df1 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/CustomerBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/CustomerBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/DispenserBase.cs b/Software/Visual_Studio/Tango.BL/Entities/DispenserBase.cs index a908da29c..8343fdb65 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/DispenserBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/DispenserBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/DispenserTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/DispenserTypeBase.cs index 04f4dc261..829ea0cba 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/DispenserTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/DispenserTypeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/EmbeddedFirmwareVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/EmbeddedFirmwareVersionBase.cs index 148d53c6c..25c7df99f 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/EmbeddedFirmwareVersionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/EmbeddedFirmwareVersionBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs index f0100fe06..49675a89b 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs @@ -19,14 +19,10 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { - - /// - /// - /// - [Table("EVENT_TYPES")] public abstract class EventTypeBase : ObservableEntity { diff --git a/Software/Visual_Studio/Tango.BL/Entities/FiberShapeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/FiberShapeBase.cs index cdc9bb76c..cfb335f62 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/FiberShapeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/FiberShapeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/FiberSynthBase.cs b/Software/Visual_Studio/Tango.BL/Entities/FiberSynthBase.cs index d04050c4a..dfb34224b 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/FiberSynthBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/FiberSynthBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerBase.cs index bbc55d245..5cc6c4931 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerBase.cs @@ -19,14 +19,10 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { - - /// - /// - /// - [Table("HARDWARE_BLOWERS")] public abstract class HardwareBlowerBase : ObservableEntity { @@ -131,8 +127,11 @@ namespace Tango.BL.Entities [Column("VOLTAGE")] [Description("Voltage Description")] + [Range(-10000,1000000)] + [StringFormat("0.0")] + public Double Voltage { get diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerTypeBase.cs index dc614bd0c..99dadd1f5 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerTypeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorBase.cs index 9cbaac688..1ca65ab51 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorTypeBase.cs index 5d69f19b5..77a53c9a0 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorTypeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerBase.cs index a3fa5c1aa..65d60714a 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerTypeBase.cs index 3cd885790..7bff7c035 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerTypeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorBase.cs index e08a2b5b0..a0fb6f66e 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorBase.cs @@ -19,14 +19,10 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { - - /// - /// - /// - [Table("HARDWARE_MOTORS")] public abstract class HardwareMotorBase : ObservableEntity { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorTypeBase.cs index a63a148da..59ceeada9 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorTypeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlBase.cs index e12e40f32..ccd56bca3 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlTypeBase.cs index dbb8d2a1d..d148ea177 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlTypeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorBase.cs index 3b7bb1e72..5661225cb 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorTypeBase.cs index 74ff9761d..384462516 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorTypeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareVersionBase.cs index c3bc80696..3d7d555dc 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareVersionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareVersionBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderBase.cs index 4c2808581..8bcc5bb14 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderTypeBase.cs index 8c8055c1e..340748f97 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderTypeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/IdsPackBase.cs b/Software/Visual_Studio/Tango.BL/Entities/IdsPackBase.cs index b3e62f1fe..650d93098 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/IdsPackBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/IdsPackBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/IdsPackFormulaBase.cs b/Software/Visual_Studio/Tango.BL/Entities/IdsPackFormulaBase.cs index 0108dc3f5..62d88bc77 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/IdsPackFormulaBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/IdsPackFormulaBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobBase.cs b/Software/Visual_Studio/Tango.BL/Entities/JobBase.cs index 45e0e3437..a535a78bd 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/JobBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/JobBase.cs @@ -19,14 +19,10 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { - - /// - /// - /// - [Table("JOBS")] public abstract class JobBase : ObservableEntity { diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs b/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs index 5e8a3b62c..7d56f3fa8 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs @@ -19,14 +19,10 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { - - /// - /// - /// - [Table("JOB_RUNS")] public abstract class JobRunBase : ObservableEntity { diff --git a/Software/Visual_Studio/Tango.BL/Entities/LinearMassDensityUnitBase.cs b/Software/Visual_Studio/Tango.BL/Entities/LinearMassDensityUnitBase.cs index ccd78a60b..8f3ca38e8 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/LinearMassDensityUnitBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/LinearMassDensityUnitBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/LiquidTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/LiquidTypeBase.cs index 7683eadbc..723b8aaa7 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/LiquidTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/LiquidTypeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/LiquidTypesRmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/LiquidTypesRmlBase.cs index 5aad28034..ef9e80cb9 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/LiquidTypesRmlBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/LiquidTypesRmlBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs index c02b103dd..b1fd12a53 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineStudioVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineStudioVersionBase.cs index 83bf72451..65630a630 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachineStudioVersionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachineStudioVersionBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineVersionBase.cs index 30602025e..440eaf723 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachineVersionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachineVersionBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachinesEventBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MachinesEventBase.cs index 0a3377dce..161e25d77 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachinesEventBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachinesEventBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaConditionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaConditionBase.cs index 12405642a..ec7501ba4 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MediaConditionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MediaConditionBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaMaterialBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaMaterialBase.cs index 2d0529506..860337fae 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MediaMaterialBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MediaMaterialBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaPurposBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaPurposBase.cs index 91fd93bd4..7a099ebeb 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MediaPurposBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MediaPurposBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/MidTankTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MidTankTypeBase.cs index 2467bcd8c..34c40f2a0 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MidTankTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MidTankTypeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/OrganizationBase.cs b/Software/Visual_Studio/Tango.BL/Entities/OrganizationBase.cs index c83d1a7c9..7fb8699af 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/OrganizationBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/OrganizationBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/PermissionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/PermissionBase.cs index 7f6ba7499..d86097af1 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/PermissionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/PermissionBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs index 2757b0625..1cc189e70 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { @@ -186,6 +187,8 @@ namespace Tango.BL.Entities [Column("FEEDER_TENSION")] + [StringFormat("0.000")] + public Double FeederTension { get diff --git a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTablesGroupBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTablesGroupBase.cs index 79e252b44..005dd5b40 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTablesGroupBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTablesGroupBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs index 86545b913..6901fb973 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/RoleBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RoleBase.cs index cca6b7600..ed8d67233 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RoleBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RoleBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/RolesPermissionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RolesPermissionBase.cs index bdaaaac3c..6fa2adf77 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RolesPermissionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RolesPermissionBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/SegmentBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SegmentBase.cs index 40f86a34c..f98239bf3 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/SegmentBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/SegmentBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/SiteBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SiteBase.cs index f4881ae79..071dd7ea9 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/SiteBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/SiteBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/SitesCatalogBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SitesCatalogBase.cs index 15f7ef6df..4f4665203 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/SitesCatalogBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/SitesCatalogBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/SitesRmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SitesRmlBase.cs index 6893099e4..d9111def7 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/SitesRmlBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/SitesRmlBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/SpoolBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SpoolBase.cs index 5794da91b..303f2ecbb 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/SpoolBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/SpoolBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/SpoolTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SpoolTypeBase.cs index 55edff2e0..778369948 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/SpoolTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/SpoolTypeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/SyncConfigurationBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SyncConfigurationBase.cs index 91b1ca9ac..ea816c4f3 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/SyncConfigurationBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/SyncConfigurationBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/SysdiagramBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SysdiagramBase.cs index 2e99df9b0..6be908bb4 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/SysdiagramBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/SysdiagramBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/TangoUpdateBase.cs b/Software/Visual_Studio/Tango.BL/Entities/TangoUpdateBase.cs index 57475977b..677886b47 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TangoUpdateBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TangoUpdateBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/TangoVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/TangoVersionBase.cs index ddf7561af..f39df936a 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TangoVersionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TangoVersionBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechControllerBase.cs b/Software/Visual_Studio/Tango.BL/Entities/TechControllerBase.cs index 72fe76f3c..b060ded50 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TechControllerBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TechControllerBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechDispenserBase.cs b/Software/Visual_Studio/Tango.BL/Entities/TechDispenserBase.cs index ccb3e7c03..ba6309950 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TechDispenserBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TechDispenserBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechHeaterBase.cs b/Software/Visual_Studio/Tango.BL/Entities/TechHeaterBase.cs index 2fc68c69c..5dc7d2a5a 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TechHeaterBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TechHeaterBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechIoBase.cs b/Software/Visual_Studio/Tango.BL/Entities/TechIoBase.cs index 0b140690f..e027e81b1 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TechIoBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TechIoBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechMonitorBase.cs b/Software/Visual_Studio/Tango.BL/Entities/TechMonitorBase.cs index d7ff856b6..f9f9c7140 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TechMonitorBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TechMonitorBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechValveBase.cs b/Software/Visual_Studio/Tango.BL/Entities/TechValveBase.cs index 5275c924b..e22bd450e 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TechValveBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TechValveBase.cs @@ -19,14 +19,10 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { - - /// - /// - /// - [Table("TECH_VALVES")] public abstract class TechValveBase : ObservableEntity { diff --git a/Software/Visual_Studio/Tango.BL/Entities/UserBase.cs b/Software/Visual_Studio/Tango.BL/Entities/UserBase.cs index cb7692b2d..5e3fa1a8f 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/UserBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/UserBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/UsersRoleBase.cs b/Software/Visual_Studio/Tango.BL/Entities/UsersRoleBase.cs index 2927d05f1..877f66c72 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/UsersRoleBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/UsersRoleBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/WindingMethodBase.cs b/Software/Visual_Studio/Tango.BL/Entities/WindingMethodBase.cs index ce4c22313..e64f989aa 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/WindingMethodBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/WindingMethodBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.CodeGeneration/DbPropertyExtensionModel.cs b/Software/Visual_Studio/Tango.CodeGeneration/DbPropertyExtensionModel.cs new file mode 100644 index 000000000..873aabe1e --- /dev/null +++ b/Software/Visual_Studio/Tango.CodeGeneration/DbPropertyExtensionModel.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.CodeGeneration +{ + public class DbPropertyExtensionModel + { + public String Description { get; set; } + public double Min { get; set; } + public double Max { get; set; } + public String StringFormat { get; set; } + + public bool HasDescription + { + get { return Description != null; } + } + + public bool HasRange + { + get { return Min != Max; } + } + + public bool HasStringFormat + { + get { return StringFormat != null; } + } + + public DbPropertyExtensionModel() + { + StringFormat = "0.0"; + } + } +} diff --git a/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFile.cs b/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFile.cs index 24d61bb0a..8126c8bc4 100644 --- a/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFile.cs +++ b/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFile.cs @@ -66,7 +66,7 @@ namespace Tango.CodeGeneration public String DbDescription { get; set; } - public RangeDescriptionModel RangeDescription { get; set; } + public DbPropertyExtensionModel PropertyExtension { get; set; } public bool IsForeignKey { get; set; } diff --git a/Software/Visual_Studio/Tango.CodeGeneration/RangeDescriptionModel.cs b/Software/Visual_Studio/Tango.CodeGeneration/RangeDescriptionModel.cs deleted file mode 100644 index 4600460b7..000000000 --- a/Software/Visual_Studio/Tango.CodeGeneration/RangeDescriptionModel.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.CodeGeneration -{ - public class RangeDescriptionModel - { - public String Description { get; set; } - public double Min { get; set; } - public double Max { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj b/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj index 6bff5b42e..4c2793367 100644 --- a/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj +++ b/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj @@ -77,7 +77,7 @@ - + @@ -129,7 +129,7 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlower.cs b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlower.cs index 4685c17fa..8138b2d70 100644 --- a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlower.cs +++ b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlower.cs @@ -98,9 +98,6 @@ namespace Tango.PMR.Hardware { /// Field number for the "Voltage" field. public const int VoltageFieldNumber = 3; private double voltage_; - /// - ///Voltage Description - /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public double Voltage { get { return voltage_; } diff --git a/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs b/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs index 90b502b7f..ff18a73ae 100644 --- a/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs +++ b/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs @@ -23,7 +23,7 @@ namespace Tango.PMR.Printing { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChdQcm9jZXNzUGFyYW1ldGVycy5wcm90bxISVGFuZ28uUE1SLlByaW50aW5n", - "ItgDChFQcm9jZXNzUGFyYW1ldGVycxITCgtEeWVpbmdTcGVlZBgBIAEoARIU", + "IpMFChFQcm9jZXNzUGFyYW1ldGVycxITCgtEeWVpbmdTcGVlZBgBIAEoARIU", "CgxNaW5JbmtVcHRha2UYAiABKAESFAoMTWF4SW5rVXB0YWtlGAMgASgBEhUK", "DUZlZWRlclRlbnNpb24YBCABKAESFQoNUHVsbGVyVGVuc2lvbhgFIAEoARIV", "Cg1XaW5kZXJUZW5zaW9uGAYgASgBEhEKCU1peGVyVGVtcBgHIAEoARIVCg1I", @@ -33,12 +33,16 @@ namespace Tango.PMR.Printing { "CgxEcnllckFpckZsb3cYDiABKAESFgoORHJ5ZXJab25lMVRlbXAYDyABKAES", "FgoORHJ5ZXJab25lMlRlbXAYECABKAESFgoORHJ5ZXJab25lM1RlbXAYESAB", "KAESGQoRRHJ5ZXJCdWZmZXJMZW5ndGgYEiABKAESEwoLSGVhZEFpckZsb3cY", - "EyABKAESEgoKVGFibGVJbmRleBgUIAEoBUIeChxjb20udHdpbmUudGFuZ28u", - "cG1yLnByaW50aW5nYgZwcm90bzM=")); + "EyABKAESEgoKVGFibGVJbmRleBgUIAEoBRIVCg1IZWFkWm9uZTdUZW1wGBUg", + "ASgBEhUKDUhlYWRab25lOFRlbXAYFiABKAESFQoNSGVhZFpvbmU5VGVtcBgX", + "IAEoARIWCg5IZWFkWm9uZTEwVGVtcBgYIAEoARIWCg5IZWFkWm9uZTExVGVt", + "cBgZIAEoARIWCg5IZWFkWm9uZTEyVGVtcBgaIAEoARIVCg1TdFNwWm9uZTFU", + "ZW1wGBsgASgBEhUKDVN0U3Bab25lMlRlbXAYHCABKAFCHgocY29tLnR3aW5l", + "LnRhbmdvLnBtci5wcmludGluZ2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.ProcessParameters), global::Tango.PMR.Printing.ProcessParameters.Parser, new[]{ "DyeingSpeed", "MinInkUptake", "MaxInkUptake", "FeederTension", "PullerTension", "WinderTension", "MixerTemp", "HeadZone1Temp", "HeadZone2Temp", "HeadZone3Temp", "HeadZone4Temp", "HeadZone5Temp", "HeadZone6Temp", "DryerAirFlow", "DryerZone1Temp", "DryerZone2Temp", "DryerZone3Temp", "DryerBufferLength", "HeadAirFlow", "TableIndex" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.ProcessParameters), global::Tango.PMR.Printing.ProcessParameters.Parser, new[]{ "DyeingSpeed", "MinInkUptake", "MaxInkUptake", "FeederTension", "PullerTension", "WinderTension", "MixerTemp", "HeadZone1Temp", "HeadZone2Temp", "HeadZone3Temp", "HeadZone4Temp", "HeadZone5Temp", "HeadZone6Temp", "DryerAirFlow", "DryerZone1Temp", "DryerZone2Temp", "DryerZone3Temp", "DryerBufferLength", "HeadAirFlow", "TableIndex", "HeadZone7Temp", "HeadZone8Temp", "HeadZone9Temp", "HeadZone10Temp", "HeadZone11Temp", "HeadZone12Temp", "StSpZone1Temp", "StSpZone2Temp" }, null, null, null) })); } #endregion @@ -89,6 +93,14 @@ namespace Tango.PMR.Printing { dryerBufferLength_ = other.dryerBufferLength_; headAirFlow_ = other.headAirFlow_; tableIndex_ = other.tableIndex_; + headZone7Temp_ = other.headZone7Temp_; + headZone8Temp_ = other.headZone8Temp_; + headZone9Temp_ = other.headZone9Temp_; + headZone10Temp_ = other.headZone10Temp_; + headZone11Temp_ = other.headZone11Temp_; + headZone12Temp_ = other.headZone12Temp_; + stSpZone1Temp_ = other.stSpZone1Temp_; + stSpZone2Temp_ = other.stSpZone2Temp_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -316,6 +328,94 @@ namespace Tango.PMR.Printing { } } + /// Field number for the "HeadZone7Temp" field. + public const int HeadZone7TempFieldNumber = 21; + private double headZone7Temp_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double HeadZone7Temp { + get { return headZone7Temp_; } + set { + headZone7Temp_ = value; + } + } + + /// Field number for the "HeadZone8Temp" field. + public const int HeadZone8TempFieldNumber = 22; + private double headZone8Temp_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double HeadZone8Temp { + get { return headZone8Temp_; } + set { + headZone8Temp_ = value; + } + } + + /// Field number for the "HeadZone9Temp" field. + public const int HeadZone9TempFieldNumber = 23; + private double headZone9Temp_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double HeadZone9Temp { + get { return headZone9Temp_; } + set { + headZone9Temp_ = value; + } + } + + /// Field number for the "HeadZone10Temp" field. + public const int HeadZone10TempFieldNumber = 24; + private double headZone10Temp_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double HeadZone10Temp { + get { return headZone10Temp_; } + set { + headZone10Temp_ = value; + } + } + + /// Field number for the "HeadZone11Temp" field. + public const int HeadZone11TempFieldNumber = 25; + private double headZone11Temp_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double HeadZone11Temp { + get { return headZone11Temp_; } + set { + headZone11Temp_ = value; + } + } + + /// Field number for the "HeadZone12Temp" field. + public const int HeadZone12TempFieldNumber = 26; + private double headZone12Temp_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double HeadZone12Temp { + get { return headZone12Temp_; } + set { + headZone12Temp_ = value; + } + } + + /// Field number for the "StSpZone1Temp" field. + public const int StSpZone1TempFieldNumber = 27; + private double stSpZone1Temp_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double StSpZone1Temp { + get { return stSpZone1Temp_; } + set { + stSpZone1Temp_ = value; + } + } + + /// Field number for the "StSpZone2Temp" field. + public const int StSpZone2TempFieldNumber = 28; + private double stSpZone2Temp_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double StSpZone2Temp { + get { return stSpZone2Temp_; } + set { + stSpZone2Temp_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as ProcessParameters); @@ -349,6 +449,14 @@ namespace Tango.PMR.Printing { if (DryerBufferLength != other.DryerBufferLength) return false; if (HeadAirFlow != other.HeadAirFlow) return false; if (TableIndex != other.TableIndex) return false; + if (HeadZone7Temp != other.HeadZone7Temp) return false; + if (HeadZone8Temp != other.HeadZone8Temp) return false; + if (HeadZone9Temp != other.HeadZone9Temp) return false; + if (HeadZone10Temp != other.HeadZone10Temp) return false; + if (HeadZone11Temp != other.HeadZone11Temp) return false; + if (HeadZone12Temp != other.HeadZone12Temp) return false; + if (StSpZone1Temp != other.StSpZone1Temp) return false; + if (StSpZone2Temp != other.StSpZone2Temp) return false; return true; } @@ -375,6 +483,14 @@ namespace Tango.PMR.Printing { if (DryerBufferLength != 0D) hash ^= DryerBufferLength.GetHashCode(); if (HeadAirFlow != 0D) hash ^= HeadAirFlow.GetHashCode(); if (TableIndex != 0) hash ^= TableIndex.GetHashCode(); + if (HeadZone7Temp != 0D) hash ^= HeadZone7Temp.GetHashCode(); + if (HeadZone8Temp != 0D) hash ^= HeadZone8Temp.GetHashCode(); + if (HeadZone9Temp != 0D) hash ^= HeadZone9Temp.GetHashCode(); + if (HeadZone10Temp != 0D) hash ^= HeadZone10Temp.GetHashCode(); + if (HeadZone11Temp != 0D) hash ^= HeadZone11Temp.GetHashCode(); + if (HeadZone12Temp != 0D) hash ^= HeadZone12Temp.GetHashCode(); + if (StSpZone1Temp != 0D) hash ^= StSpZone1Temp.GetHashCode(); + if (StSpZone2Temp != 0D) hash ^= StSpZone2Temp.GetHashCode(); return hash; } @@ -465,6 +581,38 @@ namespace Tango.PMR.Printing { output.WriteRawTag(160, 1); output.WriteInt32(TableIndex); } + if (HeadZone7Temp != 0D) { + output.WriteRawTag(169, 1); + output.WriteDouble(HeadZone7Temp); + } + if (HeadZone8Temp != 0D) { + output.WriteRawTag(177, 1); + output.WriteDouble(HeadZone8Temp); + } + if (HeadZone9Temp != 0D) { + output.WriteRawTag(185, 1); + output.WriteDouble(HeadZone9Temp); + } + if (HeadZone10Temp != 0D) { + output.WriteRawTag(193, 1); + output.WriteDouble(HeadZone10Temp); + } + if (HeadZone11Temp != 0D) { + output.WriteRawTag(201, 1); + output.WriteDouble(HeadZone11Temp); + } + if (HeadZone12Temp != 0D) { + output.WriteRawTag(209, 1); + output.WriteDouble(HeadZone12Temp); + } + if (StSpZone1Temp != 0D) { + output.WriteRawTag(217, 1); + output.WriteDouble(StSpZone1Temp); + } + if (StSpZone2Temp != 0D) { + output.WriteRawTag(225, 1); + output.WriteDouble(StSpZone2Temp); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -530,6 +678,30 @@ namespace Tango.PMR.Printing { if (TableIndex != 0) { size += 2 + pb::CodedOutputStream.ComputeInt32Size(TableIndex); } + if (HeadZone7Temp != 0D) { + size += 2 + 8; + } + if (HeadZone8Temp != 0D) { + size += 2 + 8; + } + if (HeadZone9Temp != 0D) { + size += 2 + 8; + } + if (HeadZone10Temp != 0D) { + size += 2 + 8; + } + if (HeadZone11Temp != 0D) { + size += 2 + 8; + } + if (HeadZone12Temp != 0D) { + size += 2 + 8; + } + if (StSpZone1Temp != 0D) { + size += 2 + 8; + } + if (StSpZone2Temp != 0D) { + size += 2 + 8; + } return size; } @@ -598,6 +770,30 @@ namespace Tango.PMR.Printing { if (other.TableIndex != 0) { TableIndex = other.TableIndex; } + if (other.HeadZone7Temp != 0D) { + HeadZone7Temp = other.HeadZone7Temp; + } + if (other.HeadZone8Temp != 0D) { + HeadZone8Temp = other.HeadZone8Temp; + } + if (other.HeadZone9Temp != 0D) { + HeadZone9Temp = other.HeadZone9Temp; + } + if (other.HeadZone10Temp != 0D) { + HeadZone10Temp = other.HeadZone10Temp; + } + if (other.HeadZone11Temp != 0D) { + HeadZone11Temp = other.HeadZone11Temp; + } + if (other.HeadZone12Temp != 0D) { + HeadZone12Temp = other.HeadZone12Temp; + } + if (other.StSpZone1Temp != 0D) { + StSpZone1Temp = other.StSpZone1Temp; + } + if (other.StSpZone2Temp != 0D) { + StSpZone2Temp = other.StSpZone2Temp; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -688,6 +884,38 @@ namespace Tango.PMR.Printing { TableIndex = input.ReadInt32(); break; } + case 169: { + HeadZone7Temp = input.ReadDouble(); + break; + } + case 177: { + HeadZone8Temp = input.ReadDouble(); + break; + } + case 185: { + HeadZone9Temp = input.ReadDouble(); + break; + } + case 193: { + HeadZone10Temp = input.ReadDouble(); + break; + } + case 201: { + HeadZone11Temp = input.ReadDouble(); + break; + } + case 209: { + HeadZone12Temp = input.ReadDouble(); + break; + } + case 217: { + StSpZone1Temp = input.ReadDouble(); + break; + } + case 225: { + StSpZone2Temp = input.ReadDouble(); + break; + } } } } diff --git a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs index 1b33e13d2..c4c16b416 100644 --- a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs @@ -756,11 +756,7 @@ namespace Tango.PMRGenerator.CLI } catch { } - if (rangeDescription != null && rangeDescription.Description != null) - { - return rangeDescription.Description.ToLines().Take(1).Concat(rangeDescription.Description.ToLines().Skip(1).Select(x => "//" + x)).Join(Environment.NewLine); - } - else + if (rangeDescription == null) { return db_des.ColumnDescription.ToLines().Take(1).Concat(db_des.ColumnDescription.ToLines().Skip(1).Select(x => "//" + x)).Join(Environment.NewLine); } -- cgit v1.3.1