diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-11-15 12:50:03 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-11-15 12:50:03 +0200 |
| commit | 0f6d30eb6a003eee2ebc3008a45170e0c2bb8cdd (patch) | |
| tree | 85e05583eb7a2a6323a8156b8db30a946c74c60b /Software/Visual_Studio | |
| parent | 6ffe8dafa65ee428aa9866d8b13d1d96e440023a (diff) | |
| download | Tango-0f6d30eb6a003eee2ebc3008a45170e0c2bb8cdd.tar.gz Tango-0f6d30eb6a003eee2ebc3008a45170e0c2bb8cdd.zip | |
Optimized accuracy of CSV recordings!
Diffstat (limited to 'Software/Visual_Studio')
81 files changed, 6029 insertions, 1302 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/MultiTechRecordingData.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/MultiTechRecordingData.cs index ad3ea1352..c6fe67ed6 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/MultiTechRecordingData.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/MultiTechRecordingData.cs @@ -21,10 +21,9 @@ namespace Tango.MachineStudio.Technician.Models Init(); } - public void PushData(List<List<double>> data) + public void PushData(List<List<double>> data, TimeSpan deltabase, TimeSpan delta) { - TimeSpan delta_base = DateTime.Now - _start_time; - double delta_mili = (DateTime.Now - _last_time).TotalMilliseconds; + double delta_mili = delta.TotalMilliseconds; _last_time = DateTime.Now; @@ -37,7 +36,7 @@ namespace Tango.MachineStudio.Technician.Models for (int row = 0; row < height; row++) { - String time = (delta_base.Add(TimeSpan.FromMilliseconds((delta_mili / data.Count) * row))).ToString(@"hh\:mm\:ss\.fff"); + String time = (deltabase.Add(TimeSpan.FromMilliseconds((delta_mili / data.Count) * row))).ToString(@"hh\:mm\:ss\.fff"); List<double> row_values = new List<double>(); @@ -52,6 +51,13 @@ namespace Tango.MachineStudio.Technician.Models }); } + public void PushData(List<List<double>> data) + { + TimeSpan delta_base = DateTime.Now - _start_time; + TimeSpan delta = (DateTime.Now - _last_time); + PushData(data, delta_base, delta); + } + protected override List<string> GetColumnNames() { return Enumerable.Range(1, ChannelCount).Select(x => Name + " " + x).ToList(); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/SingleTechRecordingData.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/SingleTechRecordingData.cs index 8b480bbf3..56691504b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/SingleTechRecordingData.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/SingleTechRecordingData.cs @@ -14,10 +14,9 @@ namespace Tango.MachineStudio.Technician.Models Init(); } - public void PushData(List<double> data) + public void PushData(List<double> data, TimeSpan deltabase, TimeSpan delta) { - TimeSpan delta_base = DateTime.Now - _start_time; - double delta_mili = (DateTime.Now - _last_time).TotalMilliseconds; + double delta_mili = delta.TotalMilliseconds; _last_time = DateTime.Now; @@ -27,12 +26,19 @@ namespace Tango.MachineStudio.Technician.Models { for (int i = 0; i < data.Count; i++) { - CsvFile.Append(new SingleTechRecordingValue((delta_base.Add(TimeSpan.FromMilliseconds((delta_mili / data.Count) * i))).ToString(@"hh\:mm\:ss\.fff"), data[i])); + CsvFile.Append(new SingleTechRecordingValue((deltabase.Add(TimeSpan.FromMilliseconds((delta_mili / data.Count) * i))).ToString(@"hh\:mm\:ss\.fff"), data[i])); } } }); } + public void PushData(List<double> data) + { + TimeSpan delta_base = DateTime.Now - _start_time; + double delta_mili = (DateTime.Now - _last_time).TotalMilliseconds; + PushData(data, delta_base, DateTime.Now - _last_time); + } + protected override List<string> GetColumnNames() { return new List<string>() { Name }; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs index 85b32437b..605ab8105 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs @@ -398,7 +398,8 @@ namespace Tango.MachineStudio.Technician.ViewModels private void PopulateDiagnosticsData(StartDiagnosticsResponse data) { TimeSpan delta_base = DateTime.Now - _start_time; - double delta_mili = (DateTime.Now - _last_time).TotalMilliseconds; + TimeSpan delta = (DateTime.Now - _last_time); + double delta_mili = delta.TotalMilliseconds; _last_time = DateTime.Now; if (DateTime.Now > _lastDiagnosticsResponseUpdate.AddMilliseconds(MIN_DIAGNOSTICS_UPDATE_MILI)) @@ -417,7 +418,7 @@ namespace Tango.MachineStudio.Technician.ViewModels if (prop != null) { var points = GetDataArray(techMonitor, prop.GetValue(data.Monitors)); - sr.PushData(points); + sr.PushData(points, delta_base, delta); } } @@ -430,7 +431,7 @@ namespace Tango.MachineStudio.Technician.ViewModels if (prop != null) { var points = GetDataMatrix(techMonitor, prop.GetValue(data.Monitors)); - mr.PushData(points); + mr.PushData(points, delta_base, delta); } } @@ -495,7 +496,7 @@ namespace Tango.MachineStudio.Technician.ViewModels var _graph_recording = _single_graphs_recordings.SingleOrDefault(x => x.Tag == graphItem); if (_graph_recording != null) { - _graph_recording.PushData(points); + _graph_recording.PushData(points, delta_base, delta); } } } @@ -537,7 +538,7 @@ namespace Tango.MachineStudio.Technician.ViewModels var _graph_recording = _multi_graph_recordings.SingleOrDefault(x => x.Tag == graphItem); if (_graph_recording != null) { - _graph_recording.PushData(points); + _graph_recording.PushData(points, delta_base, delta); } } } @@ -1125,11 +1126,11 @@ namespace Tango.MachineStudio.Technician.ViewModels { if (!monitor.MultiChannel) { - _single_monitors_recordings.Add(new SingleTechRecordingData(monitor.Name, dlg.FileName + "\\" + monitor.Description + ".csv") { Tag = monitor }); + _single_monitors_recordings.Add(new SingleTechRecordingData(monitor.Description, dlg.FileName + "\\" + monitor.Description + ".csv") { Tag = monitor }); } else { - _multi_monitors_recordings.Add(new MultiTechRecordingData(monitor.Name, monitor.ChannelCount, dlg.FileName + "\\" + monitor.Description + ".csv") { Tag = monitor }); + _multi_monitors_recordings.Add(new MultiTechRecordingData(monitor.Description, monitor.ChannelCount, dlg.FileName + "\\" + monitor.Description + ".csv") { Tag = monitor }); } item.StartRecording(); } @@ -1280,19 +1281,19 @@ namespace Tango.MachineStudio.Technician.ViewModels item.HomingMaximumProgress = response.MaxProgress; item.HomingProgress = response.Progress; - },(ex) => - { + }, (ex) => + { - item.IsHoming = false; - item.IsHomingCompleted = true; + item.IsHoming = false; + item.IsHomingCompleted = true; - }, () => - { + }, () => + { - item.IsHoming = false; - item.IsHomingCompleted = true; + item.IsHoming = false; + item.IsHomingCompleted = true; - }); + }); } else if (action == MotorActionType.HomingStopped) { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ActionType.cs b/Software/Visual_Studio/Tango.BL/Entities/ActionType.cs index 5c5dacfa0..a8b008306 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ActionType.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ActionType.cs @@ -25,6 +25,14 @@ namespace Tango.BL.Entities public partial class ActionType : ObservableEntity<ActionType> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<SynchronizedObservableCollection<EventTypesAction>> EventTypesActionsChanged; + protected Int32 _code; /// <summary> @@ -42,9 +50,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +78,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + NameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Name)); + } + } } protected String _description; @@ -86,9 +106,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + + DescriptionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Description)); + } + } } protected SynchronizedObservableCollection<EventTypesAction> _eventtypesactions; @@ -106,9 +132,15 @@ namespace Tango.BL.Entities set { - _eventtypesactions = value; RaisePropertyChanged(nameof(EventTypesActions)); - } + if (_eventtypesactions != value) + { + _eventtypesactions = value; + EventTypesActionsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(EventTypesActions)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/Address.cs b/Software/Visual_Studio/Tango.BL/Entities/Address.cs index c6c609343..1f5f5edcb 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Address.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Address.cs @@ -25,6 +25,26 @@ namespace Tango.BL.Entities public partial class Address : ObservableEntity<Address> { + public event EventHandler<Boolean> DeletedChanged; + + public event EventHandler<String> AddressStringChanged; + + public event EventHandler<String> LocalityChanged; + + public event EventHandler<String> CountryChanged; + + public event EventHandler<String> CityChanged; + + public event EventHandler<String> StateChanged; + + public event EventHandler<String> CountryCodeChanged; + + public event EventHandler<String> PostalCodeChanged; + + public event EventHandler<SynchronizedObservableCollection<Organization>> OrganizationsChanged; + + public event EventHandler<SynchronizedObservableCollection<User>> UsersChanged; + protected Boolean _deleted; /// <summary> @@ -42,9 +62,15 @@ namespace Tango.BL.Entities set { - _deleted = value; RaisePropertyChanged(nameof(Deleted)); - } + if (_deleted != value) + { + _deleted = value; + + DeletedChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Deleted)); + } + } } protected String _addressstring; @@ -64,9 +90,15 @@ namespace Tango.BL.Entities set { - _addressstring = value; RaisePropertyChanged(nameof(AddressString)); - } + if (_addressstring != value) + { + _addressstring = value; + + AddressStringChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(AddressString)); + } + } } protected String _locality; @@ -86,9 +118,15 @@ namespace Tango.BL.Entities set { - _locality = value; RaisePropertyChanged(nameof(Locality)); - } + if (_locality != value) + { + _locality = value; + + LocalityChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Locality)); + } + } } protected String _country; @@ -108,9 +146,15 @@ namespace Tango.BL.Entities set { - _country = value; RaisePropertyChanged(nameof(Country)); - } + if (_country != value) + { + _country = value; + CountryChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Country)); + } + } } protected String _city; @@ -130,9 +174,15 @@ namespace Tango.BL.Entities set { - _city = value; RaisePropertyChanged(nameof(City)); - } + if (_city != value) + { + _city = value; + CityChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(City)); + } + } } protected String _state; @@ -152,9 +202,15 @@ namespace Tango.BL.Entities set { - _state = value; RaisePropertyChanged(nameof(State)); - } + if (_state != value) + { + _state = value; + + StateChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(State)); + } + } } protected String _countrycode; @@ -174,9 +230,15 @@ namespace Tango.BL.Entities set { - _countrycode = value; RaisePropertyChanged(nameof(CountryCode)); - } + if (_countrycode != value) + { + _countrycode = value; + + CountryCodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(CountryCode)); + } + } } protected String _postalcode; @@ -196,9 +258,15 @@ namespace Tango.BL.Entities set { - _postalcode = value; RaisePropertyChanged(nameof(PostalCode)); - } + if (_postalcode != value) + { + _postalcode = value; + + PostalCodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(PostalCode)); + } + } } protected SynchronizedObservableCollection<Organization> _organizations; @@ -216,9 +284,15 @@ namespace Tango.BL.Entities set { - _organizations = value; RaisePropertyChanged(nameof(Organizations)); - } + if (_organizations != value) + { + _organizations = value; + OrganizationsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Organizations)); + } + } } protected SynchronizedObservableCollection<User> _users; @@ -236,9 +310,15 @@ namespace Tango.BL.Entities set { - _users = value; RaisePropertyChanged(nameof(Users)); - } + if (_users != value) + { + _users = value; + UsersChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Users)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/ApplicationDisplayPanelVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/ApplicationDisplayPanelVersion.cs index de728349f..54121e8a2 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ApplicationDisplayPanelVersion.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ApplicationDisplayPanelVersion.cs @@ -25,6 +25,12 @@ namespace Tango.BL.Entities public partial class ApplicationDisplayPanelVersion : ObservableEntity<ApplicationDisplayPanelVersion> { + public event EventHandler<Double> VersionChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<SynchronizedObservableCollection<Configuration>> ConfigurationsChanged; + protected Double _version; /// <summary> @@ -42,9 +48,15 @@ namespace Tango.BL.Entities set { - _version = value; RaisePropertyChanged(nameof(Version)); - } + if (_version != value) + { + _version = value; + + VersionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Version)); + } + } } protected String _name; @@ -64,9 +76,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected SynchronizedObservableCollection<Configuration> _configurations; @@ -84,9 +102,15 @@ namespace Tango.BL.Entities set { - _configurations = value; RaisePropertyChanged(nameof(Configurations)); - } + if (_configurations != value) + { + _configurations = value; + + ConfigurationsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Configurations)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/ApplicationFirmwareVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/ApplicationFirmwareVersion.cs index 3de81ba46..67dcd012e 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ApplicationFirmwareVersion.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ApplicationFirmwareVersion.cs @@ -25,6 +25,12 @@ namespace Tango.BL.Entities public partial class ApplicationFirmwareVersion : ObservableEntity<ApplicationFirmwareVersion> { + public event EventHandler<Double> VersionChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<SynchronizedObservableCollection<Configuration>> ConfigurationsChanged; + protected Double _version; /// <summary> @@ -42,9 +48,15 @@ namespace Tango.BL.Entities set { - _version = value; RaisePropertyChanged(nameof(Version)); - } + if (_version != value) + { + _version = value; + + VersionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Version)); + } + } } protected String _name; @@ -64,9 +76,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected SynchronizedObservableCollection<Configuration> _configurations; @@ -84,9 +102,15 @@ namespace Tango.BL.Entities set { - _configurations = value; RaisePropertyChanged(nameof(Configurations)); - } + if (_configurations != value) + { + _configurations = value; + + ConfigurationsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Configurations)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/ApplicationOsVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/ApplicationOsVersion.cs index 2606978d9..2e3e9190d 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ApplicationOsVersion.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ApplicationOsVersion.cs @@ -25,6 +25,12 @@ namespace Tango.BL.Entities public partial class ApplicationOsVersion : ObservableEntity<ApplicationOsVersion> { + public event EventHandler<Double> VersionChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<SynchronizedObservableCollection<Configuration>> ConfigurationsChanged; + protected Double _version; /// <summary> @@ -42,9 +48,15 @@ namespace Tango.BL.Entities set { - _version = value; RaisePropertyChanged(nameof(Version)); - } + if (_version != value) + { + _version = value; + + VersionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Version)); + } + } } protected String _name; @@ -64,9 +76,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected SynchronizedObservableCollection<Configuration> _configurations; @@ -84,9 +102,15 @@ namespace Tango.BL.Entities set { - _configurations = value; RaisePropertyChanged(nameof(Configurations)); - } + if (_configurations != value) + { + _configurations = value; + + ConfigurationsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Configurations)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs index 682ce1f7a..67e846aba 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs @@ -25,6 +25,72 @@ namespace Tango.BL.Entities public partial class BrushStop : ObservableEntity<BrushStop> { + public event EventHandler<Double> OffsetPercentChanged; + + public event EventHandler<Int32> StopIndexChanged; + + public event EventHandler<Double> CyanChanged; + + public event EventHandler<Double> MagentaChanged; + + public event EventHandler<Double> YellowChanged; + + public event EventHandler<Double> BlackChanged; + + public event EventHandler<Int32> RedChanged; + + public event EventHandler<Int32> GreenChanged; + + public event EventHandler<Int32> BlueChanged; + + public event EventHandler<Double> LChanged; + + public event EventHandler<Double> AChanged; + + public event EventHandler<Double> BChanged; + + public event EventHandler<Double> V0Changed; + + public event EventHandler<Int32> V0DivChanged; + + public event EventHandler<Double> V1Changed; + + public event EventHandler<Int32> V1DivChanged; + + public event EventHandler<Double> V2Changed; + + public event EventHandler<Int32> V2DivChanged; + + public event EventHandler<Double> V3Changed; + + public event EventHandler<Int32> V3DivChanged; + + public event EventHandler<Double> V4Changed; + + public event EventHandler<Int32> V4DivChanged; + + public event EventHandler<Double> V5Changed; + + public event EventHandler<Int32> V5DivChanged; + + public event EventHandler<Double> V6Changed; + + public event EventHandler<Int32> V6DivChanged; + + public event EventHandler<Double> V7Changed; + + public event EventHandler<Int32> V7DivChanged; + + public event EventHandler<Boolean> CorrectedChanged; + + public event EventHandler<Int32> ColorCatalogCodeChanged; + + public event EventHandler<ColorCatalog> ColorCatalogChanged; + + public event EventHandler<ColorSpace> ColorSpaceChanged; + + public event EventHandler<Segment> SegmentChanged; + protected String _segmentguid; /// <summary> @@ -43,9 +109,12 @@ namespace Tango.BL.Entities set { - _segmentguid = value; RaisePropertyChanged(nameof(SegmentGuid)); + if (_segmentguid != value) + { + _segmentguid = value; + RaisePropertyChanged(nameof(SegmentGuid)); + } } - } protected String _colorspaceguid; @@ -66,9 +135,12 @@ namespace Tango.BL.Entities set { - _colorspaceguid = value; RaisePropertyChanged(nameof(ColorSpaceGuid)); + if (_colorspaceguid != value) + { + _colorspaceguid = value; + RaisePropertyChanged(nameof(ColorSpaceGuid)); + } } - } protected Double _offsetpercent; @@ -88,9 +160,15 @@ namespace Tango.BL.Entities set { - _offsetpercent = value; RaisePropertyChanged(nameof(OffsetPercent)); - } + if (_offsetpercent != value) + { + _offsetpercent = value; + + OffsetPercentChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(OffsetPercent)); + } + } } protected Int32 _stopindex; @@ -110,9 +188,15 @@ namespace Tango.BL.Entities set { - _stopindex = value; RaisePropertyChanged(nameof(StopIndex)); - } + if (_stopindex != value) + { + _stopindex = value; + StopIndexChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(StopIndex)); + } + } } protected Double _cyan; @@ -132,9 +216,15 @@ namespace Tango.BL.Entities set { - _cyan = value; RaisePropertyChanged(nameof(Cyan)); - } + if (_cyan != value) + { + _cyan = value; + + CyanChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Cyan)); + } + } } protected Double _magenta; @@ -154,9 +244,15 @@ namespace Tango.BL.Entities set { - _magenta = value; RaisePropertyChanged(nameof(Magenta)); - } + if (_magenta != value) + { + _magenta = value; + MagentaChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Magenta)); + } + } } protected Double _yellow; @@ -176,9 +272,15 @@ namespace Tango.BL.Entities set { - _yellow = value; RaisePropertyChanged(nameof(Yellow)); - } + if (_yellow != value) + { + _yellow = value; + + YellowChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Yellow)); + } + } } protected Double _black; @@ -198,9 +300,15 @@ namespace Tango.BL.Entities set { - _black = value; RaisePropertyChanged(nameof(Black)); - } + if (_black != value) + { + _black = value; + BlackChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Black)); + } + } } protected Int32 _red; @@ -220,9 +328,15 @@ namespace Tango.BL.Entities set { - _red = value; RaisePropertyChanged(nameof(Red)); - } + if (_red != value) + { + _red = value; + RedChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Red)); + } + } } protected Int32 _green; @@ -242,9 +356,15 @@ namespace Tango.BL.Entities set { - _green = value; RaisePropertyChanged(nameof(Green)); - } + if (_green != value) + { + _green = value; + + GreenChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Green)); + } + } } protected Int32 _blue; @@ -264,9 +384,15 @@ namespace Tango.BL.Entities set { - _blue = value; RaisePropertyChanged(nameof(Blue)); - } + if (_blue != value) + { + _blue = value; + BlueChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Blue)); + } + } } protected Double _l; @@ -286,9 +412,15 @@ namespace Tango.BL.Entities set { - _l = value; RaisePropertyChanged(nameof(L)); - } + if (_l != value) + { + _l = value; + + LChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(L)); + } + } } protected Double _a; @@ -308,9 +440,15 @@ namespace Tango.BL.Entities set { - _a = value; RaisePropertyChanged(nameof(A)); - } + if (_a != value) + { + _a = value; + AChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(A)); + } + } } protected Double _b; @@ -330,9 +468,15 @@ namespace Tango.BL.Entities set { - _b = value; RaisePropertyChanged(nameof(B)); - } + if (_b != value) + { + _b = value; + + BChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(B)); + } + } } protected Double _v0; @@ -352,9 +496,15 @@ namespace Tango.BL.Entities set { - _v0 = value; RaisePropertyChanged(nameof(V0)); - } + if (_v0 != value) + { + _v0 = value; + + V0Changed?.Invoke(this, value); + RaisePropertyChanged(nameof(V0)); + } + } } protected Int32 _v0div; @@ -374,9 +524,15 @@ namespace Tango.BL.Entities set { - _v0div = value; RaisePropertyChanged(nameof(V0Div)); - } + if (_v0div != value) + { + _v0div = value; + V0DivChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(V0Div)); + } + } } protected Double _v1; @@ -396,9 +552,15 @@ namespace Tango.BL.Entities set { - _v1 = value; RaisePropertyChanged(nameof(V1)); - } + if (_v1 != value) + { + _v1 = value; + + V1Changed?.Invoke(this, value); + RaisePropertyChanged(nameof(V1)); + } + } } protected Int32 _v1div; @@ -418,9 +580,15 @@ namespace Tango.BL.Entities set { - _v1div = value; RaisePropertyChanged(nameof(V1Div)); - } + if (_v1div != value) + { + _v1div = value; + V1DivChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(V1Div)); + } + } } protected Double _v2; @@ -440,9 +608,15 @@ namespace Tango.BL.Entities set { - _v2 = value; RaisePropertyChanged(nameof(V2)); - } + if (_v2 != value) + { + _v2 = value; + + V2Changed?.Invoke(this, value); + RaisePropertyChanged(nameof(V2)); + } + } } protected Int32 _v2div; @@ -462,9 +636,15 @@ namespace Tango.BL.Entities set { - _v2div = value; RaisePropertyChanged(nameof(V2Div)); - } + if (_v2div != value) + { + _v2div = value; + + V2DivChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(V2Div)); + } + } } protected Double _v3; @@ -484,9 +664,15 @@ namespace Tango.BL.Entities set { - _v3 = value; RaisePropertyChanged(nameof(V3)); - } + if (_v3 != value) + { + _v3 = value; + V3Changed?.Invoke(this, value); + + RaisePropertyChanged(nameof(V3)); + } + } } protected Int32 _v3div; @@ -506,9 +692,15 @@ namespace Tango.BL.Entities set { - _v3div = value; RaisePropertyChanged(nameof(V3Div)); - } + if (_v3div != value) + { + _v3div = value; + + V3DivChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(V3Div)); + } + } } protected Double _v4; @@ -528,9 +720,15 @@ namespace Tango.BL.Entities set { - _v4 = value; RaisePropertyChanged(nameof(V4)); - } + if (_v4 != value) + { + _v4 = value; + V4Changed?.Invoke(this, value); + + RaisePropertyChanged(nameof(V4)); + } + } } protected Int32 _v4div; @@ -550,9 +748,15 @@ namespace Tango.BL.Entities set { - _v4div = value; RaisePropertyChanged(nameof(V4Div)); - } + if (_v4div != value) + { + _v4div = value; + + V4DivChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(V4Div)); + } + } } protected Double _v5; @@ -572,9 +776,15 @@ namespace Tango.BL.Entities set { - _v5 = value; RaisePropertyChanged(nameof(V5)); - } + if (_v5 != value) + { + _v5 = value; + V5Changed?.Invoke(this, value); + + RaisePropertyChanged(nameof(V5)); + } + } } protected Int32 _v5div; @@ -594,9 +804,15 @@ namespace Tango.BL.Entities set { - _v5div = value; RaisePropertyChanged(nameof(V5Div)); - } + if (_v5div != value) + { + _v5div = value; + V5DivChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(V5Div)); + } + } } protected Double _v6; @@ -616,9 +832,15 @@ namespace Tango.BL.Entities set { - _v6 = value; RaisePropertyChanged(nameof(V6)); - } + if (_v6 != value) + { + _v6 = value; + + V6Changed?.Invoke(this, value); + RaisePropertyChanged(nameof(V6)); + } + } } protected Int32 _v6div; @@ -638,9 +860,15 @@ namespace Tango.BL.Entities set { - _v6div = value; RaisePropertyChanged(nameof(V6Div)); - } + if (_v6div != value) + { + _v6div = value; + V6DivChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(V6Div)); + } + } } protected Double _v7; @@ -660,9 +888,15 @@ namespace Tango.BL.Entities set { - _v7 = value; RaisePropertyChanged(nameof(V7)); - } + if (_v7 != value) + { + _v7 = value; + + V7Changed?.Invoke(this, value); + RaisePropertyChanged(nameof(V7)); + } + } } protected Int32 _v7div; @@ -682,9 +916,15 @@ namespace Tango.BL.Entities set { - _v7div = value; RaisePropertyChanged(nameof(V7Div)); - } + if (_v7div != value) + { + _v7div = value; + V7DivChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(V7Div)); + } + } } protected Boolean _corrected; @@ -704,9 +944,15 @@ namespace Tango.BL.Entities set { - _corrected = value; RaisePropertyChanged(nameof(Corrected)); - } + if (_corrected != value) + { + _corrected = value; + + CorrectedChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Corrected)); + } + } } protected String _colorcatalogguid; @@ -727,9 +973,12 @@ namespace Tango.BL.Entities set { - _colorcatalogguid = value; RaisePropertyChanged(nameof(ColorCatalogGuid)); + if (_colorcatalogguid != value) + { + _colorcatalogguid = value; + RaisePropertyChanged(nameof(ColorCatalogGuid)); + } } - } protected Int32 _colorcatalogcode; @@ -749,9 +998,15 @@ namespace Tango.BL.Entities set { - _colorcatalogcode = value; RaisePropertyChanged(nameof(ColorCatalogCode)); - } + if (_colorcatalogcode != value) + { + _colorcatalogcode = value; + + ColorCatalogCodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(ColorCatalogCode)); + } + } } protected ColorCatalog _colorcatalog; @@ -771,9 +1026,15 @@ namespace Tango.BL.Entities set { - _colorcatalog = value; RaisePropertyChanged(nameof(ColorCatalog)); - } + if (_colorcatalog != value) + { + _colorcatalog = value; + ColorCatalogChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(ColorCatalog)); + } + } } protected ColorSpace _colorspace; @@ -793,9 +1054,15 @@ namespace Tango.BL.Entities set { - _colorspace = value; RaisePropertyChanged(nameof(ColorSpace)); - } + if (_colorspace != value) + { + _colorspace = value; + + ColorSpaceChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(ColorSpace)); + } + } } protected Segment _segment; @@ -815,9 +1082,15 @@ namespace Tango.BL.Entities set { - _segment = value; RaisePropertyChanged(nameof(Segment)); - } + if (_segment != value) + { + _segment = value; + SegmentChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Segment)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/CartridgeType.cs b/Software/Visual_Studio/Tango.BL/Entities/CartridgeType.cs index e8e184b89..bc5a3e909 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/CartridgeType.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/CartridgeType.cs @@ -25,6 +25,12 @@ namespace Tango.BL.Entities public partial class CartridgeType : ObservableEntity<CartridgeType> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<SynchronizedObservableCollection<IdsPack>> IdsPacksChanged; + protected Int32 _code; /// <summary> @@ -42,9 +48,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +76,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected SynchronizedObservableCollection<IdsPack> _idspacks; @@ -84,9 +102,15 @@ namespace Tango.BL.Entities set { - _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); - } + if (_idspacks != value) + { + _idspacks = value; + + IdsPacksChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(IdsPacks)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/Cat.cs b/Software/Visual_Studio/Tango.BL/Entities/Cat.cs index adfd49698..389910549 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Cat.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Cat.cs @@ -25,6 +25,16 @@ namespace Tango.BL.Entities public partial class Cat : ObservableEntity<Cat> { + public event EventHandler<String> NameChanged; + + public event EventHandler<Byte[]> DataChanged; + + public event EventHandler<LiquidType> LiquidTypeChanged; + + public event EventHandler<Machine> MachineChanged; + + public event EventHandler<Rml> RmlChanged; + protected String _name; /// <summary> @@ -42,9 +52,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + NameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Name)); + } + } } protected String _machineguid; @@ -65,9 +81,12 @@ namespace Tango.BL.Entities set { - _machineguid = value; RaisePropertyChanged(nameof(MachineGuid)); + if (_machineguid != value) + { + _machineguid = value; + RaisePropertyChanged(nameof(MachineGuid)); + } } - } protected String _rmlguid; @@ -88,9 +107,12 @@ namespace Tango.BL.Entities set { - _rmlguid = value; RaisePropertyChanged(nameof(RmlGuid)); + if (_rmlguid != value) + { + _rmlguid = value; + RaisePropertyChanged(nameof(RmlGuid)); + } } - } protected String _liquidtypeguid; @@ -111,9 +133,12 @@ namespace Tango.BL.Entities set { - _liquidtypeguid = value; RaisePropertyChanged(nameof(LiquidTypeGuid)); + if (_liquidtypeguid != value) + { + _liquidtypeguid = value; + RaisePropertyChanged(nameof(LiquidTypeGuid)); + } } - } protected Byte[] _data; @@ -133,9 +158,15 @@ namespace Tango.BL.Entities set { - _data = value; RaisePropertyChanged(nameof(Data)); - } + if (_data != value) + { + _data = value; + DataChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Data)); + } + } } protected LiquidType _liquidtype; @@ -155,9 +186,15 @@ namespace Tango.BL.Entities set { - _liquidtype = value; RaisePropertyChanged(nameof(LiquidType)); - } + if (_liquidtype != value) + { + _liquidtype = value; + LiquidTypeChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(LiquidType)); + } + } } protected Machine _machine; @@ -177,9 +214,15 @@ namespace Tango.BL.Entities set { - _machine = value; RaisePropertyChanged(nameof(Machine)); - } + if (_machine != value) + { + _machine = value; + MachineChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Machine)); + } + } } protected Rml _rml; @@ -199,9 +242,15 @@ namespace Tango.BL.Entities set { - _rml = value; RaisePropertyChanged(nameof(Rml)); - } + if (_rml != value) + { + _rml = value; + RmlChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Rml)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/Cct.cs b/Software/Visual_Studio/Tango.BL/Entities/Cct.cs index 936938022..339f334a5 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Cct.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Cct.cs @@ -25,6 +25,22 @@ namespace Tango.BL.Entities public partial class Cct : ObservableEntity<Cct> { + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<String> ForwardFileNameChanged; + + public event EventHandler<String> InverseFileNameChanged; + + public event EventHandler<Byte[]> ForwardDataChanged; + + public event EventHandler<Byte[]> InverseDataChanged; + + public event EventHandler<Double> VersionChanged; + + public event EventHandler<Rml> RmlChanged; + protected String _name; /// <summary> @@ -42,9 +58,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + NameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Name)); + } + } } protected String _description; @@ -64,9 +86,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + + DescriptionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Description)); + } + } } protected String _forwardfilename; @@ -86,9 +114,15 @@ namespace Tango.BL.Entities set { - _forwardfilename = value; RaisePropertyChanged(nameof(ForwardFileName)); - } + if (_forwardfilename != value) + { + _forwardfilename = value; + ForwardFileNameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(ForwardFileName)); + } + } } protected String _inversefilename; @@ -108,9 +142,15 @@ namespace Tango.BL.Entities set { - _inversefilename = value; RaisePropertyChanged(nameof(InverseFileName)); - } + if (_inversefilename != value) + { + _inversefilename = value; + + InverseFileNameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(InverseFileName)); + } + } } protected Byte[] _forwarddata; @@ -130,9 +170,15 @@ namespace Tango.BL.Entities set { - _forwarddata = value; RaisePropertyChanged(nameof(ForwardData)); - } + if (_forwarddata != value) + { + _forwarddata = value; + ForwardDataChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(ForwardData)); + } + } } protected Byte[] _inversedata; @@ -152,9 +198,15 @@ namespace Tango.BL.Entities set { - _inversedata = value; RaisePropertyChanged(nameof(InverseData)); - } + if (_inversedata != value) + { + _inversedata = value; + + InverseDataChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(InverseData)); + } + } } protected Double _version; @@ -174,9 +226,15 @@ namespace Tango.BL.Entities set { - _version = value; RaisePropertyChanged(nameof(Version)); - } + if (_version != value) + { + _version = value; + VersionChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Version)); + } + } } protected String _rmlguid; @@ -197,9 +255,12 @@ namespace Tango.BL.Entities set { - _rmlguid = value; RaisePropertyChanged(nameof(RmlGuid)); + if (_rmlguid != value) + { + _rmlguid = value; + RaisePropertyChanged(nameof(RmlGuid)); + } } - } protected Rml _rml; @@ -219,9 +280,15 @@ namespace Tango.BL.Entities set { - _rml = value; RaisePropertyChanged(nameof(Rml)); - } + if (_rml != value) + { + _rml = value; + RmlChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Rml)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalog.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalog.cs index 79f1e5d47..6d14b77e0 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalog.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalog.cs @@ -25,6 +25,52 @@ namespace Tango.BL.Entities public partial class ColorCatalog : ObservableEntity<ColorCatalog> { + public event EventHandler<Int32> ColorCodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> ColorGroupChanged; + + public event EventHandler<Double> CyanChanged; + + public event EventHandler<Double> MagentaChanged; + + public event EventHandler<Double> YellowChanged; + + public event EventHandler<Double> BlackChanged; + + public event EventHandler<Int32> RedChanged; + + public event EventHandler<Int32> GreenChanged; + + public event EventHandler<Int32> BlueChanged; + + public event EventHandler<Double> LChanged; + + public event EventHandler<Double> AChanged; + + public event EventHandler<Double> BChanged; + + public event EventHandler<Double> V0Changed; + + public event EventHandler<Double> V1Changed; + + public event EventHandler<Double> V2Changed; + + public event EventHandler<Double> V3Changed; + + public event EventHandler<Double> V4Changed; + + public event EventHandler<Double> V5Changed; + + public event EventHandler<Double> V6Changed; + + public event EventHandler<Double> V7Changed; + + public event EventHandler<SynchronizedObservableCollection<BrushStop>> BrushStopsChanged; + + public event EventHandler<ColorSpace> ColorSpaceChanged; + protected String _colorspaceguid; /// <summary> @@ -43,9 +89,12 @@ namespace Tango.BL.Entities set { - _colorspaceguid = value; RaisePropertyChanged(nameof(ColorSpaceGuid)); + if (_colorspaceguid != value) + { + _colorspaceguid = value; + RaisePropertyChanged(nameof(ColorSpaceGuid)); + } } - } protected Int32 _colorcode; @@ -65,9 +114,15 @@ namespace Tango.BL.Entities set { - _colorcode = value; RaisePropertyChanged(nameof(ColorCode)); - } + if (_colorcode != value) + { + _colorcode = value; + + ColorCodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(ColorCode)); + } + } } protected String _name; @@ -87,9 +142,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected String _colorgroup; @@ -109,9 +170,15 @@ namespace Tango.BL.Entities set { - _colorgroup = value; RaisePropertyChanged(nameof(ColorGroup)); - } + if (_colorgroup != value) + { + _colorgroup = value; + + ColorGroupChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(ColorGroup)); + } + } } protected Double _cyan; @@ -131,9 +198,15 @@ namespace Tango.BL.Entities set { - _cyan = value; RaisePropertyChanged(nameof(Cyan)); - } + if (_cyan != value) + { + _cyan = value; + + CyanChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Cyan)); + } + } } protected Double _magenta; @@ -153,9 +226,15 @@ namespace Tango.BL.Entities set { - _magenta = value; RaisePropertyChanged(nameof(Magenta)); - } + if (_magenta != value) + { + _magenta = value; + + MagentaChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Magenta)); + } + } } protected Double _yellow; @@ -175,9 +254,15 @@ namespace Tango.BL.Entities set { - _yellow = value; RaisePropertyChanged(nameof(Yellow)); - } + if (_yellow != value) + { + _yellow = value; + + YellowChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Yellow)); + } + } } protected Double _black; @@ -197,9 +282,15 @@ namespace Tango.BL.Entities set { - _black = value; RaisePropertyChanged(nameof(Black)); - } + if (_black != value) + { + _black = value; + + BlackChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Black)); + } + } } protected Int32 _red; @@ -219,9 +310,15 @@ namespace Tango.BL.Entities set { - _red = value; RaisePropertyChanged(nameof(Red)); - } + if (_red != value) + { + _red = value; + + RedChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Red)); + } + } } protected Int32 _green; @@ -241,9 +338,15 @@ namespace Tango.BL.Entities set { - _green = value; RaisePropertyChanged(nameof(Green)); - } + if (_green != value) + { + _green = value; + + GreenChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Green)); + } + } } protected Int32 _blue; @@ -263,9 +366,15 @@ namespace Tango.BL.Entities set { - _blue = value; RaisePropertyChanged(nameof(Blue)); - } + if (_blue != value) + { + _blue = value; + + BlueChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Blue)); + } + } } protected Double _l; @@ -285,9 +394,15 @@ namespace Tango.BL.Entities set { - _l = value; RaisePropertyChanged(nameof(L)); - } + if (_l != value) + { + _l = value; + + LChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(L)); + } + } } protected Double _a; @@ -307,9 +422,15 @@ namespace Tango.BL.Entities set { - _a = value; RaisePropertyChanged(nameof(A)); - } + if (_a != value) + { + _a = value; + + AChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(A)); + } + } } protected Double _b; @@ -329,9 +450,15 @@ namespace Tango.BL.Entities set { - _b = value; RaisePropertyChanged(nameof(B)); - } + if (_b != value) + { + _b = value; + + BChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(B)); + } + } } protected Double _v0; @@ -351,9 +478,15 @@ namespace Tango.BL.Entities set { - _v0 = value; RaisePropertyChanged(nameof(V0)); - } + if (_v0 != value) + { + _v0 = value; + + V0Changed?.Invoke(this, value); + RaisePropertyChanged(nameof(V0)); + } + } } protected Double _v1; @@ -373,9 +506,15 @@ namespace Tango.BL.Entities set { - _v1 = value; RaisePropertyChanged(nameof(V1)); - } + if (_v1 != value) + { + _v1 = value; + + V1Changed?.Invoke(this, value); + RaisePropertyChanged(nameof(V1)); + } + } } protected Double _v2; @@ -395,9 +534,15 @@ namespace Tango.BL.Entities set { - _v2 = value; RaisePropertyChanged(nameof(V2)); - } + if (_v2 != value) + { + _v2 = value; + V2Changed?.Invoke(this, value); + + RaisePropertyChanged(nameof(V2)); + } + } } protected Double _v3; @@ -417,9 +562,15 @@ namespace Tango.BL.Entities set { - _v3 = value; RaisePropertyChanged(nameof(V3)); - } + if (_v3 != value) + { + _v3 = value; + V3Changed?.Invoke(this, value); + + RaisePropertyChanged(nameof(V3)); + } + } } protected Double _v4; @@ -439,9 +590,15 @@ namespace Tango.BL.Entities set { - _v4 = value; RaisePropertyChanged(nameof(V4)); - } + if (_v4 != value) + { + _v4 = value; + V4Changed?.Invoke(this, value); + + RaisePropertyChanged(nameof(V4)); + } + } } protected Double _v5; @@ -461,9 +618,15 @@ namespace Tango.BL.Entities set { - _v5 = value; RaisePropertyChanged(nameof(V5)); - } + if (_v5 != value) + { + _v5 = value; + V5Changed?.Invoke(this, value); + + RaisePropertyChanged(nameof(V5)); + } + } } protected Double _v6; @@ -483,9 +646,15 @@ namespace Tango.BL.Entities set { - _v6 = value; RaisePropertyChanged(nameof(V6)); - } + if (_v6 != value) + { + _v6 = value; + V6Changed?.Invoke(this, value); + + RaisePropertyChanged(nameof(V6)); + } + } } protected Double _v7; @@ -505,9 +674,15 @@ namespace Tango.BL.Entities set { - _v7 = value; RaisePropertyChanged(nameof(V7)); - } + if (_v7 != value) + { + _v7 = value; + V7Changed?.Invoke(this, value); + + RaisePropertyChanged(nameof(V7)); + } + } } protected SynchronizedObservableCollection<BrushStop> _brushstops; @@ -525,9 +700,15 @@ namespace Tango.BL.Entities set { - _brushstops = value; RaisePropertyChanged(nameof(BrushStops)); - } + if (_brushstops != value) + { + _brushstops = value; + BrushStopsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(BrushStops)); + } + } } protected ColorSpace _colorspace; @@ -547,9 +728,15 @@ namespace Tango.BL.Entities set { - _colorspace = value; RaisePropertyChanged(nameof(ColorSpace)); - } + if (_colorspace != value) + { + _colorspace = value; + ColorSpaceChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(ColorSpace)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorSpace.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorSpace.cs index 32b93c545..c11c0531d 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ColorSpace.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ColorSpace.cs @@ -25,6 +25,20 @@ namespace Tango.BL.Entities public partial class ColorSpace : ObservableEntity<ColorSpace> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<SynchronizedObservableCollection<BrushStop>> BrushStopsChanged; + + public event EventHandler<SynchronizedObservableCollection<ColorCatalog>> ColorCatalogsChanged; + + public event EventHandler<SynchronizedObservableCollection<Job>> JobsChanged; + + public event EventHandler<SynchronizedObservableCollection<Machine>> MachinesChanged; + protected Int32 _code; /// <summary> @@ -42,9 +56,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +84,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + NameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Name)); + } + } } protected String _description; @@ -86,9 +112,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + DescriptionChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Description)); + } + } } protected SynchronizedObservableCollection<BrushStop> _brushstops; @@ -106,9 +138,15 @@ namespace Tango.BL.Entities set { - _brushstops = value; RaisePropertyChanged(nameof(BrushStops)); - } + if (_brushstops != value) + { + _brushstops = value; + + BrushStopsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(BrushStops)); + } + } } protected SynchronizedObservableCollection<ColorCatalog> _colorcatalogs; @@ -126,9 +164,15 @@ namespace Tango.BL.Entities set { - _colorcatalogs = value; RaisePropertyChanged(nameof(ColorCatalogs)); - } + if (_colorcatalogs != value) + { + _colorcatalogs = value; + + ColorCatalogsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(ColorCatalogs)); + } + } } protected SynchronizedObservableCollection<Job> _jobs; @@ -146,9 +190,15 @@ namespace Tango.BL.Entities set { - _jobs = value; RaisePropertyChanged(nameof(Jobs)); - } + if (_jobs != value) + { + _jobs = value; + JobsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Jobs)); + } + } } protected SynchronizedObservableCollection<Machine> _machines; @@ -166,9 +216,15 @@ namespace Tango.BL.Entities set { - _machines = value; RaisePropertyChanged(nameof(Machines)); - } + if (_machines != value) + { + _machines = value; + + MachinesChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Machines)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/Configuration.cs b/Software/Visual_Studio/Tango.BL/Entities/Configuration.cs index db618a910..73d9a09be 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Configuration.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Configuration.cs @@ -25,6 +25,28 @@ namespace Tango.BL.Entities public partial class Configuration : ObservableEntity<Configuration> { + public event EventHandler<String> NameChanged; + + public event EventHandler<DateTime> CreationDateChanged; + + public event EventHandler<ApplicationDisplayPanelVersion> ApplicationDisplayPanelVersionChanged; + + public event EventHandler<ApplicationFirmwareVersion> ApplicationFirmwareVersionChanged; + + public event EventHandler<ApplicationOsVersion> ApplicationOsVersionChanged; + + public event EventHandler<EmbeddedFirmwareVersion> EmbeddedFirmwareVersionChanged; + + public event EventHandler<HardwareVersion> HardwareVersionChanged; + + public event EventHandler<SynchronizedObservableCollection<IdsPack>> IdsPacksChanged; + + public event EventHandler<SynchronizedObservableCollection<MachineVersion>> MachineVersionsChanged; + + public event EventHandler<SynchronizedObservableCollection<Machine>> MachinesChanged; + + public event EventHandler<SynchronizedObservableCollection<MachinesConfiguration>> MachinesConfigurationsChanged; + protected String _name; /// <summary> @@ -42,9 +64,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected DateTime _creationdate; @@ -64,9 +92,15 @@ namespace Tango.BL.Entities set { - _creationdate = value; RaisePropertyChanged(nameof(CreationDate)); - } + if (_creationdate != value) + { + _creationdate = value; + + CreationDateChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(CreationDate)); + } + } } protected String _applicationosversionguid; @@ -87,9 +121,12 @@ namespace Tango.BL.Entities set { - _applicationosversionguid = value; RaisePropertyChanged(nameof(ApplicationOsVersionGuid)); + if (_applicationosversionguid != value) + { + _applicationosversionguid = value; + RaisePropertyChanged(nameof(ApplicationOsVersionGuid)); + } } - } protected String _applicationfirmwareversionguid; @@ -110,9 +147,12 @@ namespace Tango.BL.Entities set { - _applicationfirmwareversionguid = value; RaisePropertyChanged(nameof(ApplicationFirmwareVersionGuid)); + if (_applicationfirmwareversionguid != value) + { + _applicationfirmwareversionguid = value; + RaisePropertyChanged(nameof(ApplicationFirmwareVersionGuid)); + } } - } protected String _applicationdisplaypanelversionguid; @@ -133,9 +173,12 @@ namespace Tango.BL.Entities set { - _applicationdisplaypanelversionguid = value; RaisePropertyChanged(nameof(ApplicationDisplayPanelVersionGuid)); + if (_applicationdisplaypanelversionguid != value) + { + _applicationdisplaypanelversionguid = value; + RaisePropertyChanged(nameof(ApplicationDisplayPanelVersionGuid)); + } } - } protected String _embeddedfirmwareversionguid; @@ -156,9 +199,12 @@ namespace Tango.BL.Entities set { - _embeddedfirmwareversionguid = value; RaisePropertyChanged(nameof(EmbeddedFirmwareVersionGuid)); + if (_embeddedfirmwareversionguid != value) + { + _embeddedfirmwareversionguid = value; + RaisePropertyChanged(nameof(EmbeddedFirmwareVersionGuid)); + } } - } protected String _hardwareversionguid; @@ -179,9 +225,12 @@ namespace Tango.BL.Entities set { - _hardwareversionguid = value; RaisePropertyChanged(nameof(HardwareVersionGuid)); + if (_hardwareversionguid != value) + { + _hardwareversionguid = value; + RaisePropertyChanged(nameof(HardwareVersionGuid)); + } } - } protected ApplicationDisplayPanelVersion _applicationdisplaypanelversion; @@ -201,9 +250,15 @@ namespace Tango.BL.Entities set { - _applicationdisplaypanelversion = value; RaisePropertyChanged(nameof(ApplicationDisplayPanelVersion)); - } + if (_applicationdisplaypanelversion != value) + { + _applicationdisplaypanelversion = value; + + ApplicationDisplayPanelVersionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(ApplicationDisplayPanelVersion)); + } + } } protected ApplicationFirmwareVersion _applicationfirmwareversion; @@ -223,9 +278,15 @@ namespace Tango.BL.Entities set { - _applicationfirmwareversion = value; RaisePropertyChanged(nameof(ApplicationFirmwareVersion)); - } + if (_applicationfirmwareversion != value) + { + _applicationfirmwareversion = value; + + ApplicationFirmwareVersionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(ApplicationFirmwareVersion)); + } + } } protected ApplicationOsVersion _applicationosversion; @@ -245,9 +306,15 @@ namespace Tango.BL.Entities set { - _applicationosversion = value; RaisePropertyChanged(nameof(ApplicationOsVersion)); - } + if (_applicationosversion != value) + { + _applicationosversion = value; + + ApplicationOsVersionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(ApplicationOsVersion)); + } + } } protected EmbeddedFirmwareVersion _embeddedfirmwareversion; @@ -267,9 +334,15 @@ namespace Tango.BL.Entities set { - _embeddedfirmwareversion = value; RaisePropertyChanged(nameof(EmbeddedFirmwareVersion)); - } + if (_embeddedfirmwareversion != value) + { + _embeddedfirmwareversion = value; + + EmbeddedFirmwareVersionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(EmbeddedFirmwareVersion)); + } + } } protected HardwareVersion _hardwareversion; @@ -289,9 +362,15 @@ namespace Tango.BL.Entities set { - _hardwareversion = value; RaisePropertyChanged(nameof(HardwareVersion)); - } + if (_hardwareversion != value) + { + _hardwareversion = value; + + HardwareVersionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(HardwareVersion)); + } + } } protected SynchronizedObservableCollection<IdsPack> _idspacks; @@ -309,9 +388,15 @@ namespace Tango.BL.Entities set { - _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); - } + if (_idspacks != value) + { + _idspacks = value; + + IdsPacksChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(IdsPacks)); + } + } } protected SynchronizedObservableCollection<MachineVersion> _machineversions; @@ -329,9 +414,15 @@ namespace Tango.BL.Entities set { - _machineversions = value; RaisePropertyChanged(nameof(MachineVersions)); - } + if (_machineversions != value) + { + _machineversions = value; + + MachineVersionsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(MachineVersions)); + } + } } protected SynchronizedObservableCollection<Machine> _machines; @@ -349,9 +440,15 @@ namespace Tango.BL.Entities set { - _machines = value; RaisePropertyChanged(nameof(Machines)); - } + if (_machines != value) + { + _machines = value; + + MachinesChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Machines)); + } + } } protected SynchronizedObservableCollection<MachinesConfiguration> _machinesconfigurations; @@ -369,9 +466,15 @@ namespace Tango.BL.Entities set { - _machinesconfigurations = value; RaisePropertyChanged(nameof(MachinesConfigurations)); - } + if (_machinesconfigurations != value) + { + _machinesconfigurations = value; + + MachinesConfigurationsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(MachinesConfigurations)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/Contact.cs b/Software/Visual_Studio/Tango.BL/Entities/Contact.cs index a9596c571..5fcf5510d 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Contact.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Contact.cs @@ -25,6 +25,24 @@ namespace Tango.BL.Entities public partial class Contact : ObservableEntity<Contact> { + public event EventHandler<Boolean> DeletedChanged; + + public event EventHandler<String> FirstNameChanged; + + public event EventHandler<String> LastNameChanged; + + public event EventHandler<String> FullNameChanged; + + public event EventHandler<String> EmailChanged; + + public event EventHandler<String> PhoneNumberChanged; + + public event EventHandler<String> FaxChanged; + + public event EventHandler<SynchronizedObservableCollection<Organization>> OrganizationsChanged; + + public event EventHandler<SynchronizedObservableCollection<User>> UsersChanged; + protected Boolean _deleted; /// <summary> @@ -42,9 +60,15 @@ namespace Tango.BL.Entities set { - _deleted = value; RaisePropertyChanged(nameof(Deleted)); - } + if (_deleted != value) + { + _deleted = value; + + DeletedChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Deleted)); + } + } } protected String _firstname; @@ -64,9 +88,15 @@ namespace Tango.BL.Entities set { - _firstname = value; RaisePropertyChanged(nameof(FirstName)); - } + if (_firstname != value) + { + _firstname = value; + + FirstNameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(FirstName)); + } + } } protected String _lastname; @@ -86,9 +116,15 @@ namespace Tango.BL.Entities set { - _lastname = value; RaisePropertyChanged(nameof(LastName)); - } + if (_lastname != value) + { + _lastname = value; + LastNameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(LastName)); + } + } } protected String _fullname; @@ -108,9 +144,15 @@ namespace Tango.BL.Entities set { - _fullname = value; RaisePropertyChanged(nameof(FullName)); - } + if (_fullname != value) + { + _fullname = value; + + FullNameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(FullName)); + } + } } protected String _email; @@ -130,9 +172,15 @@ namespace Tango.BL.Entities set { - _email = value; RaisePropertyChanged(nameof(Email)); - } + if (_email != value) + { + _email = value; + + EmailChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Email)); + } + } } protected String _phonenumber; @@ -152,9 +200,15 @@ namespace Tango.BL.Entities set { - _phonenumber = value; RaisePropertyChanged(nameof(PhoneNumber)); - } + if (_phonenumber != value) + { + _phonenumber = value; + PhoneNumberChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(PhoneNumber)); + } + } } protected String _fax; @@ -174,9 +228,15 @@ namespace Tango.BL.Entities set { - _fax = value; RaisePropertyChanged(nameof(Fax)); - } + if (_fax != value) + { + _fax = value; + + FaxChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Fax)); + } + } } protected SynchronizedObservableCollection<Organization> _organizations; @@ -194,9 +254,15 @@ namespace Tango.BL.Entities set { - _organizations = value; RaisePropertyChanged(nameof(Organizations)); - } + if (_organizations != value) + { + _organizations = value; + + OrganizationsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Organizations)); + } + } } protected SynchronizedObservableCollection<User> _users; @@ -214,9 +280,15 @@ namespace Tango.BL.Entities set { - _users = value; RaisePropertyChanged(nameof(Users)); - } + if (_users != value) + { + _users = value; + UsersChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Users)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/Customer.cs b/Software/Visual_Studio/Tango.BL/Entities/Customer.cs index c2a368a2d..9b356dfc2 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Customer.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Customer.cs @@ -25,6 +25,12 @@ namespace Tango.BL.Entities public partial class Customer : ObservableEntity<Customer> { + public event EventHandler<String> NameChanged; + + public event EventHandler<Organization> OrganizationChanged; + + public event EventHandler<SynchronizedObservableCollection<Job>> JobsChanged; + protected String _organizationguid; /// <summary> @@ -43,9 +49,12 @@ namespace Tango.BL.Entities set { - _organizationguid = value; RaisePropertyChanged(nameof(OrganizationGuid)); + if (_organizationguid != value) + { + _organizationguid = value; + RaisePropertyChanged(nameof(OrganizationGuid)); + } } - } protected String _name; @@ -65,9 +74,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected Organization _organization; @@ -87,9 +102,15 @@ namespace Tango.BL.Entities set { - _organization = value; RaisePropertyChanged(nameof(Organization)); - } + if (_organization != value) + { + _organization = value; + + OrganizationChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Organization)); + } + } } protected SynchronizedObservableCollection<Job> _jobs; @@ -107,9 +128,15 @@ namespace Tango.BL.Entities set { - _jobs = value; RaisePropertyChanged(nameof(Jobs)); - } + if (_jobs != value) + { + _jobs = value; + + JobsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Jobs)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/DispenserType.cs b/Software/Visual_Studio/Tango.BL/Entities/DispenserType.cs index 671f92a68..5956456a4 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/DispenserType.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/DispenserType.cs @@ -25,6 +25,16 @@ namespace Tango.BL.Entities public partial class DispenserType : ObservableEntity<DispenserType> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<Double> NlPerPulseChanged; + + public event EventHandler<Double> CapacityChanged; + + public event EventHandler<SynchronizedObservableCollection<IdsPack>> IdsPacksChanged; + protected Int32 _code; /// <summary> @@ -42,9 +52,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +80,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected Double _nlperpulse; @@ -86,9 +108,15 @@ namespace Tango.BL.Entities set { - _nlperpulse = value; RaisePropertyChanged(nameof(NlPerPulse)); - } + if (_nlperpulse != value) + { + _nlperpulse = value; + + NlPerPulseChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(NlPerPulse)); + } + } } protected Double _capacity; @@ -108,9 +136,15 @@ namespace Tango.BL.Entities set { - _capacity = value; RaisePropertyChanged(nameof(Capacity)); - } + if (_capacity != value) + { + _capacity = value; + CapacityChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Capacity)); + } + } } protected SynchronizedObservableCollection<IdsPack> _idspacks; @@ -128,9 +162,15 @@ namespace Tango.BL.Entities set { - _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); - } + if (_idspacks != value) + { + _idspacks = value; + IdsPacksChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(IdsPacks)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/EmbeddedFirmwareVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/EmbeddedFirmwareVersion.cs index c1c1018d4..585a5a2d1 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/EmbeddedFirmwareVersion.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/EmbeddedFirmwareVersion.cs @@ -25,6 +25,12 @@ namespace Tango.BL.Entities public partial class EmbeddedFirmwareVersion : ObservableEntity<EmbeddedFirmwareVersion> { + public event EventHandler<Double> VersionChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<SynchronizedObservableCollection<Configuration>> ConfigurationsChanged; + protected Double _version; /// <summary> @@ -42,9 +48,15 @@ namespace Tango.BL.Entities set { - _version = value; RaisePropertyChanged(nameof(Version)); - } + if (_version != value) + { + _version = value; + + VersionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Version)); + } + } } protected String _name; @@ -64,9 +76,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected SynchronizedObservableCollection<Configuration> _configurations; @@ -84,9 +102,15 @@ namespace Tango.BL.Entities set { - _configurations = value; RaisePropertyChanged(nameof(Configurations)); - } + if (_configurations != value) + { + _configurations = value; + + ConfigurationsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Configurations)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventType.cs b/Software/Visual_Studio/Tango.BL/Entities/EventType.cs index bc752c38d..8f4ec9014 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/EventType.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/EventType.cs @@ -25,6 +25,26 @@ namespace Tango.BL.Entities public partial class EventType : ObservableEntity<EventType> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<Boolean> RequiresUserInterventionChanged; + + public event EventHandler<Boolean> ResolvableChanged; + + public event EventHandler<EventTypesGroup> EventTypesGroupChanged; + + public event EventHandler<EventTypesCategory> EventTypesCategoryChanged; + + public event EventHandler<HtmlPage> HtmlPageChanged; + + public event EventHandler<SynchronizedObservableCollection<EventTypesAction>> EventTypesActionsChanged; + + public event EventHandler<SynchronizedObservableCollection<MachinesEvent>> MachinesEventsChanged; + protected Int32 _code; /// <summary> @@ -42,9 +62,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + CodeChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +90,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + NameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Name)); + } + } } protected String _description; @@ -86,9 +118,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + DescriptionChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Description)); + } + } } protected String _eventtypescategoryguid; @@ -109,9 +147,12 @@ namespace Tango.BL.Entities set { - _eventtypescategoryguid = value; RaisePropertyChanged(nameof(EventTypesCategoryGuid)); + if (_eventtypescategoryguid != value) + { + _eventtypescategoryguid = value; + RaisePropertyChanged(nameof(EventTypesCategoryGuid)); + } } - } protected String _eventtypesgroupguid; @@ -132,9 +173,12 @@ namespace Tango.BL.Entities set { - _eventtypesgroupguid = value; RaisePropertyChanged(nameof(EventTypesGroupGuid)); + if (_eventtypesgroupguid != value) + { + _eventtypesgroupguid = value; + RaisePropertyChanged(nameof(EventTypesGroupGuid)); + } } - } protected Boolean _requiresuserintervention; @@ -154,9 +198,15 @@ namespace Tango.BL.Entities set { - _requiresuserintervention = value; RaisePropertyChanged(nameof(RequiresUserIntervention)); - } + if (_requiresuserintervention != value) + { + _requiresuserintervention = value; + RequiresUserInterventionChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(RequiresUserIntervention)); + } + } } protected String _htmlpageguid; @@ -177,9 +227,12 @@ namespace Tango.BL.Entities set { - _htmlpageguid = value; RaisePropertyChanged(nameof(HtmlPageGuid)); + if (_htmlpageguid != value) + { + _htmlpageguid = value; + RaisePropertyChanged(nameof(HtmlPageGuid)); + } } - } protected Boolean _resolvable; @@ -199,9 +252,15 @@ namespace Tango.BL.Entities set { - _resolvable = value; RaisePropertyChanged(nameof(Resolvable)); - } + if (_resolvable != value) + { + _resolvable = value; + + ResolvableChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Resolvable)); + } + } } protected EventTypesGroup _eventtypesgroup; @@ -221,9 +280,15 @@ namespace Tango.BL.Entities set { - _eventtypesgroup = value; RaisePropertyChanged(nameof(EventTypesGroup)); - } + if (_eventtypesgroup != value) + { + _eventtypesgroup = value; + + EventTypesGroupChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(EventTypesGroup)); + } + } } protected EventTypesCategory _eventtypescategory; @@ -243,9 +308,15 @@ namespace Tango.BL.Entities set { - _eventtypescategory = value; RaisePropertyChanged(nameof(EventTypesCategory)); - } + if (_eventtypescategory != value) + { + _eventtypescategory = value; + + EventTypesCategoryChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(EventTypesCategory)); + } + } } protected HtmlPage _htmlpage; @@ -265,9 +336,15 @@ namespace Tango.BL.Entities set { - _htmlpage = value; RaisePropertyChanged(nameof(HtmlPage)); - } + if (_htmlpage != value) + { + _htmlpage = value; + + HtmlPageChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(HtmlPage)); + } + } } protected SynchronizedObservableCollection<EventTypesAction> _eventtypesactions; @@ -285,9 +362,15 @@ namespace Tango.BL.Entities set { - _eventtypesactions = value; RaisePropertyChanged(nameof(EventTypesActions)); - } + if (_eventtypesactions != value) + { + _eventtypesactions = value; + EventTypesActionsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(EventTypesActions)); + } + } } protected SynchronizedObservableCollection<MachinesEvent> _machinesevents; @@ -305,9 +388,15 @@ namespace Tango.BL.Entities set { - _machinesevents = value; RaisePropertyChanged(nameof(MachinesEvents)); - } + if (_machinesevents != value) + { + _machinesevents = value; + MachinesEventsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(MachinesEvents)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypesAction.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypesAction.cs index 0c1cbf059..c1b667cbe 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/EventTypesAction.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/EventTypesAction.cs @@ -25,6 +25,10 @@ namespace Tango.BL.Entities public partial class EventTypesAction : ObservableEntity<EventTypesAction> { + public event EventHandler<ActionType> ActionTypeChanged; + + public event EventHandler<EventType> EventTypeChanged; + protected String _eventtypeguid; /// <summary> @@ -43,9 +47,12 @@ namespace Tango.BL.Entities set { - _eventtypeguid = value; RaisePropertyChanged(nameof(EventTypeGuid)); + if (_eventtypeguid != value) + { + _eventtypeguid = value; + RaisePropertyChanged(nameof(EventTypeGuid)); + } } - } protected String _actiontypeguid; @@ -66,9 +73,12 @@ namespace Tango.BL.Entities set { - _actiontypeguid = value; RaisePropertyChanged(nameof(ActionTypeGuid)); + if (_actiontypeguid != value) + { + _actiontypeguid = value; + RaisePropertyChanged(nameof(ActionTypeGuid)); + } } - } protected ActionType _actiontype; @@ -88,9 +98,15 @@ namespace Tango.BL.Entities set { - _actiontype = value; RaisePropertyChanged(nameof(ActionType)); - } + if (_actiontype != value) + { + _actiontype = value; + ActionTypeChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(ActionType)); + } + } } protected EventType _eventtype; @@ -110,9 +126,15 @@ namespace Tango.BL.Entities set { - _eventtype = value; RaisePropertyChanged(nameof(EventType)); - } + if (_eventtype != value) + { + _eventtype = value; + EventTypeChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(EventType)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypesCategory.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypesCategory.cs index 9a368cfcd..f0a25335a 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/EventTypesCategory.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/EventTypesCategory.cs @@ -25,6 +25,14 @@ namespace Tango.BL.Entities public partial class EventTypesCategory : ObservableEntity<EventTypesCategory> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<SynchronizedObservableCollection<EventType>> EventTypesChanged; + protected Int32 _code; /// <summary> @@ -42,9 +50,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +78,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + NameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Name)); + } + } } protected String _description; @@ -86,9 +106,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + + DescriptionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Description)); + } + } } protected SynchronizedObservableCollection<EventType> _eventtypes; @@ -106,9 +132,15 @@ namespace Tango.BL.Entities set { - _eventtypes = value; RaisePropertyChanged(nameof(EventTypes)); - } + if (_eventtypes != value) + { + _eventtypes = value; + EventTypesChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(EventTypes)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypesGroup.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypesGroup.cs index 35d3d197c..36389e65b 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/EventTypesGroup.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/EventTypesGroup.cs @@ -25,6 +25,14 @@ namespace Tango.BL.Entities public partial class EventTypesGroup : ObservableEntity<EventTypesGroup> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<SynchronizedObservableCollection<EventType>> EventTypesChanged; + protected Int32 _code; /// <summary> @@ -42,9 +50,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +78,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + NameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Name)); + } + } } protected String _description; @@ -86,9 +106,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + + DescriptionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Description)); + } + } } protected SynchronizedObservableCollection<EventType> _eventtypes; @@ -106,9 +132,15 @@ namespace Tango.BL.Entities set { - _eventtypes = value; RaisePropertyChanged(nameof(EventTypes)); - } + if (_eventtypes != value) + { + _eventtypes = value; + EventTypesChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(EventTypes)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/FiberShape.cs b/Software/Visual_Studio/Tango.BL/Entities/FiberShape.cs index ff82a810b..05fbb4dbf 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/FiberShape.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/FiberShape.cs @@ -25,6 +25,12 @@ namespace Tango.BL.Entities public partial class FiberShape : ObservableEntity<FiberShape> { + public event EventHandler<String> NameChanged; + + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<SynchronizedObservableCollection<Rml>> RmlsChanged; + protected String _name; /// <summary> @@ -42,9 +48,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected Int32 _code; @@ -64,9 +76,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected SynchronizedObservableCollection<Rml> _rmls; @@ -84,9 +102,15 @@ namespace Tango.BL.Entities set { - _rmls = value; RaisePropertyChanged(nameof(Rmls)); - } + if (_rmls != value) + { + _rmls = value; + + RmlsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Rmls)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/FiberSynth.cs b/Software/Visual_Studio/Tango.BL/Entities/FiberSynth.cs index 3a7b1c8ed..0a2964380 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/FiberSynth.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/FiberSynth.cs @@ -25,6 +25,12 @@ namespace Tango.BL.Entities public partial class FiberSynth : ObservableEntity<FiberSynth> { + public event EventHandler<String> NameChanged; + + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<SynchronizedObservableCollection<Rml>> RmlsChanged; + protected String _name; /// <summary> @@ -42,9 +48,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected Int32 _code; @@ -64,9 +76,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected SynchronizedObservableCollection<Rml> _rmls; @@ -84,9 +102,15 @@ namespace Tango.BL.Entities set { - _rmls = value; RaisePropertyChanged(nameof(Rmls)); - } + if (_rmls != value) + { + _rmls = value; + + RmlsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Rmls)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlower.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlower.cs index a6637d902..cccad67f9 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlower.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlower.cs @@ -25,6 +25,16 @@ namespace Tango.BL.Entities public partial class HardwareBlower : ObservableEntity<HardwareBlower> { + public event EventHandler<Boolean> EnabledChanged; + + public event EventHandler<Double> VoltageChanged; + + public event EventHandler<Boolean> ActiveChanged; + + public event EventHandler<HardwareBlowerType> HardwareBlowerTypeChanged; + + public event EventHandler<HardwareVersion> HardwareVersionChanged; + protected String _hardwareblowertypeguid; /// <summary> @@ -43,9 +53,12 @@ namespace Tango.BL.Entities set { - _hardwareblowertypeguid = value; RaisePropertyChanged(nameof(HardwareBlowerTypeGuid)); + if (_hardwareblowertypeguid != value) + { + _hardwareblowertypeguid = value; + RaisePropertyChanged(nameof(HardwareBlowerTypeGuid)); + } } - } protected String _hardwareversionguid; @@ -66,9 +79,12 @@ namespace Tango.BL.Entities set { - _hardwareversionguid = value; RaisePropertyChanged(nameof(HardwareVersionGuid)); + if (_hardwareversionguid != value) + { + _hardwareversionguid = value; + RaisePropertyChanged(nameof(HardwareVersionGuid)); + } } - } protected Boolean _enabled; @@ -88,9 +104,15 @@ namespace Tango.BL.Entities set { - _enabled = value; RaisePropertyChanged(nameof(Enabled)); - } + if (_enabled != value) + { + _enabled = value; + + EnabledChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Enabled)); + } + } } protected Double _voltage; @@ -110,9 +132,15 @@ namespace Tango.BL.Entities set { - _voltage = value; RaisePropertyChanged(nameof(Voltage)); - } + if (_voltage != value) + { + _voltage = value; + VoltageChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Voltage)); + } + } } protected Boolean _active; @@ -132,9 +160,15 @@ namespace Tango.BL.Entities set { - _active = value; RaisePropertyChanged(nameof(Active)); - } + if (_active != value) + { + _active = value; + ActiveChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Active)); + } + } } protected HardwareBlowerType _hardwareblowertype; @@ -154,9 +188,15 @@ namespace Tango.BL.Entities set { - _hardwareblowertype = value; RaisePropertyChanged(nameof(HardwareBlowerType)); - } + if (_hardwareblowertype != value) + { + _hardwareblowertype = value; + HardwareBlowerTypeChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HardwareBlowerType)); + } + } } protected HardwareVersion _hardwareversion; @@ -176,9 +216,15 @@ namespace Tango.BL.Entities set { - _hardwareversion = value; RaisePropertyChanged(nameof(HardwareVersion)); - } + if (_hardwareversion != value) + { + _hardwareversion = value; + HardwareVersionChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HardwareVersion)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerType.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerType.cs index 6fa469da0..c1aaa114a 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerType.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerType.cs @@ -25,6 +25,14 @@ namespace Tango.BL.Entities public partial class HardwareBlowerType : ObservableEntity<HardwareBlowerType> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<SynchronizedObservableCollection<HardwareBlower>> HardwareBlowersChanged; + protected Int32 _code; /// <summary> @@ -42,9 +50,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +78,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + NameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Name)); + } + } } protected String _description; @@ -86,9 +106,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + + DescriptionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Description)); + } + } } protected SynchronizedObservableCollection<HardwareBlower> _hardwareblowers; @@ -106,9 +132,15 @@ namespace Tango.BL.Entities set { - _hardwareblowers = value; RaisePropertyChanged(nameof(HardwareBlowers)); - } + if (_hardwareblowers != value) + { + _hardwareblowers = value; + HardwareBlowersChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HardwareBlowers)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensor.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensor.cs index 133db0b21..9d08ac8b9 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensor.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensor.cs @@ -25,6 +25,16 @@ namespace Tango.BL.Entities public partial class HardwareBreakSensor : ObservableEntity<HardwareBreakSensor> { + public event EventHandler<Boolean> EnabledChanged; + + public event EventHandler<Int32> DeBounceTimeMilliChanged; + + public event EventHandler<Boolean> ActiveChanged; + + public event EventHandler<HardwareBreakSensorType> HardwareBreakSensorTypeChanged; + + public event EventHandler<HardwareVersion> HardwareVersionChanged; + protected String _hardwarebreaksensortypeguid; /// <summary> @@ -43,9 +53,12 @@ namespace Tango.BL.Entities set { - _hardwarebreaksensortypeguid = value; RaisePropertyChanged(nameof(HardwareBreakSensorTypeGuid)); + if (_hardwarebreaksensortypeguid != value) + { + _hardwarebreaksensortypeguid = value; + RaisePropertyChanged(nameof(HardwareBreakSensorTypeGuid)); + } } - } protected String _hardwareversionguid; @@ -66,9 +79,12 @@ namespace Tango.BL.Entities set { - _hardwareversionguid = value; RaisePropertyChanged(nameof(HardwareVersionGuid)); + if (_hardwareversionguid != value) + { + _hardwareversionguid = value; + RaisePropertyChanged(nameof(HardwareVersionGuid)); + } } - } protected Boolean _enabled; @@ -88,9 +104,15 @@ namespace Tango.BL.Entities set { - _enabled = value; RaisePropertyChanged(nameof(Enabled)); - } + if (_enabled != value) + { + _enabled = value; + + EnabledChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Enabled)); + } + } } protected Int32 _debouncetimemilli; @@ -110,9 +132,15 @@ namespace Tango.BL.Entities set { - _debouncetimemilli = value; RaisePropertyChanged(nameof(DeBounceTimeMilli)); - } + if (_debouncetimemilli != value) + { + _debouncetimemilli = value; + DeBounceTimeMilliChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(DeBounceTimeMilli)); + } + } } protected Boolean _active; @@ -132,9 +160,15 @@ namespace Tango.BL.Entities set { - _active = value; RaisePropertyChanged(nameof(Active)); - } + if (_active != value) + { + _active = value; + ActiveChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Active)); + } + } } protected HardwareBreakSensorType _hardwarebreaksensortype; @@ -154,9 +188,15 @@ namespace Tango.BL.Entities set { - _hardwarebreaksensortype = value; RaisePropertyChanged(nameof(HardwareBreakSensorType)); - } + if (_hardwarebreaksensortype != value) + { + _hardwarebreaksensortype = value; + HardwareBreakSensorTypeChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HardwareBreakSensorType)); + } + } } protected HardwareVersion _hardwareversion; @@ -176,9 +216,15 @@ namespace Tango.BL.Entities set { - _hardwareversion = value; RaisePropertyChanged(nameof(HardwareVersion)); - } + if (_hardwareversion != value) + { + _hardwareversion = value; + HardwareVersionChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HardwareVersion)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorType.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorType.cs index 0a340dcf7..634cf0f6a 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorType.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorType.cs @@ -25,6 +25,14 @@ namespace Tango.BL.Entities public partial class HardwareBreakSensorType : ObservableEntity<HardwareBreakSensorType> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<SynchronizedObservableCollection<HardwareBreakSensor>> HardwareBreakSensorsChanged; + protected Int32 _code; /// <summary> @@ -42,9 +50,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +78,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + NameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Name)); + } + } } protected String _description; @@ -86,9 +106,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + + DescriptionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Description)); + } + } } protected SynchronizedObservableCollection<HardwareBreakSensor> _hardwarebreaksensors; @@ -106,9 +132,15 @@ namespace Tango.BL.Entities set { - _hardwarebreaksensors = value; RaisePropertyChanged(nameof(HardwareBreakSensors)); - } + if (_hardwarebreaksensors != value) + { + _hardwarebreaksensors = value; + HardwareBreakSensorsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HardwareBreakSensors)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancer.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancer.cs index 1e6c615e9..c5bff2270 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancer.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancer.cs @@ -25,6 +25,32 @@ namespace Tango.BL.Entities public partial class HardwareDancer : ObservableEntity<HardwareDancer> { + public event EventHandler<Boolean> GradualChanged; + + public event EventHandler<Double> KChanged; + + public event EventHandler<Double> XChanged; + + public event EventHandler<Int32> PulsePerMmSpringChanged; + + public event EventHandler<Int32> MaximalMovementMmChanged; + + public event EventHandler<Int32> ZeroPointChanged; + + public event EventHandler<Int32> ResolutionBitsChanged; + + public event EventHandler<Int32> ArmLengthChanged; + + public event EventHandler<Boolean> AssemblyDirectionRightChanged; + + public event EventHandler<Boolean> AccelerateOnTensionRaiseChanged; + + public event EventHandler<Boolean> ActiveChanged; + + public event EventHandler<HardwareDancerType> HardwareDancerTypeChanged; + + public event EventHandler<HardwareVersion> HardwareVersionChanged; + protected String _hardwaredancertypeguid; /// <summary> @@ -43,9 +69,12 @@ namespace Tango.BL.Entities set { - _hardwaredancertypeguid = value; RaisePropertyChanged(nameof(HardwareDancerTypeGuid)); + if (_hardwaredancertypeguid != value) + { + _hardwaredancertypeguid = value; + RaisePropertyChanged(nameof(HardwareDancerTypeGuid)); + } } - } protected String _hardwareversionguid; @@ -66,9 +95,12 @@ namespace Tango.BL.Entities set { - _hardwareversionguid = value; RaisePropertyChanged(nameof(HardwareVersionGuid)); + if (_hardwareversionguid != value) + { + _hardwareversionguid = value; + RaisePropertyChanged(nameof(HardwareVersionGuid)); + } } - } protected Boolean _gradual; @@ -88,9 +120,15 @@ namespace Tango.BL.Entities set { - _gradual = value; RaisePropertyChanged(nameof(Gradual)); - } + if (_gradual != value) + { + _gradual = value; + GradualChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Gradual)); + } + } } protected Double _k; @@ -110,9 +148,15 @@ namespace Tango.BL.Entities set { - _k = value; RaisePropertyChanged(nameof(K)); - } + if (_k != value) + { + _k = value; + + KChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(K)); + } + } } protected Double _x; @@ -132,9 +176,15 @@ namespace Tango.BL.Entities set { - _x = value; RaisePropertyChanged(nameof(X)); - } + if (_x != value) + { + _x = value; + + XChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(X)); + } + } } protected Int32 _pulsepermmspring; @@ -154,9 +204,15 @@ namespace Tango.BL.Entities set { - _pulsepermmspring = value; RaisePropertyChanged(nameof(PulsePerMmSpring)); - } + if (_pulsepermmspring != value) + { + _pulsepermmspring = value; + + PulsePerMmSpringChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(PulsePerMmSpring)); + } + } } protected Int32 _maximalmovementmm; @@ -176,9 +232,15 @@ namespace Tango.BL.Entities set { - _maximalmovementmm = value; RaisePropertyChanged(nameof(MaximalMovementMm)); - } + if (_maximalmovementmm != value) + { + _maximalmovementmm = value; + + MaximalMovementMmChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(MaximalMovementMm)); + } + } } protected Int32 _zeropoint; @@ -198,9 +260,15 @@ namespace Tango.BL.Entities set { - _zeropoint = value; RaisePropertyChanged(nameof(ZeroPoint)); - } + if (_zeropoint != value) + { + _zeropoint = value; + ZeroPointChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(ZeroPoint)); + } + } } protected Int32 _resolutionbits; @@ -220,9 +288,15 @@ namespace Tango.BL.Entities set { - _resolutionbits = value; RaisePropertyChanged(nameof(ResolutionBits)); - } + if (_resolutionbits != value) + { + _resolutionbits = value; + ResolutionBitsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(ResolutionBits)); + } + } } protected Int32 _armlength; @@ -242,9 +316,15 @@ namespace Tango.BL.Entities set { - _armlength = value; RaisePropertyChanged(nameof(ArmLength)); - } + if (_armlength != value) + { + _armlength = value; + + ArmLengthChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(ArmLength)); + } + } } protected Boolean _assemblydirectionright; @@ -264,9 +344,15 @@ namespace Tango.BL.Entities set { - _assemblydirectionright = value; RaisePropertyChanged(nameof(AssemblyDirectionRight)); - } + if (_assemblydirectionright != value) + { + _assemblydirectionright = value; + + AssemblyDirectionRightChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(AssemblyDirectionRight)); + } + } } protected Boolean _accelerateontensionraise; @@ -286,9 +372,15 @@ namespace Tango.BL.Entities set { - _accelerateontensionraise = value; RaisePropertyChanged(nameof(AccelerateOnTensionRaise)); - } + if (_accelerateontensionraise != value) + { + _accelerateontensionraise = value; + AccelerateOnTensionRaiseChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(AccelerateOnTensionRaise)); + } + } } protected Boolean _active; @@ -308,9 +400,15 @@ namespace Tango.BL.Entities set { - _active = value; RaisePropertyChanged(nameof(Active)); - } + if (_active != value) + { + _active = value; + + ActiveChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Active)); + } + } } protected HardwareDancerType _hardwaredancertype; @@ -330,9 +428,15 @@ namespace Tango.BL.Entities set { - _hardwaredancertype = value; RaisePropertyChanged(nameof(HardwareDancerType)); - } + if (_hardwaredancertype != value) + { + _hardwaredancertype = value; + + HardwareDancerTypeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(HardwareDancerType)); + } + } } protected HardwareVersion _hardwareversion; @@ -352,9 +456,15 @@ namespace Tango.BL.Entities set { - _hardwareversion = value; RaisePropertyChanged(nameof(HardwareVersion)); - } + if (_hardwareversion != value) + { + _hardwareversion = value; + + HardwareVersionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(HardwareVersion)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerType.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerType.cs index 3ca346ce0..f9b6ca2f9 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerType.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerType.cs @@ -25,6 +25,14 @@ namespace Tango.BL.Entities public partial class HardwareDancerType : ObservableEntity<HardwareDancerType> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<SynchronizedObservableCollection<HardwareDancer>> HardwareDancersChanged; + protected Int32 _code; /// <summary> @@ -42,9 +50,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +78,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + NameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Name)); + } + } } protected String _description; @@ -86,9 +106,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + + DescriptionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Description)); + } + } } protected SynchronizedObservableCollection<HardwareDancer> _hardwaredancers; @@ -106,9 +132,15 @@ namespace Tango.BL.Entities set { - _hardwaredancers = value; RaisePropertyChanged(nameof(HardwareDancers)); - } + if (_hardwaredancers != value) + { + _hardwaredancers = value; + HardwareDancersChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HardwareDancers)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotor.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotor.cs index 2518cb8ea..da4a34f49 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotor.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotor.cs @@ -30,6 +30,60 @@ namespace Tango.BL.Entities public partial class HardwareMotor : ObservableEntity<HardwareMotor> { + public event EventHandler<Int32> MinFrequencyChanged; + + public event EventHandler<Int32> MaxFrequencyChanged; + + public event EventHandler<Int32> SetMicroStepChanged; + + public event EventHandler<Int32> MicroStepChanged; + + public event EventHandler<Double> MaxChangeSlopeChanged; + + public event EventHandler<Double> HighLengthMicroSecondChanged; + + public event EventHandler<Boolean> SpeedMasterChanged; + + public event EventHandler<Int32> PulsePerRoundChanged; + + public event EventHandler<Double> PulleyRadiusChanged; + + public event EventHandler<Int32> ConfigWordChanged; + + public event EventHandler<Boolean> DirectionThreadWizeChanged; + + public event EventHandler<Int32> KvalHoldChanged; + + public event EventHandler<Int32> KvalRunChanged; + + public event EventHandler<Int32> KvalAccChanged; + + public event EventHandler<Int32> KvalDecChanged; + + public event EventHandler<Int32> OverCurrentThresholdChanged; + + public event EventHandler<Int32> StallThresholdChanged; + + public event EventHandler<Int32> ThermalCompensationFactorChanged; + + public event EventHandler<Boolean> LowSpeedOptimizationChanged; + + public event EventHandler<Int32> StSlpChanged; + + public event EventHandler<Int32> IntSpdChanged; + + public event EventHandler<Int32> FnSlpAccChanged; + + public event EventHandler<Int32> FnSlpDecChanged; + + public event EventHandler<Int32> FsSpdChanged; + + public event EventHandler<Boolean> ActiveChanged; + + public event EventHandler<HardwareMotorType> HardwareMotorTypeChanged; + + public event EventHandler<HardwareVersion> HardwareVersionChanged; + protected String _hardwaremotortypeguid; /// <summary> @@ -48,9 +102,12 @@ namespace Tango.BL.Entities set { - _hardwaremotortypeguid = value; RaisePropertyChanged(nameof(HardwareMotorTypeGuid)); + if (_hardwaremotortypeguid != value) + { + _hardwaremotortypeguid = value; + RaisePropertyChanged(nameof(HardwareMotorTypeGuid)); + } } - } protected String _hardwareversionguid; @@ -71,9 +128,12 @@ namespace Tango.BL.Entities set { - _hardwareversionguid = value; RaisePropertyChanged(nameof(HardwareVersionGuid)); + if (_hardwareversionguid != value) + { + _hardwareversionguid = value; + RaisePropertyChanged(nameof(HardwareVersionGuid)); + } } - } protected Int32 _minfrequency; @@ -93,9 +153,15 @@ namespace Tango.BL.Entities set { - _minfrequency = value; RaisePropertyChanged(nameof(MinFrequency)); - } + if (_minfrequency != value) + { + _minfrequency = value; + MinFrequencyChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(MinFrequency)); + } + } } protected Int32 _maxfrequency; @@ -115,9 +181,15 @@ namespace Tango.BL.Entities set { - _maxfrequency = value; RaisePropertyChanged(nameof(MaxFrequency)); - } + if (_maxfrequency != value) + { + _maxfrequency = value; + + MaxFrequencyChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(MaxFrequency)); + } + } } protected Int32 _setmicrostep; @@ -137,9 +209,15 @@ namespace Tango.BL.Entities set { - _setmicrostep = value; RaisePropertyChanged(nameof(SetMicroStep)); - } + if (_setmicrostep != value) + { + _setmicrostep = value; + + SetMicroStepChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(SetMicroStep)); + } + } } protected Int32 _microstep; @@ -159,9 +237,15 @@ namespace Tango.BL.Entities set { - _microstep = value; RaisePropertyChanged(nameof(MicroStep)); - } + if (_microstep != value) + { + _microstep = value; + MicroStepChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(MicroStep)); + } + } } protected Double _maxchangeslope; @@ -181,9 +265,15 @@ namespace Tango.BL.Entities set { - _maxchangeslope = value; RaisePropertyChanged(nameof(MaxChangeSlope)); - } + if (_maxchangeslope != value) + { + _maxchangeslope = value; + MaxChangeSlopeChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(MaxChangeSlope)); + } + } } protected Double _highlengthmicrosecond; @@ -203,9 +293,15 @@ namespace Tango.BL.Entities set { - _highlengthmicrosecond = value; RaisePropertyChanged(nameof(HighLengthMicroSecond)); - } + if (_highlengthmicrosecond != value) + { + _highlengthmicrosecond = value; + + HighLengthMicroSecondChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(HighLengthMicroSecond)); + } + } } protected Boolean _speedmaster; @@ -225,9 +321,15 @@ namespace Tango.BL.Entities set { - _speedmaster = value; RaisePropertyChanged(nameof(SpeedMaster)); - } + if (_speedmaster != value) + { + _speedmaster = value; + + SpeedMasterChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(SpeedMaster)); + } + } } protected Int32 _pulseperround; @@ -247,9 +349,15 @@ namespace Tango.BL.Entities set { - _pulseperround = value; RaisePropertyChanged(nameof(PulsePerRound)); - } + if (_pulseperround != value) + { + _pulseperround = value; + + PulsePerRoundChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(PulsePerRound)); + } + } } protected Double _pulleyradius; @@ -269,9 +377,15 @@ namespace Tango.BL.Entities set { - _pulleyradius = value; RaisePropertyChanged(nameof(PulleyRadius)); - } + if (_pulleyradius != value) + { + _pulleyradius = value; + + PulleyRadiusChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(PulleyRadius)); + } + } } protected Int32 _configword; @@ -291,9 +405,15 @@ namespace Tango.BL.Entities set { - _configword = value; RaisePropertyChanged(nameof(ConfigWord)); - } + if (_configword != value) + { + _configword = value; + ConfigWordChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(ConfigWord)); + } + } } protected Boolean _directionthreadwize; @@ -313,9 +433,15 @@ namespace Tango.BL.Entities set { - _directionthreadwize = value; RaisePropertyChanged(nameof(DirectionThreadWize)); - } + if (_directionthreadwize != value) + { + _directionthreadwize = value; + + DirectionThreadWizeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(DirectionThreadWize)); + } + } } protected Int32 _kvalhold; @@ -335,9 +461,15 @@ namespace Tango.BL.Entities set { - _kvalhold = value; RaisePropertyChanged(nameof(KvalHold)); - } + if (_kvalhold != value) + { + _kvalhold = value; + + KvalHoldChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(KvalHold)); + } + } } protected Int32 _kvalrun; @@ -357,9 +489,15 @@ namespace Tango.BL.Entities set { - _kvalrun = value; RaisePropertyChanged(nameof(KvalRun)); - } + if (_kvalrun != value) + { + _kvalrun = value; + KvalRunChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(KvalRun)); + } + } } protected Int32 _kvalacc; @@ -379,9 +517,15 @@ namespace Tango.BL.Entities set { - _kvalacc = value; RaisePropertyChanged(nameof(KvalAcc)); - } + if (_kvalacc != value) + { + _kvalacc = value; + KvalAccChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(KvalAcc)); + } + } } protected Int32 _kvaldec; @@ -401,9 +545,15 @@ namespace Tango.BL.Entities set { - _kvaldec = value; RaisePropertyChanged(nameof(KvalDec)); - } + if (_kvaldec != value) + { + _kvaldec = value; + + KvalDecChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(KvalDec)); + } + } } protected Int32 _overcurrentthreshold; @@ -423,9 +573,15 @@ namespace Tango.BL.Entities set { - _overcurrentthreshold = value; RaisePropertyChanged(nameof(OverCurrentThreshold)); - } + if (_overcurrentthreshold != value) + { + _overcurrentthreshold = value; + + OverCurrentThresholdChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(OverCurrentThreshold)); + } + } } protected Int32 _stallthreshold; @@ -445,9 +601,15 @@ namespace Tango.BL.Entities set { - _stallthreshold = value; RaisePropertyChanged(nameof(StallThreshold)); - } + if (_stallthreshold != value) + { + _stallthreshold = value; + StallThresholdChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(StallThreshold)); + } + } } protected Int32 _thermalcompensationfactor; @@ -467,9 +629,15 @@ namespace Tango.BL.Entities set { - _thermalcompensationfactor = value; RaisePropertyChanged(nameof(ThermalCompensationFactor)); - } + if (_thermalcompensationfactor != value) + { + _thermalcompensationfactor = value; + + ThermalCompensationFactorChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(ThermalCompensationFactor)); + } + } } protected Boolean _lowspeedoptimization; @@ -489,9 +657,15 @@ namespace Tango.BL.Entities set { - _lowspeedoptimization = value; RaisePropertyChanged(nameof(LowSpeedOptimization)); - } + if (_lowspeedoptimization != value) + { + _lowspeedoptimization = value; + + LowSpeedOptimizationChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(LowSpeedOptimization)); + } + } } protected Int32 _stslp; @@ -511,9 +685,15 @@ namespace Tango.BL.Entities set { - _stslp = value; RaisePropertyChanged(nameof(StSlp)); - } + if (_stslp != value) + { + _stslp = value; + StSlpChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(StSlp)); + } + } } protected Int32 _intspd; @@ -533,9 +713,15 @@ namespace Tango.BL.Entities set { - _intspd = value; RaisePropertyChanged(nameof(IntSpd)); - } + if (_intspd != value) + { + _intspd = value; + IntSpdChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(IntSpd)); + } + } } protected Int32 _fnslpacc; @@ -555,9 +741,15 @@ namespace Tango.BL.Entities set { - _fnslpacc = value; RaisePropertyChanged(nameof(FnSlpAcc)); - } + if (_fnslpacc != value) + { + _fnslpacc = value; + + FnSlpAccChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(FnSlpAcc)); + } + } } protected Int32 _fnslpdec; @@ -577,9 +769,15 @@ namespace Tango.BL.Entities set { - _fnslpdec = value; RaisePropertyChanged(nameof(FnSlpDec)); - } + if (_fnslpdec != value) + { + _fnslpdec = value; + + FnSlpDecChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(FnSlpDec)); + } + } } protected Int32 _fsspd; @@ -599,9 +797,15 @@ namespace Tango.BL.Entities set { - _fsspd = value; RaisePropertyChanged(nameof(FsSpd)); - } + if (_fsspd != value) + { + _fsspd = value; + FsSpdChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(FsSpd)); + } + } } protected Boolean _active; @@ -621,9 +825,15 @@ namespace Tango.BL.Entities set { - _active = value; RaisePropertyChanged(nameof(Active)); - } + if (_active != value) + { + _active = value; + + ActiveChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Active)); + } + } } protected HardwareMotorType _hardwaremotortype; @@ -643,9 +853,15 @@ namespace Tango.BL.Entities set { - _hardwaremotortype = value; RaisePropertyChanged(nameof(HardwareMotorType)); - } + if (_hardwaremotortype != value) + { + _hardwaremotortype = value; + + HardwareMotorTypeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(HardwareMotorType)); + } + } } protected HardwareVersion _hardwareversion; @@ -665,9 +881,15 @@ namespace Tango.BL.Entities set { - _hardwareversion = value; RaisePropertyChanged(nameof(HardwareVersion)); - } + if (_hardwareversion != value) + { + _hardwareversion = value; + + HardwareVersionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(HardwareVersion)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorType.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorType.cs index 51c52142a..73a196a4c 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorType.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorType.cs @@ -25,6 +25,16 @@ namespace Tango.BL.Entities public partial class HardwareMotorType : ObservableEntity<HardwareMotorType> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<Boolean> SupportsHomingChanged; + + public event EventHandler<SynchronizedObservableCollection<HardwareMotor>> HardwareMotorsChanged; + protected Int32 _code; /// <summary> @@ -42,9 +52,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +80,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected String _description; @@ -86,9 +108,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + + DescriptionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Description)); + } + } } protected Boolean _supportshoming; @@ -108,9 +136,15 @@ namespace Tango.BL.Entities set { - _supportshoming = value; RaisePropertyChanged(nameof(SupportsHoming)); - } + if (_supportshoming != value) + { + _supportshoming = value; + SupportsHomingChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(SupportsHoming)); + } + } } protected SynchronizedObservableCollection<HardwareMotor> _hardwaremotors; @@ -128,9 +162,15 @@ namespace Tango.BL.Entities set { - _hardwaremotors = value; RaisePropertyChanged(nameof(HardwareMotors)); - } + if (_hardwaremotors != value) + { + _hardwaremotors = value; + HardwareMotorsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HardwareMotors)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControl.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControl.cs index f93a85b53..a97a0f84e 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControl.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControl.cs @@ -25,6 +25,50 @@ namespace Tango.BL.Entities public partial class HardwarePidControl : ObservableEntity<HardwarePidControl> { + public event EventHandler<Double> OutputProportionalPowerLimitChanged; + + public event EventHandler<Double> OutputProportionalBandChanged; + + public event EventHandler<Double> IntegralTimeChanged; + + public event EventHandler<Double> DerivativeTimeChanged; + + public event EventHandler<Double> SensorCorrectionAdjustmentChanged; + + public event EventHandler<Double> SensorMinValueChanged; + + public event EventHandler<Double> SensorMaxValueChanged; + + public event EventHandler<Double> SetPointRampRateorSoftStartRampChanged; + + public event EventHandler<Double> SetPointControlOutputRateChanged; + + public event EventHandler<Double> ControlOutputTypeChanged; + + public event EventHandler<Double> SsrControlOutputTypeChanged; + + public event EventHandler<Double> OutputOnOffHysteresisValueChanged; + + public event EventHandler<Double> ProcessVariableSamplingRateChanged; + + public event EventHandler<Double> PvInputFilterFactorModeChanged; + + public event EventHandler<Int32> OutputProportionalCycleTimeChanged; + + public event EventHandler<Int32> AcHeatersHalfCycleTimeChanged; + + public event EventHandler<Double> ProportionalGainChanged; + + public event EventHandler<Boolean> PidActiveChanged; + + public event EventHandler<Double> EpsilonChanged; + + public event EventHandler<Boolean> ActiveChanged; + + public event EventHandler<HardwarePidControlType> HardwarePidControlTypeChanged; + + public event EventHandler<HardwareVersion> HardwareVersionChanged; + protected String _hardwarepidcontroltypeguid; /// <summary> @@ -43,9 +87,12 @@ namespace Tango.BL.Entities set { - _hardwarepidcontroltypeguid = value; RaisePropertyChanged(nameof(HardwarePidControlTypeGuid)); + if (_hardwarepidcontroltypeguid != value) + { + _hardwarepidcontroltypeguid = value; + RaisePropertyChanged(nameof(HardwarePidControlTypeGuid)); + } } - } protected String _hardwareversionguid; @@ -66,9 +113,12 @@ namespace Tango.BL.Entities set { - _hardwareversionguid = value; RaisePropertyChanged(nameof(HardwareVersionGuid)); + if (_hardwareversionguid != value) + { + _hardwareversionguid = value; + RaisePropertyChanged(nameof(HardwareVersionGuid)); + } } - } protected Double _outputproportionalpowerlimit; @@ -88,9 +138,15 @@ namespace Tango.BL.Entities set { - _outputproportionalpowerlimit = value; RaisePropertyChanged(nameof(OutputProportionalPowerLimit)); - } + if (_outputproportionalpowerlimit != value) + { + _outputproportionalpowerlimit = value; + + OutputProportionalPowerLimitChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(OutputProportionalPowerLimit)); + } + } } protected Double _outputproportionalband; @@ -110,9 +166,15 @@ namespace Tango.BL.Entities set { - _outputproportionalband = value; RaisePropertyChanged(nameof(OutputProportionalBand)); - } + if (_outputproportionalband != value) + { + _outputproportionalband = value; + + OutputProportionalBandChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(OutputProportionalBand)); + } + } } protected Double _integraltime; @@ -132,9 +194,15 @@ namespace Tango.BL.Entities set { - _integraltime = value; RaisePropertyChanged(nameof(IntegralTime)); - } + if (_integraltime != value) + { + _integraltime = value; + + IntegralTimeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(IntegralTime)); + } + } } protected Double _derivativetime; @@ -154,9 +222,15 @@ namespace Tango.BL.Entities set { - _derivativetime = value; RaisePropertyChanged(nameof(DerivativeTime)); - } + if (_derivativetime != value) + { + _derivativetime = value; + DerivativeTimeChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(DerivativeTime)); + } + } } protected Double _sensorcorrectionadjustment; @@ -176,9 +250,15 @@ namespace Tango.BL.Entities set { - _sensorcorrectionadjustment = value; RaisePropertyChanged(nameof(SensorCorrectionAdjustment)); - } + if (_sensorcorrectionadjustment != value) + { + _sensorcorrectionadjustment = value; + SensorCorrectionAdjustmentChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(SensorCorrectionAdjustment)); + } + } } protected Double _sensorminvalue; @@ -198,9 +278,15 @@ namespace Tango.BL.Entities set { - _sensorminvalue = value; RaisePropertyChanged(nameof(SensorMinValue)); - } + if (_sensorminvalue != value) + { + _sensorminvalue = value; + SensorMinValueChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(SensorMinValue)); + } + } } protected Double _sensormaxvalue; @@ -220,9 +306,15 @@ namespace Tango.BL.Entities set { - _sensormaxvalue = value; RaisePropertyChanged(nameof(SensorMaxValue)); - } + if (_sensormaxvalue != value) + { + _sensormaxvalue = value; + SensorMaxValueChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(SensorMaxValue)); + } + } } protected Double _setpointramprateorsoftstartramp; @@ -242,9 +334,15 @@ namespace Tango.BL.Entities set { - _setpointramprateorsoftstartramp = value; RaisePropertyChanged(nameof(SetPointRampRateorSoftStartRamp)); - } + if (_setpointramprateorsoftstartramp != value) + { + _setpointramprateorsoftstartramp = value; + + SetPointRampRateorSoftStartRampChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(SetPointRampRateorSoftStartRamp)); + } + } } protected Double _setpointcontroloutputrate; @@ -264,9 +362,15 @@ namespace Tango.BL.Entities set { - _setpointcontroloutputrate = value; RaisePropertyChanged(nameof(SetPointControlOutputRate)); - } + if (_setpointcontroloutputrate != value) + { + _setpointcontroloutputrate = value; + + SetPointControlOutputRateChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(SetPointControlOutputRate)); + } + } } protected Double _controloutputtype; @@ -286,9 +390,15 @@ namespace Tango.BL.Entities set { - _controloutputtype = value; RaisePropertyChanged(nameof(ControlOutputType)); - } + if (_controloutputtype != value) + { + _controloutputtype = value; + + ControlOutputTypeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(ControlOutputType)); + } + } } protected Double _ssrcontroloutputtype; @@ -308,9 +418,15 @@ namespace Tango.BL.Entities set { - _ssrcontroloutputtype = value; RaisePropertyChanged(nameof(SsrControlOutputType)); - } + if (_ssrcontroloutputtype != value) + { + _ssrcontroloutputtype = value; + + SsrControlOutputTypeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(SsrControlOutputType)); + } + } } protected Double _outputonoffhysteresisvalue; @@ -330,9 +446,15 @@ namespace Tango.BL.Entities set { - _outputonoffhysteresisvalue = value; RaisePropertyChanged(nameof(OutputOnOffHysteresisValue)); - } + if (_outputonoffhysteresisvalue != value) + { + _outputonoffhysteresisvalue = value; + + OutputOnOffHysteresisValueChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(OutputOnOffHysteresisValue)); + } + } } protected Double _processvariablesamplingrate; @@ -352,9 +474,15 @@ namespace Tango.BL.Entities set { - _processvariablesamplingrate = value; RaisePropertyChanged(nameof(ProcessVariableSamplingRate)); - } + if (_processvariablesamplingrate != value) + { + _processvariablesamplingrate = value; + + ProcessVariableSamplingRateChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(ProcessVariableSamplingRate)); + } + } } protected Double _pvinputfilterfactormode; @@ -374,9 +502,15 @@ namespace Tango.BL.Entities set { - _pvinputfilterfactormode = value; RaisePropertyChanged(nameof(PvInputFilterFactorMode)); - } + if (_pvinputfilterfactormode != value) + { + _pvinputfilterfactormode = value; + + PvInputFilterFactorModeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(PvInputFilterFactorMode)); + } + } } protected Int32 _outputproportionalcycletime; @@ -396,9 +530,15 @@ namespace Tango.BL.Entities set { - _outputproportionalcycletime = value; RaisePropertyChanged(nameof(OutputProportionalCycleTime)); - } + if (_outputproportionalcycletime != value) + { + _outputproportionalcycletime = value; + + OutputProportionalCycleTimeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(OutputProportionalCycleTime)); + } + } } protected Int32 _acheatershalfcycletime; @@ -418,9 +558,15 @@ namespace Tango.BL.Entities set { - _acheatershalfcycletime = value; RaisePropertyChanged(nameof(AcHeatersHalfCycleTime)); - } + if (_acheatershalfcycletime != value) + { + _acheatershalfcycletime = value; + + AcHeatersHalfCycleTimeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(AcHeatersHalfCycleTime)); + } + } } protected Double _proportionalgain; @@ -440,9 +586,15 @@ namespace Tango.BL.Entities set { - _proportionalgain = value; RaisePropertyChanged(nameof(ProportionalGain)); - } + if (_proportionalgain != value) + { + _proportionalgain = value; + + ProportionalGainChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(ProportionalGain)); + } + } } protected Boolean _pidactive; @@ -462,9 +614,15 @@ namespace Tango.BL.Entities set { - _pidactive = value; RaisePropertyChanged(nameof(PidActive)); - } + if (_pidactive != value) + { + _pidactive = value; + + PidActiveChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(PidActive)); + } + } } protected Double _epsilon; @@ -484,9 +642,15 @@ namespace Tango.BL.Entities set { - _epsilon = value; RaisePropertyChanged(nameof(Epsilon)); - } + if (_epsilon != value) + { + _epsilon = value; + EpsilonChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Epsilon)); + } + } } protected Boolean _active; @@ -506,9 +670,15 @@ namespace Tango.BL.Entities set { - _active = value; RaisePropertyChanged(nameof(Active)); - } + if (_active != value) + { + _active = value; + ActiveChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Active)); + } + } } protected HardwarePidControlType _hardwarepidcontroltype; @@ -528,9 +698,15 @@ namespace Tango.BL.Entities set { - _hardwarepidcontroltype = value; RaisePropertyChanged(nameof(HardwarePidControlType)); - } + if (_hardwarepidcontroltype != value) + { + _hardwarepidcontroltype = value; + HardwarePidControlTypeChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HardwarePidControlType)); + } + } } protected HardwareVersion _hardwareversion; @@ -550,9 +726,15 @@ namespace Tango.BL.Entities set { - _hardwareversion = value; RaisePropertyChanged(nameof(HardwareVersion)); - } + if (_hardwareversion != value) + { + _hardwareversion = value; + HardwareVersionChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HardwareVersion)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlType.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlType.cs index fc90c3898..6b49f8967 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlType.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlType.cs @@ -25,6 +25,14 @@ namespace Tango.BL.Entities public partial class HardwarePidControlType : ObservableEntity<HardwarePidControlType> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<SynchronizedObservableCollection<HardwarePidControl>> HardwarePidControlsChanged; + protected Int32 _code; /// <summary> @@ -42,9 +50,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +78,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + NameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Name)); + } + } } protected String _description; @@ -86,9 +106,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + + DescriptionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Description)); + } + } } protected SynchronizedObservableCollection<HardwarePidControl> _hardwarepidcontrols; @@ -106,9 +132,15 @@ namespace Tango.BL.Entities set { - _hardwarepidcontrols = value; RaisePropertyChanged(nameof(HardwarePidControls)); - } + if (_hardwarepidcontrols != value) + { + _hardwarepidcontrols = value; + HardwarePidControlsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HardwarePidControls)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensor.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensor.cs index d0c394586..74c2a55d3 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensor.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensor.cs @@ -25,6 +25,16 @@ namespace Tango.BL.Entities public partial class HardwareSpeedSensor : ObservableEntity<HardwareSpeedSensor> { + public event EventHandler<Int32> ResolutionBitsChanged; + + public event EventHandler<Double> PerimeterChanged; + + public event EventHandler<Boolean> ActiveChanged; + + public event EventHandler<HardwareSpeedSensorType> HardwareSpeedSensorTypeChanged; + + public event EventHandler<HardwareVersion> HardwareVersionChanged; + protected String _hardwarespeedsensortypeguid; /// <summary> @@ -43,9 +53,12 @@ namespace Tango.BL.Entities set { - _hardwarespeedsensortypeguid = value; RaisePropertyChanged(nameof(HardwareSpeedSensorTypeGuid)); + if (_hardwarespeedsensortypeguid != value) + { + _hardwarespeedsensortypeguid = value; + RaisePropertyChanged(nameof(HardwareSpeedSensorTypeGuid)); + } } - } protected String _hardwareversionguid; @@ -66,9 +79,12 @@ namespace Tango.BL.Entities set { - _hardwareversionguid = value; RaisePropertyChanged(nameof(HardwareVersionGuid)); + if (_hardwareversionguid != value) + { + _hardwareversionguid = value; + RaisePropertyChanged(nameof(HardwareVersionGuid)); + } } - } protected Int32 _resolutionbits; @@ -88,9 +104,15 @@ namespace Tango.BL.Entities set { - _resolutionbits = value; RaisePropertyChanged(nameof(ResolutionBits)); - } + if (_resolutionbits != value) + { + _resolutionbits = value; + + ResolutionBitsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(ResolutionBits)); + } + } } protected Double _perimeter; @@ -110,9 +132,15 @@ namespace Tango.BL.Entities set { - _perimeter = value; RaisePropertyChanged(nameof(Perimeter)); - } + if (_perimeter != value) + { + _perimeter = value; + PerimeterChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Perimeter)); + } + } } protected Boolean _active; @@ -132,9 +160,15 @@ namespace Tango.BL.Entities set { - _active = value; RaisePropertyChanged(nameof(Active)); - } + if (_active != value) + { + _active = value; + ActiveChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Active)); + } + } } protected HardwareSpeedSensorType _hardwarespeedsensortype; @@ -154,9 +188,15 @@ namespace Tango.BL.Entities set { - _hardwarespeedsensortype = value; RaisePropertyChanged(nameof(HardwareSpeedSensorType)); - } + if (_hardwarespeedsensortype != value) + { + _hardwarespeedsensortype = value; + HardwareSpeedSensorTypeChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HardwareSpeedSensorType)); + } + } } protected HardwareVersion _hardwareversion; @@ -176,9 +216,15 @@ namespace Tango.BL.Entities set { - _hardwareversion = value; RaisePropertyChanged(nameof(HardwareVersion)); - } + if (_hardwareversion != value) + { + _hardwareversion = value; + HardwareVersionChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HardwareVersion)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorType.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorType.cs index 5efddd114..0f5c329fc 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorType.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorType.cs @@ -25,6 +25,14 @@ namespace Tango.BL.Entities public partial class HardwareSpeedSensorType : ObservableEntity<HardwareSpeedSensorType> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<SynchronizedObservableCollection<HardwareSpeedSensor>> HardwareSpeedSensorsChanged; + protected Int32 _code; /// <summary> @@ -42,9 +50,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +78,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + NameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Name)); + } + } } protected String _description; @@ -86,9 +106,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + + DescriptionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Description)); + } + } } protected SynchronizedObservableCollection<HardwareSpeedSensor> _hardwarespeedsensors; @@ -106,9 +132,15 @@ namespace Tango.BL.Entities set { - _hardwarespeedsensors = value; RaisePropertyChanged(nameof(HardwareSpeedSensors)); - } + if (_hardwarespeedsensors != value) + { + _hardwarespeedsensors = value; + HardwareSpeedSensorsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HardwareSpeedSensors)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs index be855f1e1..f3af7d91f 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs @@ -25,6 +25,26 @@ namespace Tango.BL.Entities public partial class HardwareVersion : ObservableEntity<HardwareVersion> { + public event EventHandler<Double> VersionChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<SynchronizedObservableCollection<Configuration>> ConfigurationsChanged; + + public event EventHandler<SynchronizedObservableCollection<HardwareBlower>> HardwareBlowersChanged; + + public event EventHandler<SynchronizedObservableCollection<HardwareBreakSensor>> HardwareBreakSensorsChanged; + + public event EventHandler<SynchronizedObservableCollection<HardwareDancer>> HardwareDancersChanged; + + public event EventHandler<SynchronizedObservableCollection<HardwareMotor>> HardwareMotorsChanged; + + public event EventHandler<SynchronizedObservableCollection<HardwarePidControl>> HardwarePidControlsChanged; + + public event EventHandler<SynchronizedObservableCollection<HardwareSpeedSensor>> HardwareSpeedSensorsChanged; + + public event EventHandler<SynchronizedObservableCollection<HardwareWinder>> HardwareWindersChanged; + protected Double _version; /// <summary> @@ -42,9 +62,15 @@ namespace Tango.BL.Entities set { - _version = value; RaisePropertyChanged(nameof(Version)); - } + if (_version != value) + { + _version = value; + + VersionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Version)); + } + } } protected String _name; @@ -64,9 +90,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected SynchronizedObservableCollection<Configuration> _configurations; @@ -84,9 +116,15 @@ namespace Tango.BL.Entities set { - _configurations = value; RaisePropertyChanged(nameof(Configurations)); - } + if (_configurations != value) + { + _configurations = value; + + ConfigurationsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Configurations)); + } + } } protected SynchronizedObservableCollection<HardwareBlower> _hardwareblowers; @@ -104,9 +142,15 @@ namespace Tango.BL.Entities set { - _hardwareblowers = value; RaisePropertyChanged(nameof(HardwareBlowers)); - } + if (_hardwareblowers != value) + { + _hardwareblowers = value; + HardwareBlowersChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HardwareBlowers)); + } + } } protected SynchronizedObservableCollection<HardwareBreakSensor> _hardwarebreaksensors; @@ -124,9 +168,15 @@ namespace Tango.BL.Entities set { - _hardwarebreaksensors = value; RaisePropertyChanged(nameof(HardwareBreakSensors)); - } + if (_hardwarebreaksensors != value) + { + _hardwarebreaksensors = value; + HardwareBreakSensorsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HardwareBreakSensors)); + } + } } protected SynchronizedObservableCollection<HardwareDancer> _hardwaredancers; @@ -144,9 +194,15 @@ namespace Tango.BL.Entities set { - _hardwaredancers = value; RaisePropertyChanged(nameof(HardwareDancers)); - } + if (_hardwaredancers != value) + { + _hardwaredancers = value; + + HardwareDancersChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(HardwareDancers)); + } + } } protected SynchronizedObservableCollection<HardwareMotor> _hardwaremotors; @@ -164,9 +220,15 @@ namespace Tango.BL.Entities set { - _hardwaremotors = value; RaisePropertyChanged(nameof(HardwareMotors)); - } + if (_hardwaremotors != value) + { + _hardwaremotors = value; + + HardwareMotorsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(HardwareMotors)); + } + } } protected SynchronizedObservableCollection<HardwarePidControl> _hardwarepidcontrols; @@ -184,9 +246,15 @@ namespace Tango.BL.Entities set { - _hardwarepidcontrols = value; RaisePropertyChanged(nameof(HardwarePidControls)); - } + if (_hardwarepidcontrols != value) + { + _hardwarepidcontrols = value; + + HardwarePidControlsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(HardwarePidControls)); + } + } } protected SynchronizedObservableCollection<HardwareSpeedSensor> _hardwarespeedsensors; @@ -204,9 +272,15 @@ namespace Tango.BL.Entities set { - _hardwarespeedsensors = value; RaisePropertyChanged(nameof(HardwareSpeedSensors)); - } + if (_hardwarespeedsensors != value) + { + _hardwarespeedsensors = value; + HardwareSpeedSensorsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HardwareSpeedSensors)); + } + } } protected SynchronizedObservableCollection<HardwareWinder> _hardwarewinders; @@ -224,9 +298,15 @@ namespace Tango.BL.Entities set { - _hardwarewinders = value; RaisePropertyChanged(nameof(HardwareWinders)); - } + if (_hardwarewinders != value) + { + _hardwarewinders = value; + HardwareWindersChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HardwareWinders)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareWinder.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareWinder.cs index 11252cb69..c6b7423c3 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareWinder.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareWinder.cs @@ -25,6 +25,14 @@ namespace Tango.BL.Entities public partial class HardwareWinder : ObservableEntity<HardwareWinder> { + public event EventHandler<Int32> MillimeterPerRotationChanged; + + public event EventHandler<Boolean> ActiveChanged; + + public event EventHandler<HardwareVersion> HardwareVersionChanged; + + public event EventHandler<HardwareWinderType> HardwareWinderTypeChanged; + protected String _hardwarewindertypeguid; /// <summary> @@ -43,9 +51,12 @@ namespace Tango.BL.Entities set { - _hardwarewindertypeguid = value; RaisePropertyChanged(nameof(HardwareWinderTypeGuid)); + if (_hardwarewindertypeguid != value) + { + _hardwarewindertypeguid = value; + RaisePropertyChanged(nameof(HardwareWinderTypeGuid)); + } } - } protected String _hardwareversionguid; @@ -66,9 +77,12 @@ namespace Tango.BL.Entities set { - _hardwareversionguid = value; RaisePropertyChanged(nameof(HardwareVersionGuid)); + if (_hardwareversionguid != value) + { + _hardwareversionguid = value; + RaisePropertyChanged(nameof(HardwareVersionGuid)); + } } - } protected Int32 _millimeterperrotation; @@ -88,9 +102,15 @@ namespace Tango.BL.Entities set { - _millimeterperrotation = value; RaisePropertyChanged(nameof(MillimeterPerRotation)); - } + if (_millimeterperrotation != value) + { + _millimeterperrotation = value; + MillimeterPerRotationChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(MillimeterPerRotation)); + } + } } protected Boolean _active; @@ -110,9 +130,15 @@ namespace Tango.BL.Entities set { - _active = value; RaisePropertyChanged(nameof(Active)); - } + if (_active != value) + { + _active = value; + + ActiveChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Active)); + } + } } protected HardwareVersion _hardwareversion; @@ -132,9 +158,15 @@ namespace Tango.BL.Entities set { - _hardwareversion = value; RaisePropertyChanged(nameof(HardwareVersion)); - } + if (_hardwareversion != value) + { + _hardwareversion = value; + + HardwareVersionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(HardwareVersion)); + } + } } protected HardwareWinderType _hardwarewindertype; @@ -154,9 +186,15 @@ namespace Tango.BL.Entities set { - _hardwarewindertype = value; RaisePropertyChanged(nameof(HardwareWinderType)); - } + if (_hardwarewindertype != value) + { + _hardwarewindertype = value; + HardwareWinderTypeChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HardwareWinderType)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderType.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderType.cs index 5c699e656..e1e4ec960 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderType.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderType.cs @@ -25,6 +25,14 @@ namespace Tango.BL.Entities public partial class HardwareWinderType : ObservableEntity<HardwareWinderType> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<SynchronizedObservableCollection<HardwareWinder>> HardwareWindersChanged; + protected Int32 _code; /// <summary> @@ -42,9 +50,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +78,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + NameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Name)); + } + } } protected String _description; @@ -86,9 +106,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + + DescriptionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Description)); + } + } } protected SynchronizedObservableCollection<HardwareWinder> _hardwarewinders; @@ -106,9 +132,15 @@ namespace Tango.BL.Entities set { - _hardwarewinders = value; RaisePropertyChanged(nameof(HardwareWinders)); - } + if (_hardwarewinders != value) + { + _hardwarewinders = value; + HardwareWindersChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HardwareWinders)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/HtmlPage.cs b/Software/Visual_Studio/Tango.BL/Entities/HtmlPage.cs index f5be6afba..0f630751e 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HtmlPage.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HtmlPage.cs @@ -25,6 +25,16 @@ namespace Tango.BL.Entities public partial class HtmlPage : ObservableEntity<HtmlPage> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<String> HtmlChanged; + + public event EventHandler<SynchronizedObservableCollection<EventType>> EventTypesChanged; + protected Int32 _code; /// <summary> @@ -42,9 +52,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +80,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected String _description; @@ -86,9 +108,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + + DescriptionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Description)); + } + } } protected String _html; @@ -108,9 +136,15 @@ namespace Tango.BL.Entities set { - _html = value; RaisePropertyChanged(nameof(Html)); - } + if (_html != value) + { + _html = value; + HtmlChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Html)); + } + } } protected SynchronizedObservableCollection<EventType> _eventtypes; @@ -128,9 +162,15 @@ namespace Tango.BL.Entities set { - _eventtypes = value; RaisePropertyChanged(nameof(EventTypes)); - } + if (_eventtypes != value) + { + _eventtypes = value; + EventTypesChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(EventTypes)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/IdsPack.cs b/Software/Visual_Studio/Tango.BL/Entities/IdsPack.cs index 7b3c40312..ffb7a9c3d 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/IdsPack.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/IdsPack.cs @@ -25,6 +25,24 @@ namespace Tango.BL.Entities public partial class IdsPack : ObservableEntity<IdsPack> { + public event EventHandler<String> NameChanged; + + public event EventHandler<Int32> PackIndexChanged; + + public event EventHandler<Boolean> IsEmptyChanged; + + public event EventHandler<CartridgeType> CartridgeTypeChanged; + + public event EventHandler<Configuration> ConfigurationChanged; + + public event EventHandler<DispenserType> DispenserTypeChanged; + + public event EventHandler<IdsPackFormula> IdsPackFormulaChanged; + + public event EventHandler<LiquidType> LiquidTypeChanged; + + public event EventHandler<MidTankType> MidTankTypeChanged; + protected String _configurationguid; /// <summary> @@ -43,9 +61,12 @@ namespace Tango.BL.Entities set { - _configurationguid = value; RaisePropertyChanged(nameof(ConfigurationGuid)); + if (_configurationguid != value) + { + _configurationguid = value; + RaisePropertyChanged(nameof(ConfigurationGuid)); + } } - } protected String _dispensertypeguid; @@ -66,9 +87,12 @@ namespace Tango.BL.Entities set { - _dispensertypeguid = value; RaisePropertyChanged(nameof(DispenserTypeGuid)); + if (_dispensertypeguid != value) + { + _dispensertypeguid = value; + RaisePropertyChanged(nameof(DispenserTypeGuid)); + } } - } protected String _liquidtypeguid; @@ -89,9 +113,12 @@ namespace Tango.BL.Entities set { - _liquidtypeguid = value; RaisePropertyChanged(nameof(LiquidTypeGuid)); + if (_liquidtypeguid != value) + { + _liquidtypeguid = value; + RaisePropertyChanged(nameof(LiquidTypeGuid)); + } } - } protected String _cartridgetypeguid; @@ -112,9 +139,12 @@ namespace Tango.BL.Entities set { - _cartridgetypeguid = value; RaisePropertyChanged(nameof(CartridgeTypeGuid)); + if (_cartridgetypeguid != value) + { + _cartridgetypeguid = value; + RaisePropertyChanged(nameof(CartridgeTypeGuid)); + } } - } protected String _midtanktypeguid; @@ -135,9 +165,12 @@ namespace Tango.BL.Entities set { - _midtanktypeguid = value; RaisePropertyChanged(nameof(MidTankTypeGuid)); + if (_midtanktypeguid != value) + { + _midtanktypeguid = value; + RaisePropertyChanged(nameof(MidTankTypeGuid)); + } } - } protected String _idspackformulaguid; @@ -158,9 +191,12 @@ namespace Tango.BL.Entities set { - _idspackformulaguid = value; RaisePropertyChanged(nameof(IdsPackFormulaGuid)); + if (_idspackformulaguid != value) + { + _idspackformulaguid = value; + RaisePropertyChanged(nameof(IdsPackFormulaGuid)); + } } - } protected String _name; @@ -180,9 +216,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + NameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Name)); + } + } } protected Int32 _packindex; @@ -202,9 +244,15 @@ namespace Tango.BL.Entities set { - _packindex = value; RaisePropertyChanged(nameof(PackIndex)); - } + if (_packindex != value) + { + _packindex = value; + PackIndexChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(PackIndex)); + } + } } protected Boolean _isempty; @@ -224,9 +272,15 @@ namespace Tango.BL.Entities set { - _isempty = value; RaisePropertyChanged(nameof(IsEmpty)); - } + if (_isempty != value) + { + _isempty = value; + + IsEmptyChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(IsEmpty)); + } + } } protected CartridgeType _cartridgetype; @@ -246,9 +300,15 @@ namespace Tango.BL.Entities set { - _cartridgetype = value; RaisePropertyChanged(nameof(CartridgeType)); - } + if (_cartridgetype != value) + { + _cartridgetype = value; + + CartridgeTypeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(CartridgeType)); + } + } } protected Configuration _configuration; @@ -268,9 +328,15 @@ namespace Tango.BL.Entities set { - _configuration = value; RaisePropertyChanged(nameof(Configuration)); - } + if (_configuration != value) + { + _configuration = value; + + ConfigurationChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Configuration)); + } + } } protected DispenserType _dispensertype; @@ -290,9 +356,15 @@ namespace Tango.BL.Entities set { - _dispensertype = value; RaisePropertyChanged(nameof(DispenserType)); - } + if (_dispensertype != value) + { + _dispensertype = value; + + DispenserTypeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(DispenserType)); + } + } } protected IdsPackFormula _idspackformula; @@ -312,9 +384,15 @@ namespace Tango.BL.Entities set { - _idspackformula = value; RaisePropertyChanged(nameof(IdsPackFormula)); - } + if (_idspackformula != value) + { + _idspackformula = value; + + IdsPackFormulaChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(IdsPackFormula)); + } + } } protected LiquidType _liquidtype; @@ -334,9 +412,15 @@ namespace Tango.BL.Entities set { - _liquidtype = value; RaisePropertyChanged(nameof(LiquidType)); - } + if (_liquidtype != value) + { + _liquidtype = value; + LiquidTypeChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(LiquidType)); + } + } } protected MidTankType _midtanktype; @@ -356,9 +440,15 @@ namespace Tango.BL.Entities set { - _midtanktype = value; RaisePropertyChanged(nameof(MidTankType)); - } + if (_midtanktype != value) + { + _midtanktype = value; + MidTankTypeChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(MidTankType)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/IdsPackFormula.cs b/Software/Visual_Studio/Tango.BL/Entities/IdsPackFormula.cs index e1083b8b1..40b410190 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/IdsPackFormula.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/IdsPackFormula.cs @@ -25,6 +25,16 @@ namespace Tango.BL.Entities public partial class IdsPackFormula : ObservableEntity<IdsPackFormula> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<Boolean> AutoCalculatedChanged; + + public event EventHandler<SynchronizedObservableCollection<IdsPack>> IdsPacksChanged; + protected Int32 _code; /// <summary> @@ -42,9 +52,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +80,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected String _description; @@ -86,9 +108,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + + DescriptionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Description)); + } + } } protected Boolean _autocalculated; @@ -108,9 +136,15 @@ namespace Tango.BL.Entities set { - _autocalculated = value; RaisePropertyChanged(nameof(AutoCalculated)); - } + if (_autocalculated != value) + { + _autocalculated = value; + AutoCalculatedChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(AutoCalculated)); + } + } } protected SynchronizedObservableCollection<IdsPack> _idspacks; @@ -128,9 +162,15 @@ namespace Tango.BL.Entities set { - _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); - } + if (_idspacks != value) + { + _idspacks = value; + IdsPacksChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(IdsPacks)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/Job.cs b/Software/Visual_Studio/Tango.BL/Entities/Job.cs index 2e809f56f..23fb99119 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Job.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Job.cs @@ -30,6 +30,74 @@ namespace Tango.BL.Entities public partial class Job : ObservableEntity<Job> { + public event EventHandler<DateTime> CreationDateChanged; + + public event EventHandler<Nullable<DateTime>> LastRunChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<Double> InterSegmentLengthChanged; + + public event EventHandler<Boolean> EnableInterSegmentChanged; + + public event EventHandler<Boolean> EnableLubricationChanged; + + public event EventHandler<Int32> JobIndexChanged; + + public event EventHandler<Int32> EstimatedDurationMiliChanged; + + public event EventHandler<Boolean> HasEmbroideryFileChanged; + + public event EventHandler<Byte[]> EmbroideryFileDataChanged; + + public event EventHandler<String> EmbroideryFileNameChanged; + + public event EventHandler<Byte[]> EmbroideryJpegChanged; + + public event EventHandler<Int32> StatusChanged; + + public event EventHandler<Int32> NumberOfUnitsChanged; + + public event EventHandler<Int32> TypeChanged; + + public event EventHandler<Int32> SpoolsDistributionChanged; + + public event EventHandler<Int32> NumberOfHeadsChanged; + + public event EventHandler<Int32> SampleUnitsOrMetersChanged; + + public event EventHandler<Int32> FineTuningStatusChanged; + + public event EventHandler<Nullable<DateTime>> FineTuningApproveDateChanged; + + public event EventHandler<Int32> SampleDyeStatusChanged; + + public event EventHandler<Nullable<DateTime>> SampleDyeApproveDateChanged; + + public event EventHandler<Int32> EditingStateChanged; + + public event EventHandler<Double> LengthPercentageFactorChanged; + + public event EventHandler<ColorSpace> ColorSpaceChanged; + + public event EventHandler<Customer> CustomerChanged; + + public event EventHandler<SynchronizedObservableCollection<JobRun>> JobRunsChanged; + + public event EventHandler<Machine> MachineChanged; + + public event EventHandler<Rml> RmlChanged; + + public event EventHandler<SpoolType> SpoolTypeChanged; + + public event EventHandler<User> UserChanged; + + public event EventHandler<WindingMethod> WindingMethodChanged; + + public event EventHandler<SynchronizedObservableCollection<Segment>> SegmentsChanged; + protected DateTime _creationdate; /// <summary> @@ -47,9 +115,15 @@ namespace Tango.BL.Entities set { - _creationdate = value; RaisePropertyChanged(nameof(CreationDate)); - } + if (_creationdate != value) + { + _creationdate = value; + + CreationDateChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(CreationDate)); + } + } } protected Nullable<DateTime> _lastrun; @@ -69,9 +143,15 @@ namespace Tango.BL.Entities set { - _lastrun = value; RaisePropertyChanged(nameof(LastRun)); - } + if (_lastrun != value) + { + _lastrun = value; + + LastRunChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(LastRun)); + } + } } protected String _machineguid; @@ -92,9 +172,12 @@ namespace Tango.BL.Entities set { - _machineguid = value; RaisePropertyChanged(nameof(MachineGuid)); + if (_machineguid != value) + { + _machineguid = value; + RaisePropertyChanged(nameof(MachineGuid)); + } } - } protected String _userguid; @@ -115,9 +198,12 @@ namespace Tango.BL.Entities set { - _userguid = value; RaisePropertyChanged(nameof(UserGuid)); + if (_userguid != value) + { + _userguid = value; + RaisePropertyChanged(nameof(UserGuid)); + } } - } protected String _rmlguid; @@ -138,9 +224,12 @@ namespace Tango.BL.Entities set { - _rmlguid = value; RaisePropertyChanged(nameof(RmlGuid)); + if (_rmlguid != value) + { + _rmlguid = value; + RaisePropertyChanged(nameof(RmlGuid)); + } } - } protected String _windingmethodguid; @@ -161,9 +250,12 @@ namespace Tango.BL.Entities set { - _windingmethodguid = value; RaisePropertyChanged(nameof(WindingMethodGuid)); + if (_windingmethodguid != value) + { + _windingmethodguid = value; + RaisePropertyChanged(nameof(WindingMethodGuid)); + } } - } protected String _spooltypeguid; @@ -184,9 +276,12 @@ namespace Tango.BL.Entities set { - _spooltypeguid = value; RaisePropertyChanged(nameof(SpoolTypeGuid)); + if (_spooltypeguid != value) + { + _spooltypeguid = value; + RaisePropertyChanged(nameof(SpoolTypeGuid)); + } } - } protected String _name; @@ -206,9 +301,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected String _description; @@ -228,9 +329,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + + DescriptionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Description)); + } + } } protected Double _intersegmentlength; @@ -250,9 +357,15 @@ namespace Tango.BL.Entities set { - _intersegmentlength = value; RaisePropertyChanged(nameof(InterSegmentLength)); - } + if (_intersegmentlength != value) + { + _intersegmentlength = value; + InterSegmentLengthChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(InterSegmentLength)); + } + } } protected Boolean _enableintersegment; @@ -272,9 +385,15 @@ namespace Tango.BL.Entities set { - _enableintersegment = value; RaisePropertyChanged(nameof(EnableInterSegment)); - } + if (_enableintersegment != value) + { + _enableintersegment = value; + + EnableInterSegmentChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(EnableInterSegment)); + } + } } protected Boolean _enablelubrication; @@ -294,9 +413,15 @@ namespace Tango.BL.Entities set { - _enablelubrication = value; RaisePropertyChanged(nameof(EnableLubrication)); - } + if (_enablelubrication != value) + { + _enablelubrication = value; + + EnableLubricationChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(EnableLubrication)); + } + } } protected Int32 _jobindex; @@ -316,9 +441,15 @@ namespace Tango.BL.Entities set { - _jobindex = value; RaisePropertyChanged(nameof(JobIndex)); - } + if (_jobindex != value) + { + _jobindex = value; + JobIndexChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(JobIndex)); + } + } } protected Int32 _estimateddurationmili; @@ -338,9 +469,15 @@ namespace Tango.BL.Entities set { - _estimateddurationmili = value; RaisePropertyChanged(nameof(EstimatedDurationMili)); - } + if (_estimateddurationmili != value) + { + _estimateddurationmili = value; + + EstimatedDurationMiliChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(EstimatedDurationMili)); + } + } } protected Boolean _hasembroideryfile; @@ -360,9 +497,15 @@ namespace Tango.BL.Entities set { - _hasembroideryfile = value; RaisePropertyChanged(nameof(HasEmbroideryFile)); - } + if (_hasembroideryfile != value) + { + _hasembroideryfile = value; + + HasEmbroideryFileChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(HasEmbroideryFile)); + } + } } protected Byte[] _embroideryfiledata; @@ -382,9 +525,15 @@ namespace Tango.BL.Entities set { - _embroideryfiledata = value; RaisePropertyChanged(nameof(EmbroideryFileData)); - } + if (_embroideryfiledata != value) + { + _embroideryfiledata = value; + EmbroideryFileDataChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(EmbroideryFileData)); + } + } } protected String _embroideryfilename; @@ -404,9 +553,15 @@ namespace Tango.BL.Entities set { - _embroideryfilename = value; RaisePropertyChanged(nameof(EmbroideryFileName)); - } + if (_embroideryfilename != value) + { + _embroideryfilename = value; + + EmbroideryFileNameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(EmbroideryFileName)); + } + } } protected Byte[] _embroideryjpeg; @@ -426,9 +581,15 @@ namespace Tango.BL.Entities set { - _embroideryjpeg = value; RaisePropertyChanged(nameof(EmbroideryJpeg)); - } + if (_embroideryjpeg != value) + { + _embroideryjpeg = value; + + EmbroideryJpegChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(EmbroideryJpeg)); + } + } } protected Int32 _status; @@ -450,9 +611,15 @@ namespace Tango.BL.Entities set { - _status = value; RaisePropertyChanged(nameof(Status)); - } + if (_status != value) + { + _status = value; + StatusChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Status)); + } + } } protected String _colorspaceguid; @@ -473,9 +640,12 @@ namespace Tango.BL.Entities set { - _colorspaceguid = value; RaisePropertyChanged(nameof(ColorSpaceGuid)); + if (_colorspaceguid != value) + { + _colorspaceguid = value; + RaisePropertyChanged(nameof(ColorSpaceGuid)); + } } - } protected Int32 _numberofunits; @@ -495,9 +665,15 @@ namespace Tango.BL.Entities set { - _numberofunits = value; RaisePropertyChanged(nameof(NumberOfUnits)); - } + if (_numberofunits != value) + { + _numberofunits = value; + + NumberOfUnitsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(NumberOfUnits)); + } + } } protected Int32 _type; @@ -518,9 +694,15 @@ namespace Tango.BL.Entities set { - _type = value; RaisePropertyChanged(nameof(Type)); - } + if (_type != value) + { + _type = value; + TypeChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Type)); + } + } } protected String _customerguid; @@ -541,9 +723,12 @@ namespace Tango.BL.Entities set { - _customerguid = value; RaisePropertyChanged(nameof(CustomerGuid)); + if (_customerguid != value) + { + _customerguid = value; + RaisePropertyChanged(nameof(CustomerGuid)); + } } - } protected Int32 _spoolsdistribution; @@ -564,9 +749,15 @@ namespace Tango.BL.Entities set { - _spoolsdistribution = value; RaisePropertyChanged(nameof(SpoolsDistribution)); - } + if (_spoolsdistribution != value) + { + _spoolsdistribution = value; + SpoolsDistributionChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(SpoolsDistribution)); + } + } } protected Int32 _numberofheads; @@ -586,9 +777,15 @@ namespace Tango.BL.Entities set { - _numberofheads = value; RaisePropertyChanged(nameof(NumberOfHeads)); - } + if (_numberofheads != value) + { + _numberofheads = value; + NumberOfHeadsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(NumberOfHeads)); + } + } } protected Int32 _sampleunitsormeters; @@ -608,9 +805,15 @@ namespace Tango.BL.Entities set { - _sampleunitsormeters = value; RaisePropertyChanged(nameof(SampleUnitsOrMeters)); - } + if (_sampleunitsormeters != value) + { + _sampleunitsormeters = value; + + SampleUnitsOrMetersChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(SampleUnitsOrMeters)); + } + } } protected Int32 _finetuningstatus; @@ -632,9 +835,15 @@ namespace Tango.BL.Entities set { - _finetuningstatus = value; RaisePropertyChanged(nameof(FineTuningStatus)); - } + if (_finetuningstatus != value) + { + _finetuningstatus = value; + FineTuningStatusChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(FineTuningStatus)); + } + } } protected Nullable<DateTime> _finetuningapprovedate; @@ -654,9 +863,15 @@ namespace Tango.BL.Entities set { - _finetuningapprovedate = value; RaisePropertyChanged(nameof(FineTuningApproveDate)); - } + if (_finetuningapprovedate != value) + { + _finetuningapprovedate = value; + FineTuningApproveDateChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(FineTuningApproveDate)); + } + } } protected Int32 _sampledyestatus; @@ -678,9 +893,15 @@ namespace Tango.BL.Entities set { - _sampledyestatus = value; RaisePropertyChanged(nameof(SampleDyeStatus)); - } + if (_sampledyestatus != value) + { + _sampledyestatus = value; + + SampleDyeStatusChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(SampleDyeStatus)); + } + } } protected Nullable<DateTime> _sampledyeapprovedate; @@ -700,9 +921,15 @@ namespace Tango.BL.Entities set { - _sampledyeapprovedate = value; RaisePropertyChanged(nameof(SampleDyeApproveDate)); - } + if (_sampledyeapprovedate != value) + { + _sampledyeapprovedate = value; + SampleDyeApproveDateChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(SampleDyeApproveDate)); + } + } } protected Int32 _editingstate; @@ -724,9 +951,15 @@ namespace Tango.BL.Entities set { - _editingstate = value; RaisePropertyChanged(nameof(EditingState)); - } + if (_editingstate != value) + { + _editingstate = value; + EditingStateChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(EditingState)); + } + } } protected Double _lengthpercentagefactor; @@ -746,9 +979,15 @@ namespace Tango.BL.Entities set { - _lengthpercentagefactor = value; RaisePropertyChanged(nameof(LengthPercentageFactor)); - } + if (_lengthpercentagefactor != value) + { + _lengthpercentagefactor = value; + + LengthPercentageFactorChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(LengthPercentageFactor)); + } + } } protected ColorSpace _colorspace; @@ -768,9 +1007,15 @@ namespace Tango.BL.Entities set { - _colorspace = value; RaisePropertyChanged(nameof(ColorSpace)); - } + if (_colorspace != value) + { + _colorspace = value; + ColorSpaceChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(ColorSpace)); + } + } } protected Customer _customer; @@ -790,9 +1035,15 @@ namespace Tango.BL.Entities set { - _customer = value; RaisePropertyChanged(nameof(Customer)); - } + if (_customer != value) + { + _customer = value; + CustomerChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Customer)); + } + } } protected SynchronizedObservableCollection<JobRun> _jobruns; @@ -810,9 +1061,15 @@ namespace Tango.BL.Entities set { - _jobruns = value; RaisePropertyChanged(nameof(JobRuns)); - } + if (_jobruns != value) + { + _jobruns = value; + + JobRunsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(JobRuns)); + } + } } protected Machine _machine; @@ -832,9 +1089,15 @@ namespace Tango.BL.Entities set { - _machine = value; RaisePropertyChanged(nameof(Machine)); - } + if (_machine != value) + { + _machine = value; + MachineChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Machine)); + } + } } protected Rml _rml; @@ -854,9 +1117,15 @@ namespace Tango.BL.Entities set { - _rml = value; RaisePropertyChanged(nameof(Rml)); - } + if (_rml != value) + { + _rml = value; + RmlChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Rml)); + } + } } protected SpoolType _spooltype; @@ -876,9 +1145,15 @@ namespace Tango.BL.Entities set { - _spooltype = value; RaisePropertyChanged(nameof(SpoolType)); - } + if (_spooltype != value) + { + _spooltype = value; + + SpoolTypeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(SpoolType)); + } + } } protected User _user; @@ -898,9 +1173,15 @@ namespace Tango.BL.Entities set { - _user = value; RaisePropertyChanged(nameof(User)); - } + if (_user != value) + { + _user = value; + UserChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(User)); + } + } } protected WindingMethod _windingmethod; @@ -920,9 +1201,15 @@ namespace Tango.BL.Entities set { - _windingmethod = value; RaisePropertyChanged(nameof(WindingMethod)); - } + if (_windingmethod != value) + { + _windingmethod = value; + + WindingMethodChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(WindingMethod)); + } + } } protected SynchronizedObservableCollection<Segment> _segments; @@ -940,9 +1227,15 @@ namespace Tango.BL.Entities set { - _segments = value; RaisePropertyChanged(nameof(Segments)); - } + if (_segments != value) + { + _segments = value; + SegmentsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Segments)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs b/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs index 1a00e802d..b4ecf4f5a 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs @@ -25,6 +25,14 @@ namespace Tango.BL.Entities public partial class JobRun : ObservableEntity<JobRun> { + public event EventHandler<DateTime> StartDateChanged; + + public event EventHandler<DateTime> EndDateChanged; + + public event EventHandler<Boolean> SuccessfulChanged; + + public event EventHandler<Job> JobChanged; + protected String _jobguid; /// <summary> @@ -43,9 +51,12 @@ namespace Tango.BL.Entities set { - _jobguid = value; RaisePropertyChanged(nameof(JobGuid)); + if (_jobguid != value) + { + _jobguid = value; + RaisePropertyChanged(nameof(JobGuid)); + } } - } protected DateTime _startdate; @@ -65,9 +76,15 @@ namespace Tango.BL.Entities set { - _startdate = value; RaisePropertyChanged(nameof(StartDate)); - } + if (_startdate != value) + { + _startdate = value; + + StartDateChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(StartDate)); + } + } } protected DateTime _enddate; @@ -87,9 +104,15 @@ namespace Tango.BL.Entities set { - _enddate = value; RaisePropertyChanged(nameof(EndDate)); - } + if (_enddate != value) + { + _enddate = value; + EndDateChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(EndDate)); + } + } } protected Boolean _successful; @@ -109,9 +132,15 @@ namespace Tango.BL.Entities set { - _successful = value; RaisePropertyChanged(nameof(Successful)); - } + if (_successful != value) + { + _successful = value; + + SuccessfulChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Successful)); + } + } } protected Job _job; @@ -131,9 +160,15 @@ namespace Tango.BL.Entities set { - _job = value; RaisePropertyChanged(nameof(Job)); - } + if (_job != value) + { + _job = value; + JobChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Job)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/LinearMassDensityUnit.cs b/Software/Visual_Studio/Tango.BL/Entities/LinearMassDensityUnit.cs index a47b9c8fd..faf85d7e5 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/LinearMassDensityUnit.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/LinearMassDensityUnit.cs @@ -25,6 +25,12 @@ namespace Tango.BL.Entities public partial class LinearMassDensityUnit : ObservableEntity<LinearMassDensityUnit> { + public event EventHandler<String> NameChanged; + + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<SynchronizedObservableCollection<Rml>> RmlsChanged; + protected String _name; /// <summary> @@ -42,9 +48,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected Int32 _code; @@ -64,9 +76,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected SynchronizedObservableCollection<Rml> _rmls; @@ -84,9 +102,15 @@ namespace Tango.BL.Entities set { - _rmls = value; RaisePropertyChanged(nameof(Rmls)); - } + if (_rmls != value) + { + _rmls = value; + + RmlsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Rmls)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/LiquidType.cs b/Software/Visual_Studio/Tango.BL/Entities/LiquidType.cs index 1ab155ed1..886b83e09 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/LiquidType.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/LiquidType.cs @@ -25,6 +25,20 @@ namespace Tango.BL.Entities public partial class LiquidType : ObservableEntity<LiquidType> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<Double> VersionChanged; + + public event EventHandler<Int32> ColorChanged; + + public event EventHandler<SynchronizedObservableCollection<Cat>> CatsChanged; + + public event EventHandler<SynchronizedObservableCollection<IdsPack>> IdsPacksChanged; + + public event EventHandler<SynchronizedObservableCollection<LiquidTypesRml>> LiquidTypesRmlsChanged; + protected Int32 _code; /// <summary> @@ -42,9 +56,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +84,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + NameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Name)); + } + } } protected Double _version; @@ -86,9 +112,15 @@ namespace Tango.BL.Entities set { - _version = value; RaisePropertyChanged(nameof(Version)); - } + if (_version != value) + { + _version = value; + VersionChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Version)); + } + } } protected Int32 _color; @@ -108,9 +140,15 @@ namespace Tango.BL.Entities set { - _color = value; RaisePropertyChanged(nameof(Color)); - } + if (_color != value) + { + _color = value; + + ColorChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Color)); + } + } } protected SynchronizedObservableCollection<Cat> _cats; @@ -128,9 +166,15 @@ namespace Tango.BL.Entities set { - _cats = value; RaisePropertyChanged(nameof(Cats)); - } + if (_cats != value) + { + _cats = value; + + CatsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Cats)); + } + } } protected SynchronizedObservableCollection<IdsPack> _idspacks; @@ -148,9 +192,15 @@ namespace Tango.BL.Entities set { - _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); - } + if (_idspacks != value) + { + _idspacks = value; + IdsPacksChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(IdsPacks)); + } + } } protected SynchronizedObservableCollection<LiquidTypesRml> _liquidtypesrmls; @@ -168,9 +218,15 @@ namespace Tango.BL.Entities set { - _liquidtypesrmls = value; RaisePropertyChanged(nameof(LiquidTypesRmls)); - } + if (_liquidtypesrmls != value) + { + _liquidtypesrmls = value; + + LiquidTypesRmlsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(LiquidTypesRmls)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/LiquidTypesRml.cs b/Software/Visual_Studio/Tango.BL/Entities/LiquidTypesRml.cs index e6ad7b573..6356a68cb 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/LiquidTypesRml.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/LiquidTypesRml.cs @@ -25,6 +25,14 @@ namespace Tango.BL.Entities public partial class LiquidTypesRml : ObservableEntity<LiquidTypesRml> { + public event EventHandler<Double> MaxNlPerCmChanged; + + public event EventHandler<Byte[]> DefaultCatDataChanged; + + public event EventHandler<LiquidType> LiquidTypeChanged; + + public event EventHandler<Rml> RmlChanged; + protected String _liquidtypeguid; /// <summary> @@ -43,9 +51,12 @@ namespace Tango.BL.Entities set { - _liquidtypeguid = value; RaisePropertyChanged(nameof(LiquidTypeGuid)); + if (_liquidtypeguid != value) + { + _liquidtypeguid = value; + RaisePropertyChanged(nameof(LiquidTypeGuid)); + } } - } protected String _rmlguid; @@ -66,9 +77,12 @@ namespace Tango.BL.Entities set { - _rmlguid = value; RaisePropertyChanged(nameof(RmlGuid)); + if (_rmlguid != value) + { + _rmlguid = value; + RaisePropertyChanged(nameof(RmlGuid)); + } } - } protected Double _maxnlpercm; @@ -88,9 +102,15 @@ namespace Tango.BL.Entities set { - _maxnlpercm = value; RaisePropertyChanged(nameof(MaxNlPerCm)); - } + if (_maxnlpercm != value) + { + _maxnlpercm = value; + MaxNlPerCmChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(MaxNlPerCm)); + } + } } protected Byte[] _defaultcatdata; @@ -110,9 +130,15 @@ namespace Tango.BL.Entities set { - _defaultcatdata = value; RaisePropertyChanged(nameof(DefaultCatData)); - } + if (_defaultcatdata != value) + { + _defaultcatdata = value; + + DefaultCatDataChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(DefaultCatData)); + } + } } protected LiquidType _liquidtype; @@ -132,9 +158,15 @@ namespace Tango.BL.Entities set { - _liquidtype = value; RaisePropertyChanged(nameof(LiquidType)); - } + if (_liquidtype != value) + { + _liquidtype = value; + + LiquidTypeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(LiquidType)); + } + } } protected Rml _rml; @@ -154,9 +186,15 @@ namespace Tango.BL.Entities set { - _rml = value; RaisePropertyChanged(nameof(Rml)); - } + if (_rml != value) + { + _rml = value; + RmlChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Rml)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/Machine.cs b/Software/Visual_Studio/Tango.BL/Entities/Machine.cs index a9117845a..1995fea05 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Machine.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Machine.cs @@ -25,6 +25,42 @@ namespace Tango.BL.Entities public partial class Machine : ObservableEntity<Machine> { + public event EventHandler<String> SerialNumberChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<DateTime> ProductionDateChanged; + + public event EventHandler<Boolean> EnableExternalBridgeChanged; + + public event EventHandler<String> ExternalBridgePasswordChanged; + + public event EventHandler<String> TargetJobTypesChanged; + + public event EventHandler<Double> DefaultSegmentLengthChanged; + + public event EventHandler<Boolean> SynchedChanged; + + public event EventHandler<SynchronizedObservableCollection<Cat>> CatsChanged; + + public event EventHandler<ColorSpace> DefaultColorSpaceChanged; + + public event EventHandler<Configuration> ConfigurationChanged; + + public event EventHandler<SynchronizedObservableCollection<Job>> JobsChanged; + + public event EventHandler<MachineVersion> MachineVersionChanged; + + public event EventHandler<SynchronizedObservableCollection<MachinesConfiguration>> MachinesConfigurationsChanged; + + public event EventHandler<SynchronizedObservableCollection<MachinesEvent>> MachinesEventsChanged; + + public event EventHandler<Organization> OrganizationChanged; + + public event EventHandler<Rml> DefaultRmlChanged; + + public event EventHandler<SpoolType> DefaultSpoolTypeChanged; + protected String _serialnumber; /// <summary> @@ -42,9 +78,15 @@ namespace Tango.BL.Entities set { - _serialnumber = value; RaisePropertyChanged(nameof(SerialNumber)); - } + if (_serialnumber != value) + { + _serialnumber = value; + + SerialNumberChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(SerialNumber)); + } + } } protected String _name; @@ -64,9 +106,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected DateTime _productiondate; @@ -86,9 +134,15 @@ namespace Tango.BL.Entities set { - _productiondate = value; RaisePropertyChanged(nameof(ProductionDate)); - } + if (_productiondate != value) + { + _productiondate = value; + ProductionDateChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(ProductionDate)); + } + } } protected String _organizationguid; @@ -109,9 +163,12 @@ namespace Tango.BL.Entities set { - _organizationguid = value; RaisePropertyChanged(nameof(OrganizationGuid)); + if (_organizationguid != value) + { + _organizationguid = value; + RaisePropertyChanged(nameof(OrganizationGuid)); + } } - } protected String _machineversionguid; @@ -132,9 +189,12 @@ namespace Tango.BL.Entities set { - _machineversionguid = value; RaisePropertyChanged(nameof(MachineVersionGuid)); + if (_machineversionguid != value) + { + _machineversionguid = value; + RaisePropertyChanged(nameof(MachineVersionGuid)); + } } - } protected String _configurationguid; @@ -155,9 +215,12 @@ namespace Tango.BL.Entities set { - _configurationguid = value; RaisePropertyChanged(nameof(ConfigurationGuid)); + if (_configurationguid != value) + { + _configurationguid = value; + RaisePropertyChanged(nameof(ConfigurationGuid)); + } } - } protected Boolean _enableexternalbridge; @@ -177,9 +240,15 @@ namespace Tango.BL.Entities set { - _enableexternalbridge = value; RaisePropertyChanged(nameof(EnableExternalBridge)); - } + if (_enableexternalbridge != value) + { + _enableexternalbridge = value; + + EnableExternalBridgeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(EnableExternalBridge)); + } + } } protected String _externalbridgepassword; @@ -199,9 +268,15 @@ namespace Tango.BL.Entities set { - _externalbridgepassword = value; RaisePropertyChanged(nameof(ExternalBridgePassword)); - } + if (_externalbridgepassword != value) + { + _externalbridgepassword = value; + + ExternalBridgePasswordChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(ExternalBridgePassword)); + } + } } protected String _defaultrmlguid; @@ -222,9 +297,12 @@ namespace Tango.BL.Entities set { - _defaultrmlguid = value; RaisePropertyChanged(nameof(DefaultRmlGuid)); + if (_defaultrmlguid != value) + { + _defaultrmlguid = value; + RaisePropertyChanged(nameof(DefaultRmlGuid)); + } } - } protected String _targetjobtypes; @@ -244,9 +322,15 @@ namespace Tango.BL.Entities set { - _targetjobtypes = value; RaisePropertyChanged(nameof(TargetJobTypes)); - } + if (_targetjobtypes != value) + { + _targetjobtypes = value; + + TargetJobTypesChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(TargetJobTypes)); + } + } } protected String _defaultcolorspaceguid; @@ -267,9 +351,12 @@ namespace Tango.BL.Entities set { - _defaultcolorspaceguid = value; RaisePropertyChanged(nameof(DefaultColorSpaceGuid)); + if (_defaultcolorspaceguid != value) + { + _defaultcolorspaceguid = value; + RaisePropertyChanged(nameof(DefaultColorSpaceGuid)); + } } - } protected Double _defaultsegmentlength; @@ -289,9 +376,15 @@ namespace Tango.BL.Entities set { - _defaultsegmentlength = value; RaisePropertyChanged(nameof(DefaultSegmentLength)); - } + if (_defaultsegmentlength != value) + { + _defaultsegmentlength = value; + DefaultSegmentLengthChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(DefaultSegmentLength)); + } + } } protected String _defaultspooltypeguid; @@ -312,9 +405,12 @@ namespace Tango.BL.Entities set { - _defaultspooltypeguid = value; RaisePropertyChanged(nameof(DefaultSpoolTypeGuid)); + if (_defaultspooltypeguid != value) + { + _defaultspooltypeguid = value; + RaisePropertyChanged(nameof(DefaultSpoolTypeGuid)); + } } - } protected Boolean _synched; @@ -334,9 +430,15 @@ namespace Tango.BL.Entities set { - _synched = value; RaisePropertyChanged(nameof(Synched)); - } + if (_synched != value) + { + _synched = value; + + SynchedChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Synched)); + } + } } protected SynchronizedObservableCollection<Cat> _cats; @@ -354,9 +456,15 @@ namespace Tango.BL.Entities set { - _cats = value; RaisePropertyChanged(nameof(Cats)); - } + if (_cats != value) + { + _cats = value; + CatsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Cats)); + } + } } protected ColorSpace _defaultcolorspace; @@ -376,9 +484,15 @@ namespace Tango.BL.Entities set { - _defaultcolorspace = value; RaisePropertyChanged(nameof(DefaultColorSpace)); - } + if (_defaultcolorspace != value) + { + _defaultcolorspace = value; + DefaultColorSpaceChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(DefaultColorSpace)); + } + } } protected Configuration _configuration; @@ -398,9 +512,15 @@ namespace Tango.BL.Entities set { - _configuration = value; RaisePropertyChanged(nameof(Configuration)); - } + if (_configuration != value) + { + _configuration = value; + + ConfigurationChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Configuration)); + } + } } protected SynchronizedObservableCollection<Job> _jobs; @@ -418,9 +538,15 @@ namespace Tango.BL.Entities set { - _jobs = value; RaisePropertyChanged(nameof(Jobs)); - } + if (_jobs != value) + { + _jobs = value; + + JobsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Jobs)); + } + } } protected MachineVersion _machineversion; @@ -440,9 +566,15 @@ namespace Tango.BL.Entities set { - _machineversion = value; RaisePropertyChanged(nameof(MachineVersion)); - } + if (_machineversion != value) + { + _machineversion = value; + + MachineVersionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(MachineVersion)); + } + } } protected SynchronizedObservableCollection<MachinesConfiguration> _machinesconfigurations; @@ -460,9 +592,15 @@ namespace Tango.BL.Entities set { - _machinesconfigurations = value; RaisePropertyChanged(nameof(MachinesConfigurations)); - } + if (_machinesconfigurations != value) + { + _machinesconfigurations = value; + MachinesConfigurationsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(MachinesConfigurations)); + } + } } protected SynchronizedObservableCollection<MachinesEvent> _machinesevents; @@ -480,9 +618,15 @@ namespace Tango.BL.Entities set { - _machinesevents = value; RaisePropertyChanged(nameof(MachinesEvents)); - } + if (_machinesevents != value) + { + _machinesevents = value; + MachinesEventsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(MachinesEvents)); + } + } } protected Organization _organization; @@ -502,9 +646,15 @@ namespace Tango.BL.Entities set { - _organization = value; RaisePropertyChanged(nameof(Organization)); - } + if (_organization != value) + { + _organization = value; + + OrganizationChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Organization)); + } + } } protected Rml _defaultrml; @@ -524,9 +674,15 @@ namespace Tango.BL.Entities set { - _defaultrml = value; RaisePropertyChanged(nameof(DefaultRml)); - } + if (_defaultrml != value) + { + _defaultrml = value; + + DefaultRmlChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(DefaultRml)); + } + } } protected SpoolType _defaultspooltype; @@ -546,9 +702,15 @@ namespace Tango.BL.Entities set { - _defaultspooltype = value; RaisePropertyChanged(nameof(DefaultSpoolType)); - } + if (_defaultspooltype != value) + { + _defaultspooltype = value; + DefaultSpoolTypeChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(DefaultSpoolType)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineStudioVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineStudioVersion.cs index c070d964b..75838118c 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachineStudioVersion.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachineStudioVersion.cs @@ -25,6 +25,16 @@ namespace Tango.BL.Entities public partial class MachineStudioVersion : ObservableEntity<MachineStudioVersion> { + public event EventHandler<String> VersionChanged; + + public event EventHandler<String> FtpFilePathChanged; + + public event EventHandler<String> CommentsChanged; + + public event EventHandler<Boolean> ForceUpdateChanged; + + public event EventHandler<User> UserChanged; + protected String _version; /// <summary> @@ -42,9 +52,15 @@ namespace Tango.BL.Entities set { - _version = value; RaisePropertyChanged(nameof(Version)); - } + if (_version != value) + { + _version = value; + VersionChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Version)); + } + } } protected String _ftpfilepath; @@ -64,9 +80,15 @@ namespace Tango.BL.Entities set { - _ftpfilepath = value; RaisePropertyChanged(nameof(FtpFilePath)); - } + if (_ftpfilepath != value) + { + _ftpfilepath = value; + FtpFilePathChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(FtpFilePath)); + } + } } protected String _comments; @@ -86,9 +108,15 @@ namespace Tango.BL.Entities set { - _comments = value; RaisePropertyChanged(nameof(Comments)); - } + if (_comments != value) + { + _comments = value; + + CommentsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Comments)); + } + } } protected String _userguid; @@ -109,9 +137,12 @@ namespace Tango.BL.Entities set { - _userguid = value; RaisePropertyChanged(nameof(UserGuid)); + if (_userguid != value) + { + _userguid = value; + RaisePropertyChanged(nameof(UserGuid)); + } } - } protected Boolean _forceupdate; @@ -131,9 +162,15 @@ namespace Tango.BL.Entities set { - _forceupdate = value; RaisePropertyChanged(nameof(ForceUpdate)); - } + if (_forceupdate != value) + { + _forceupdate = value; + ForceUpdateChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(ForceUpdate)); + } + } } protected User _user; @@ -153,9 +190,15 @@ namespace Tango.BL.Entities set { - _user = value; RaisePropertyChanged(nameof(User)); - } + if (_user != value) + { + _user = value; + UserChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(User)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs index 605e168cb..b58e56656 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs @@ -25,6 +25,16 @@ namespace Tango.BL.Entities public partial class MachineVersion : ObservableEntity<MachineVersion> { + public event EventHandler<Double> VersionChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<Configuration> DefaultConfigurationChanged; + + public event EventHandler<SynchronizedObservableCollection<Machine>> MachinesChanged; + + public event EventHandler<SynchronizedObservableCollection<TangoVersion>> TangoVersionsChanged; + protected Double _version; /// <summary> @@ -42,9 +52,15 @@ namespace Tango.BL.Entities set { - _version = value; RaisePropertyChanged(nameof(Version)); - } + if (_version != value) + { + _version = value; + VersionChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Version)); + } + } } protected String _name; @@ -64,9 +80,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + NameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Name)); + } + } } protected String _defaultconfigurationguid; @@ -87,9 +109,12 @@ namespace Tango.BL.Entities set { - _defaultconfigurationguid = value; RaisePropertyChanged(nameof(DefaultConfigurationGuid)); + if (_defaultconfigurationguid != value) + { + _defaultconfigurationguid = value; + RaisePropertyChanged(nameof(DefaultConfigurationGuid)); + } } - } protected Configuration _defaultconfiguration; @@ -109,9 +134,15 @@ namespace Tango.BL.Entities set { - _defaultconfiguration = value; RaisePropertyChanged(nameof(DefaultConfiguration)); - } + if (_defaultconfiguration != value) + { + _defaultconfiguration = value; + + DefaultConfigurationChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(DefaultConfiguration)); + } + } } protected SynchronizedObservableCollection<Machine> _machines; @@ -129,9 +160,15 @@ namespace Tango.BL.Entities set { - _machines = value; RaisePropertyChanged(nameof(Machines)); - } + if (_machines != value) + { + _machines = value; + MachinesChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Machines)); + } + } } protected SynchronizedObservableCollection<TangoVersion> _tangoversions; @@ -149,9 +186,15 @@ namespace Tango.BL.Entities set { - _tangoversions = value; RaisePropertyChanged(nameof(TangoVersions)); - } + if (_tangoversions != value) + { + _tangoversions = value; + TangoVersionsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(TangoVersions)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachinesConfiguration.cs b/Software/Visual_Studio/Tango.BL/Entities/MachinesConfiguration.cs index b13b5007c..a7706fd57 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachinesConfiguration.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachinesConfiguration.cs @@ -25,6 +25,10 @@ namespace Tango.BL.Entities public partial class MachinesConfiguration : ObservableEntity<MachinesConfiguration> { + public event EventHandler<Configuration> ConfigurationChanged; + + public event EventHandler<Machine> MachineChanged; + protected String _machineguid; /// <summary> @@ -43,9 +47,12 @@ namespace Tango.BL.Entities set { - _machineguid = value; RaisePropertyChanged(nameof(MachineGuid)); + if (_machineguid != value) + { + _machineguid = value; + RaisePropertyChanged(nameof(MachineGuid)); + } } - } protected String _configurationguid; @@ -66,9 +73,12 @@ namespace Tango.BL.Entities set { - _configurationguid = value; RaisePropertyChanged(nameof(ConfigurationGuid)); + if (_configurationguid != value) + { + _configurationguid = value; + RaisePropertyChanged(nameof(ConfigurationGuid)); + } } - } protected Configuration _configuration; @@ -88,9 +98,15 @@ namespace Tango.BL.Entities set { - _configuration = value; RaisePropertyChanged(nameof(Configuration)); - } + if (_configuration != value) + { + _configuration = value; + ConfigurationChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Configuration)); + } + } } protected Machine _machine; @@ -110,9 +126,15 @@ namespace Tango.BL.Entities set { - _machine = value; RaisePropertyChanged(nameof(Machine)); - } + if (_machine != value) + { + _machine = value; + MachineChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Machine)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachinesEvent.cs b/Software/Visual_Studio/Tango.BL/Entities/MachinesEvent.cs index b535d1380..c327677bf 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachinesEvent.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachinesEvent.cs @@ -25,6 +25,18 @@ namespace Tango.BL.Entities public partial class MachinesEvent : ObservableEntity<MachinesEvent> { + public event EventHandler<String> HostNameChanged; + + public event EventHandler<DateTime> DateTimeChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<EventType> EventTypeChanged; + + public event EventHandler<Machine> MachineChanged; + + public event EventHandler<User> UserChanged; + protected String _hostname; /// <summary> @@ -42,9 +54,15 @@ namespace Tango.BL.Entities set { - _hostname = value; RaisePropertyChanged(nameof(HostName)); - } + if (_hostname != value) + { + _hostname = value; + HostNameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HostName)); + } + } } protected String _machineguid; @@ -65,9 +83,12 @@ namespace Tango.BL.Entities set { - _machineguid = value; RaisePropertyChanged(nameof(MachineGuid)); + if (_machineguid != value) + { + _machineguid = value; + RaisePropertyChanged(nameof(MachineGuid)); + } } - } protected String _eventtypeguid; @@ -88,9 +109,12 @@ namespace Tango.BL.Entities set { - _eventtypeguid = value; RaisePropertyChanged(nameof(EventTypeGuid)); + if (_eventtypeguid != value) + { + _eventtypeguid = value; + RaisePropertyChanged(nameof(EventTypeGuid)); + } } - } protected String _userguid; @@ -111,9 +135,12 @@ namespace Tango.BL.Entities set { - _userguid = value; RaisePropertyChanged(nameof(UserGuid)); + if (_userguid != value) + { + _userguid = value; + RaisePropertyChanged(nameof(UserGuid)); + } } - } protected DateTime _datetime; @@ -133,9 +160,15 @@ namespace Tango.BL.Entities set { - _datetime = value; RaisePropertyChanged(nameof(DateTime)); - } + if (_datetime != value) + { + _datetime = value; + + DateTimeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(DateTime)); + } + } } protected String _description; @@ -155,9 +188,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + DescriptionChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Description)); + } + } } protected EventType _eventtype; @@ -177,9 +216,15 @@ namespace Tango.BL.Entities set { - _eventtype = value; RaisePropertyChanged(nameof(EventType)); - } + if (_eventtype != value) + { + _eventtype = value; + + EventTypeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(EventType)); + } + } } protected Machine _machine; @@ -199,9 +244,15 @@ namespace Tango.BL.Entities set { - _machine = value; RaisePropertyChanged(nameof(Machine)); - } + if (_machine != value) + { + _machine = value; + + MachineChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Machine)); + } + } } protected User _user; @@ -221,9 +272,15 @@ namespace Tango.BL.Entities set { - _user = value; RaisePropertyChanged(nameof(User)); - } + if (_user != value) + { + _user = value; + + UserChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(User)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaColor.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaColor.cs index c61f221d5..c09b606ae 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MediaColor.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MediaColor.cs @@ -25,6 +25,16 @@ namespace Tango.BL.Entities public partial class MediaColor : ObservableEntity<MediaColor> { + public event EventHandler<String> NameChanged; + + public event EventHandler<Double> LChanged; + + public event EventHandler<Double> AChanged; + + public event EventHandler<Double> BChanged; + + public event EventHandler<SynchronizedObservableCollection<Rml>> RmlsChanged; + protected String _name; /// <summary> @@ -42,9 +52,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected Double _l; @@ -64,9 +80,15 @@ namespace Tango.BL.Entities set { - _l = value; RaisePropertyChanged(nameof(L)); - } + if (_l != value) + { + _l = value; + + LChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(L)); + } + } } protected Double _a; @@ -86,9 +108,15 @@ namespace Tango.BL.Entities set { - _a = value; RaisePropertyChanged(nameof(A)); - } + if (_a != value) + { + _a = value; + + AChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(A)); + } + } } protected Double _b; @@ -108,9 +136,15 @@ namespace Tango.BL.Entities set { - _b = value; RaisePropertyChanged(nameof(B)); - } + if (_b != value) + { + _b = value; + BChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(B)); + } + } } protected SynchronizedObservableCollection<Rml> _rmls; @@ -128,9 +162,15 @@ namespace Tango.BL.Entities set { - _rmls = value; RaisePropertyChanged(nameof(Rmls)); - } + if (_rmls != value) + { + _rmls = value; + RmlsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Rmls)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaCondition.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaCondition.cs index 02a4cbd42..6dcb5f972 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MediaCondition.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MediaCondition.cs @@ -25,6 +25,12 @@ namespace Tango.BL.Entities public partial class MediaCondition : ObservableEntity<MediaCondition> { + public event EventHandler<String> NameChanged; + + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<SynchronizedObservableCollection<Rml>> RmlsChanged; + protected String _name; /// <summary> @@ -42,9 +48,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected Int32 _code; @@ -64,9 +76,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected SynchronizedObservableCollection<Rml> _rmls; @@ -84,9 +102,15 @@ namespace Tango.BL.Entities set { - _rmls = value; RaisePropertyChanged(nameof(Rmls)); - } + if (_rmls != value) + { + _rmls = value; + + RmlsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Rmls)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaMaterial.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaMaterial.cs index de34b3b2a..c77d5fb27 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MediaMaterial.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MediaMaterial.cs @@ -25,6 +25,12 @@ namespace Tango.BL.Entities public partial class MediaMaterial : ObservableEntity<MediaMaterial> { + public event EventHandler<String> NameChanged; + + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<SynchronizedObservableCollection<Rml>> RmlsChanged; + protected String _name; /// <summary> @@ -42,9 +48,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected Int32 _code; @@ -64,9 +76,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected SynchronizedObservableCollection<Rml> _rmls; @@ -84,9 +102,15 @@ namespace Tango.BL.Entities set { - _rmls = value; RaisePropertyChanged(nameof(Rmls)); - } + if (_rmls != value) + { + _rmls = value; + + RmlsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Rmls)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaPurpos.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaPurpos.cs index 2d5cd30c5..6ddb194b4 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MediaPurpos.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MediaPurpos.cs @@ -25,6 +25,12 @@ namespace Tango.BL.Entities public partial class MediaPurpos : ObservableEntity<MediaPurpos> { + public event EventHandler<String> NameChanged; + + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<SynchronizedObservableCollection<Rml>> RmlsChanged; + protected String _name; /// <summary> @@ -42,9 +48,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected Int32 _code; @@ -64,9 +76,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected SynchronizedObservableCollection<Rml> _rmls; @@ -84,9 +102,15 @@ namespace Tango.BL.Entities set { - _rmls = value; RaisePropertyChanged(nameof(Rmls)); - } + if (_rmls != value) + { + _rmls = value; + + RmlsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Rmls)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/MidTankType.cs b/Software/Visual_Studio/Tango.BL/Entities/MidTankType.cs index ab9c79e7a..a6e629c23 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MidTankType.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MidTankType.cs @@ -25,6 +25,14 @@ namespace Tango.BL.Entities public partial class MidTankType : ObservableEntity<MidTankType> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<Double> LiterCapacityChanged; + + public event EventHandler<SynchronizedObservableCollection<IdsPack>> IdsPacksChanged; + protected Int32 _code; /// <summary> @@ -42,9 +50,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +78,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + NameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Name)); + } + } } protected Double _litercapacity; @@ -86,9 +106,15 @@ namespace Tango.BL.Entities set { - _litercapacity = value; RaisePropertyChanged(nameof(LiterCapacity)); - } + if (_litercapacity != value) + { + _litercapacity = value; + + LiterCapacityChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(LiterCapacity)); + } + } } protected SynchronizedObservableCollection<IdsPack> _idspacks; @@ -106,9 +132,15 @@ namespace Tango.BL.Entities set { - _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); - } + if (_idspacks != value) + { + _idspacks = value; + IdsPacksChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(IdsPacks)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/Organization.cs b/Software/Visual_Studio/Tango.BL/Entities/Organization.cs index b1eef5ec2..43206dd51 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Organization.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Organization.cs @@ -25,6 +25,18 @@ namespace Tango.BL.Entities public partial class Organization : ObservableEntity<Organization> { + public event EventHandler<String> NameChanged; + + public event EventHandler<Address> AddressChanged; + + public event EventHandler<Contact> ContactChanged; + + public event EventHandler<SynchronizedObservableCollection<Customer>> CustomersChanged; + + public event EventHandler<SynchronizedObservableCollection<Machine>> MachinesChanged; + + public event EventHandler<SynchronizedObservableCollection<User>> UsersChanged; + protected String _name; /// <summary> @@ -42,9 +54,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + NameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Name)); + } + } } protected String _contactguid; @@ -65,9 +83,12 @@ namespace Tango.BL.Entities set { - _contactguid = value; RaisePropertyChanged(nameof(ContactGuid)); + if (_contactguid != value) + { + _contactguid = value; + RaisePropertyChanged(nameof(ContactGuid)); + } } - } protected String _addressguid; @@ -88,9 +109,12 @@ namespace Tango.BL.Entities set { - _addressguid = value; RaisePropertyChanged(nameof(AddressGuid)); + if (_addressguid != value) + { + _addressguid = value; + RaisePropertyChanged(nameof(AddressGuid)); + } } - } protected Address _address; @@ -110,9 +134,15 @@ namespace Tango.BL.Entities set { - _address = value; RaisePropertyChanged(nameof(Address)); - } + if (_address != value) + { + _address = value; + + AddressChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Address)); + } + } } protected Contact _contact; @@ -132,9 +162,15 @@ namespace Tango.BL.Entities set { - _contact = value; RaisePropertyChanged(nameof(Contact)); - } + if (_contact != value) + { + _contact = value; + ContactChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Contact)); + } + } } protected SynchronizedObservableCollection<Customer> _customers; @@ -152,9 +188,15 @@ namespace Tango.BL.Entities set { - _customers = value; RaisePropertyChanged(nameof(Customers)); - } + if (_customers != value) + { + _customers = value; + + CustomersChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Customers)); + } + } } protected SynchronizedObservableCollection<Machine> _machines; @@ -172,9 +214,15 @@ namespace Tango.BL.Entities set { - _machines = value; RaisePropertyChanged(nameof(Machines)); - } + if (_machines != value) + { + _machines = value; + + MachinesChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Machines)); + } + } } protected SynchronizedObservableCollection<User> _users; @@ -192,9 +240,15 @@ namespace Tango.BL.Entities set { - _users = value; RaisePropertyChanged(nameof(Users)); - } + if (_users != value) + { + _users = value; + + UsersChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Users)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/Permission.cs b/Software/Visual_Studio/Tango.BL/Entities/Permission.cs index 4fdb22389..385186794 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Permission.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Permission.cs @@ -25,6 +25,14 @@ namespace Tango.BL.Entities public partial class Permission : ObservableEntity<Permission> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<SynchronizedObservableCollection<RolesPermission>> RolesPermissionsChanged; + protected Int32 _code; /// <summary> @@ -42,9 +50,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +78,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + NameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Name)); + } + } } protected String _description; @@ -86,9 +106,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + + DescriptionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Description)); + } + } } protected SynchronizedObservableCollection<RolesPermission> _rolespermissions; @@ -106,9 +132,15 @@ namespace Tango.BL.Entities set { - _rolespermissions = value; RaisePropertyChanged(nameof(RolesPermissions)); - } + if (_rolespermissions != value) + { + _rolespermissions = value; + RolesPermissionsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(RolesPermissions)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTable.cs b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTable.cs index 8192cfbfa..ef78b08ab 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTable.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTable.cs @@ -25,6 +25,48 @@ namespace Tango.BL.Entities public partial class ProcessParametersTable : ObservableEntity<ProcessParametersTable> { + public event EventHandler<String> NameChanged; + + public event EventHandler<Double> DyeingSpeedChanged; + + public event EventHandler<Double> MinInkUptakeChanged; + + public event EventHandler<Double> FeederTensionChanged; + + public event EventHandler<Double> PullerTensionChanged; + + public event EventHandler<Double> WinderTensionChanged; + + public event EventHandler<Double> MixerTempChanged; + + public event EventHandler<Double> HeadZone1TempChanged; + + public event EventHandler<Double> HeadZone2TempChanged; + + public event EventHandler<Double> HeadZone3TempChanged; + + public event EventHandler<Double> HeadZone4TempChanged; + + public event EventHandler<Double> HeadZone5TempChanged; + + public event EventHandler<Double> HeadZone6TempChanged; + + public event EventHandler<Double> DryerAirFlowChanged; + + public event EventHandler<Double> DryerZone1TempChanged; + + public event EventHandler<Double> DryerZone2TempChanged; + + public event EventHandler<Double> DryerZone3TempChanged; + + public event EventHandler<Double> DryerBufferLengthChanged; + + public event EventHandler<Double> HeadAirFlowChanged; + + public event EventHandler<Int32> TableIndexChanged; + + public event EventHandler<ProcessParametersTablesGroup> ProcessParametersTablesGroupChanged; + protected String _name; /// <summary> @@ -42,9 +84,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + NameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Name)); + } + } } protected Double _dyeingspeed; @@ -64,9 +112,15 @@ namespace Tango.BL.Entities set { - _dyeingspeed = value; RaisePropertyChanged(nameof(DyeingSpeed)); - } + if (_dyeingspeed != value) + { + _dyeingspeed = value; + DyeingSpeedChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(DyeingSpeed)); + } + } } protected Double _mininkuptake; @@ -86,9 +140,15 @@ namespace Tango.BL.Entities set { - _mininkuptake = value; RaisePropertyChanged(nameof(MinInkUptake)); - } + if (_mininkuptake != value) + { + _mininkuptake = value; + MinInkUptakeChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(MinInkUptake)); + } + } } protected Double _feedertension; @@ -108,9 +168,15 @@ namespace Tango.BL.Entities set { - _feedertension = value; RaisePropertyChanged(nameof(FeederTension)); - } + if (_feedertension != value) + { + _feedertension = value; + FeederTensionChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(FeederTension)); + } + } } protected Double _pullertension; @@ -130,9 +196,15 @@ namespace Tango.BL.Entities set { - _pullertension = value; RaisePropertyChanged(nameof(PullerTension)); - } + if (_pullertension != value) + { + _pullertension = value; + + PullerTensionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(PullerTension)); + } + } } protected Double _windertension; @@ -152,9 +224,15 @@ namespace Tango.BL.Entities set { - _windertension = value; RaisePropertyChanged(nameof(WinderTension)); - } + if (_windertension != value) + { + _windertension = value; + + WinderTensionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(WinderTension)); + } + } } protected Double _mixertemp; @@ -174,9 +252,15 @@ namespace Tango.BL.Entities set { - _mixertemp = value; RaisePropertyChanged(nameof(MixerTemp)); - } + if (_mixertemp != value) + { + _mixertemp = value; + + MixerTempChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(MixerTemp)); + } + } } protected Double _headzone1temp; @@ -196,9 +280,15 @@ namespace Tango.BL.Entities set { - _headzone1temp = value; RaisePropertyChanged(nameof(HeadZone1Temp)); - } + if (_headzone1temp != value) + { + _headzone1temp = value; + HeadZone1TempChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HeadZone1Temp)); + } + } } protected Double _headzone2temp; @@ -218,9 +308,15 @@ namespace Tango.BL.Entities set { - _headzone2temp = value; RaisePropertyChanged(nameof(HeadZone2Temp)); - } + if (_headzone2temp != value) + { + _headzone2temp = value; + HeadZone2TempChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HeadZone2Temp)); + } + } } protected Double _headzone3temp; @@ -240,9 +336,15 @@ namespace Tango.BL.Entities set { - _headzone3temp = value; RaisePropertyChanged(nameof(HeadZone3Temp)); - } + if (_headzone3temp != value) + { + _headzone3temp = value; + HeadZone3TempChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HeadZone3Temp)); + } + } } protected Double _headzone4temp; @@ -262,9 +364,15 @@ namespace Tango.BL.Entities set { - _headzone4temp = value; RaisePropertyChanged(nameof(HeadZone4Temp)); - } + if (_headzone4temp != value) + { + _headzone4temp = value; + HeadZone4TempChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(HeadZone4Temp)); + } + } } protected Double _headzone5temp; @@ -284,9 +392,15 @@ namespace Tango.BL.Entities set { - _headzone5temp = value; RaisePropertyChanged(nameof(HeadZone5Temp)); - } + if (_headzone5temp != value) + { + _headzone5temp = value; + + HeadZone5TempChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(HeadZone5Temp)); + } + } } protected Double _headzone6temp; @@ -306,9 +420,15 @@ namespace Tango.BL.Entities set { - _headzone6temp = value; RaisePropertyChanged(nameof(HeadZone6Temp)); - } + if (_headzone6temp != value) + { + _headzone6temp = value; + + HeadZone6TempChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(HeadZone6Temp)); + } + } } protected Double _dryerairflow; @@ -328,9 +448,15 @@ namespace Tango.BL.Entities set { - _dryerairflow = value; RaisePropertyChanged(nameof(DryerAirFlow)); - } + if (_dryerairflow != value) + { + _dryerairflow = value; + + DryerAirFlowChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(DryerAirFlow)); + } + } } protected Double _dryerzone1temp; @@ -350,9 +476,15 @@ namespace Tango.BL.Entities set { - _dryerzone1temp = value; RaisePropertyChanged(nameof(DryerZone1Temp)); - } + if (_dryerzone1temp != value) + { + _dryerzone1temp = value; + DryerZone1TempChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(DryerZone1Temp)); + } + } } protected Double _dryerzone2temp; @@ -372,9 +504,15 @@ namespace Tango.BL.Entities set { - _dryerzone2temp = value; RaisePropertyChanged(nameof(DryerZone2Temp)); - } + if (_dryerzone2temp != value) + { + _dryerzone2temp = value; + DryerZone2TempChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(DryerZone2Temp)); + } + } } protected Double _dryerzone3temp; @@ -394,9 +532,15 @@ namespace Tango.BL.Entities set { - _dryerzone3temp = value; RaisePropertyChanged(nameof(DryerZone3Temp)); - } + if (_dryerzone3temp != value) + { + _dryerzone3temp = value; + DryerZone3TempChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(DryerZone3Temp)); + } + } } protected Double _dryerbufferlength; @@ -416,9 +560,15 @@ namespace Tango.BL.Entities set { - _dryerbufferlength = value; RaisePropertyChanged(nameof(DryerBufferLength)); - } + if (_dryerbufferlength != value) + { + _dryerbufferlength = value; + DryerBufferLengthChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(DryerBufferLength)); + } + } } protected Double _headairflow; @@ -438,9 +588,15 @@ namespace Tango.BL.Entities set { - _headairflow = value; RaisePropertyChanged(nameof(HeadAirFlow)); - } + if (_headairflow != value) + { + _headairflow = value; + + HeadAirFlowChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(HeadAirFlow)); + } + } } protected String _processparameterstablesgroupguid; @@ -461,9 +617,12 @@ namespace Tango.BL.Entities set { - _processparameterstablesgroupguid = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroupGuid)); + if (_processparameterstablesgroupguid != value) + { + _processparameterstablesgroupguid = value; + RaisePropertyChanged(nameof(ProcessParametersTablesGroupGuid)); + } } - } protected Int32 _tableindex; @@ -483,9 +642,15 @@ namespace Tango.BL.Entities set { - _tableindex = value; RaisePropertyChanged(nameof(TableIndex)); - } + if (_tableindex != value) + { + _tableindex = value; + TableIndexChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(TableIndex)); + } + } } protected ProcessParametersTablesGroup _processparameterstablesgroup; @@ -505,9 +670,15 @@ namespace Tango.BL.Entities set { - _processparameterstablesgroup = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroup)); - } + if (_processparameterstablesgroup != value) + { + _processparameterstablesgroup = value; + ProcessParametersTablesGroupChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(ProcessParametersTablesGroup)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTablesGroup.cs b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTablesGroup.cs index b989138d2..62ef66e82 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTablesGroup.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTablesGroup.cs @@ -25,6 +25,16 @@ namespace Tango.BL.Entities public partial class ProcessParametersTablesGroup : ObservableEntity<ProcessParametersTablesGroup> { + public event EventHandler<String> NameChanged; + + public event EventHandler<Boolean> ActiveChanged; + + public event EventHandler<DateTime> SaveDateChanged; + + public event EventHandler<SynchronizedObservableCollection<ProcessParametersTable>> ProcessParametersTablesChanged; + + public event EventHandler<Rml> RmlChanged; + protected String _rmlguid; /// <summary> @@ -43,9 +53,12 @@ namespace Tango.BL.Entities set { - _rmlguid = value; RaisePropertyChanged(nameof(RmlGuid)); + if (_rmlguid != value) + { + _rmlguid = value; + RaisePropertyChanged(nameof(RmlGuid)); + } } - } protected String _name; @@ -65,9 +78,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected Boolean _active; @@ -87,9 +106,15 @@ namespace Tango.BL.Entities set { - _active = value; RaisePropertyChanged(nameof(Active)); - } + if (_active != value) + { + _active = value; + + ActiveChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Active)); + } + } } protected DateTime _savedate; @@ -109,9 +134,15 @@ namespace Tango.BL.Entities set { - _savedate = value; RaisePropertyChanged(nameof(SaveDate)); - } + if (_savedate != value) + { + _savedate = value; + + SaveDateChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(SaveDate)); + } + } } protected SynchronizedObservableCollection<ProcessParametersTable> _processparameterstables; @@ -129,9 +160,15 @@ namespace Tango.BL.Entities set { - _processparameterstables = value; RaisePropertyChanged(nameof(ProcessParametersTables)); - } + if (_processparameterstables != value) + { + _processparameterstables = value; + ProcessParametersTablesChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(ProcessParametersTables)); + } + } } protected Rml _rml; @@ -151,9 +188,15 @@ namespace Tango.BL.Entities set { - _rml = value; RaisePropertyChanged(nameof(Rml)); - } + if (_rml != value) + { + _rml = value; + RmlChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Rml)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs index 1e37993c4..c7c3077d7 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs @@ -25,6 +25,58 @@ namespace Tango.BL.Entities public partial class Rml : ObservableEntity<Rml> { + public event EventHandler<String> NameChanged; + + public event EventHandler<String> ManufacturerChanged; + + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<Double> FiberSizeChanged; + + public event EventHandler<Int32> NumberOfFibersChanged; + + public event EventHandler<Int32> PliesPerFiberChanged; + + public event EventHandler<Int32> PliesPerThreadChanged; + + public event EventHandler<Boolean> TwistedChanged; + + public event EventHandler<Boolean> AirEntanglementChanged; + + public event EventHandler<Boolean> LubricantChanged; + + public event EventHandler<Double> TensileStrengthChanged; + + public event EventHandler<Double> ElongationAtBreakPercentageChanged; + + public event EventHandler<Double> EstimatedThreadDiameterChanged; + + public event EventHandler<SynchronizedObservableCollection<Cat>> CatsChanged; + + public event EventHandler<SynchronizedObservableCollection<Cct>> CctsChanged; + + public event EventHandler<FiberShape> FiberShapeChanged; + + public event EventHandler<FiberSynth> FiberSynthChanged; + + public event EventHandler<SynchronizedObservableCollection<Job>> JobsChanged; + + public event EventHandler<LinearMassDensityUnit> LinearMassDensityUnitChanged; + + public event EventHandler<SynchronizedObservableCollection<LiquidTypesRml>> LiquidTypesRmlsChanged; + + public event EventHandler<SynchronizedObservableCollection<Machine>> MachinesChanged; + + public event EventHandler<MediaColor> MediaColorChanged; + + public event EventHandler<MediaCondition> MediaConditionChanged; + + public event EventHandler<MediaMaterial> MediaMaterialChanged; + + public event EventHandler<MediaPurpos> MediaPurposeChanged; + + public event EventHandler<SynchronizedObservableCollection<ProcessParametersTablesGroup>> ProcessParametersTablesGroupsChanged; + protected String _name; /// <summary> @@ -42,9 +94,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected String _manufacturer; @@ -64,9 +122,15 @@ namespace Tango.BL.Entities set { - _manufacturer = value; RaisePropertyChanged(nameof(Manufacturer)); - } + if (_manufacturer != value) + { + _manufacturer = value; + ManufacturerChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Manufacturer)); + } + } } protected Int32 _code; @@ -86,9 +150,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _mediamaterialguid; @@ -109,9 +179,12 @@ namespace Tango.BL.Entities set { - _mediamaterialguid = value; RaisePropertyChanged(nameof(MediaMaterialGuid)); + if (_mediamaterialguid != value) + { + _mediamaterialguid = value; + RaisePropertyChanged(nameof(MediaMaterialGuid)); + } } - } protected String _mediacolorguid; @@ -132,9 +205,12 @@ namespace Tango.BL.Entities set { - _mediacolorguid = value; RaisePropertyChanged(nameof(MediaColorGuid)); + if (_mediacolorguid != value) + { + _mediacolorguid = value; + RaisePropertyChanged(nameof(MediaColorGuid)); + } } - } protected String _mediapurposeguid; @@ -155,9 +231,12 @@ namespace Tango.BL.Entities set { - _mediapurposeguid = value; RaisePropertyChanged(nameof(MediaPurposeGuid)); + if (_mediapurposeguid != value) + { + _mediapurposeguid = value; + RaisePropertyChanged(nameof(MediaPurposeGuid)); + } } - } protected String _mediaconditionguid; @@ -178,9 +257,12 @@ namespace Tango.BL.Entities set { - _mediaconditionguid = value; RaisePropertyChanged(nameof(MediaConditionGuid)); + if (_mediaconditionguid != value) + { + _mediaconditionguid = value; + RaisePropertyChanged(nameof(MediaConditionGuid)); + } } - } protected String _linearmassdensityunitguid; @@ -201,9 +283,12 @@ namespace Tango.BL.Entities set { - _linearmassdensityunitguid = value; RaisePropertyChanged(nameof(LinearMassDensityUnitGuid)); + if (_linearmassdensityunitguid != value) + { + _linearmassdensityunitguid = value; + RaisePropertyChanged(nameof(LinearMassDensityUnitGuid)); + } } - } protected String _fibershapeguid; @@ -224,9 +309,12 @@ namespace Tango.BL.Entities set { - _fibershapeguid = value; RaisePropertyChanged(nameof(FiberShapeGuid)); + if (_fibershapeguid != value) + { + _fibershapeguid = value; + RaisePropertyChanged(nameof(FiberShapeGuid)); + } } - } protected String _fibersynthguid; @@ -247,9 +335,12 @@ namespace Tango.BL.Entities set { - _fibersynthguid = value; RaisePropertyChanged(nameof(FiberSynthGuid)); + if (_fibersynthguid != value) + { + _fibersynthguid = value; + RaisePropertyChanged(nameof(FiberSynthGuid)); + } } - } protected Double _fibersize; @@ -269,9 +360,15 @@ namespace Tango.BL.Entities set { - _fibersize = value; RaisePropertyChanged(nameof(FiberSize)); - } + if (_fibersize != value) + { + _fibersize = value; + + FiberSizeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(FiberSize)); + } + } } protected Int32 _numberoffibers; @@ -291,9 +388,15 @@ namespace Tango.BL.Entities set { - _numberoffibers = value; RaisePropertyChanged(nameof(NumberOfFibers)); - } + if (_numberoffibers != value) + { + _numberoffibers = value; + NumberOfFibersChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(NumberOfFibers)); + } + } } protected Int32 _pliesperfiber; @@ -313,9 +416,15 @@ namespace Tango.BL.Entities set { - _pliesperfiber = value; RaisePropertyChanged(nameof(PliesPerFiber)); - } + if (_pliesperfiber != value) + { + _pliesperfiber = value; + PliesPerFiberChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(PliesPerFiber)); + } + } } protected Int32 _pliesperthread; @@ -335,9 +444,15 @@ namespace Tango.BL.Entities set { - _pliesperthread = value; RaisePropertyChanged(nameof(PliesPerThread)); - } + if (_pliesperthread != value) + { + _pliesperthread = value; + + PliesPerThreadChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(PliesPerThread)); + } + } } protected Boolean _twisted; @@ -357,9 +472,15 @@ namespace Tango.BL.Entities set { - _twisted = value; RaisePropertyChanged(nameof(Twisted)); - } + if (_twisted != value) + { + _twisted = value; + + TwistedChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Twisted)); + } + } } protected Boolean _airentanglement; @@ -379,9 +500,15 @@ namespace Tango.BL.Entities set { - _airentanglement = value; RaisePropertyChanged(nameof(AirEntanglement)); - } + if (_airentanglement != value) + { + _airentanglement = value; + AirEntanglementChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(AirEntanglement)); + } + } } protected Boolean _lubricant; @@ -401,9 +528,15 @@ namespace Tango.BL.Entities set { - _lubricant = value; RaisePropertyChanged(nameof(Lubricant)); - } + if (_lubricant != value) + { + _lubricant = value; + + LubricantChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Lubricant)); + } + } } protected Double _tensilestrength; @@ -423,9 +556,15 @@ namespace Tango.BL.Entities set { - _tensilestrength = value; RaisePropertyChanged(nameof(TensileStrength)); - } + if (_tensilestrength != value) + { + _tensilestrength = value; + + TensileStrengthChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(TensileStrength)); + } + } } protected Double _elongationatbreakpercentage; @@ -445,9 +584,15 @@ namespace Tango.BL.Entities set { - _elongationatbreakpercentage = value; RaisePropertyChanged(nameof(ElongationAtBreakPercentage)); - } + if (_elongationatbreakpercentage != value) + { + _elongationatbreakpercentage = value; + ElongationAtBreakPercentageChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(ElongationAtBreakPercentage)); + } + } } protected Double _estimatedthreaddiameter; @@ -467,9 +612,15 @@ namespace Tango.BL.Entities set { - _estimatedthreaddiameter = value; RaisePropertyChanged(nameof(EstimatedThreadDiameter)); - } + if (_estimatedthreaddiameter != value) + { + _estimatedthreaddiameter = value; + EstimatedThreadDiameterChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(EstimatedThreadDiameter)); + } + } } protected SynchronizedObservableCollection<Cat> _cats; @@ -487,9 +638,15 @@ namespace Tango.BL.Entities set { - _cats = value; RaisePropertyChanged(nameof(Cats)); - } + if (_cats != value) + { + _cats = value; + + CatsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Cats)); + } + } } protected SynchronizedObservableCollection<Cct> _ccts; @@ -507,9 +664,15 @@ namespace Tango.BL.Entities set { - _ccts = value; RaisePropertyChanged(nameof(Ccts)); - } + if (_ccts != value) + { + _ccts = value; + + CctsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Ccts)); + } + } } protected FiberShape _fibershape; @@ -529,9 +692,15 @@ namespace Tango.BL.Entities set { - _fibershape = value; RaisePropertyChanged(nameof(FiberShape)); - } + if (_fibershape != value) + { + _fibershape = value; + FiberShapeChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(FiberShape)); + } + } } protected FiberSynth _fibersynth; @@ -551,9 +720,15 @@ namespace Tango.BL.Entities set { - _fibersynth = value; RaisePropertyChanged(nameof(FiberSynth)); - } + if (_fibersynth != value) + { + _fibersynth = value; + + FiberSynthChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(FiberSynth)); + } + } } protected SynchronizedObservableCollection<Job> _jobs; @@ -571,9 +746,15 @@ namespace Tango.BL.Entities set { - _jobs = value; RaisePropertyChanged(nameof(Jobs)); - } + if (_jobs != value) + { + _jobs = value; + + JobsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Jobs)); + } + } } protected LinearMassDensityUnit _linearmassdensityunit; @@ -593,9 +774,15 @@ namespace Tango.BL.Entities set { - _linearmassdensityunit = value; RaisePropertyChanged(nameof(LinearMassDensityUnit)); - } + if (_linearmassdensityunit != value) + { + _linearmassdensityunit = value; + LinearMassDensityUnitChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(LinearMassDensityUnit)); + } + } } protected SynchronizedObservableCollection<LiquidTypesRml> _liquidtypesrmls; @@ -613,9 +800,15 @@ namespace Tango.BL.Entities set { - _liquidtypesrmls = value; RaisePropertyChanged(nameof(LiquidTypesRmls)); - } + if (_liquidtypesrmls != value) + { + _liquidtypesrmls = value; + LiquidTypesRmlsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(LiquidTypesRmls)); + } + } } protected SynchronizedObservableCollection<Machine> _machines; @@ -633,9 +826,15 @@ namespace Tango.BL.Entities set { - _machines = value; RaisePropertyChanged(nameof(Machines)); - } + if (_machines != value) + { + _machines = value; + + MachinesChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Machines)); + } + } } protected MediaColor _mediacolor; @@ -655,9 +854,15 @@ namespace Tango.BL.Entities set { - _mediacolor = value; RaisePropertyChanged(nameof(MediaColor)); - } + if (_mediacolor != value) + { + _mediacolor = value; + + MediaColorChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(MediaColor)); + } + } } protected MediaCondition _mediacondition; @@ -677,9 +882,15 @@ namespace Tango.BL.Entities set { - _mediacondition = value; RaisePropertyChanged(nameof(MediaCondition)); - } + if (_mediacondition != value) + { + _mediacondition = value; + MediaConditionChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(MediaCondition)); + } + } } protected MediaMaterial _mediamaterial; @@ -699,9 +910,15 @@ namespace Tango.BL.Entities set { - _mediamaterial = value; RaisePropertyChanged(nameof(MediaMaterial)); - } + if (_mediamaterial != value) + { + _mediamaterial = value; + + MediaMaterialChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(MediaMaterial)); + } + } } protected MediaPurpos _mediapurpose; @@ -721,9 +938,15 @@ namespace Tango.BL.Entities set { - _mediapurpose = value; RaisePropertyChanged(nameof(MediaPurpose)); - } + if (_mediapurpose != value) + { + _mediapurpose = value; + + MediaPurposeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(MediaPurpose)); + } + } } protected SynchronizedObservableCollection<ProcessParametersTablesGroup> _processparameterstablesgroups; @@ -741,9 +964,15 @@ namespace Tango.BL.Entities set { - _processparameterstablesgroups = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroups)); - } + if (_processparameterstablesgroups != value) + { + _processparameterstablesgroups = value; + + ProcessParametersTablesGroupsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(ProcessParametersTablesGroups)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/Role.cs b/Software/Visual_Studio/Tango.BL/Entities/Role.cs index eafe7e020..1de50ce21 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Role.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Role.cs @@ -25,6 +25,16 @@ namespace Tango.BL.Entities public partial class Role : ObservableEntity<Role> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<SynchronizedObservableCollection<RolesPermission>> RolesPermissionsChanged; + + public event EventHandler<SynchronizedObservableCollection<UsersRole>> UsersRolesChanged; + protected Int32 _code; /// <summary> @@ -42,9 +52,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +80,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected String _description; @@ -86,9 +108,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + + DescriptionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Description)); + } + } } protected SynchronizedObservableCollection<RolesPermission> _rolespermissions; @@ -106,9 +134,15 @@ namespace Tango.BL.Entities set { - _rolespermissions = value; RaisePropertyChanged(nameof(RolesPermissions)); - } + if (_rolespermissions != value) + { + _rolespermissions = value; + RolesPermissionsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(RolesPermissions)); + } + } } protected SynchronizedObservableCollection<UsersRole> _usersroles; @@ -126,9 +160,15 @@ namespace Tango.BL.Entities set { - _usersroles = value; RaisePropertyChanged(nameof(UsersRoles)); - } + if (_usersroles != value) + { + _usersroles = value; + UsersRolesChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(UsersRoles)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/RolesPermission.cs b/Software/Visual_Studio/Tango.BL/Entities/RolesPermission.cs index f25f1e40f..91bd9d7a1 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RolesPermission.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RolesPermission.cs @@ -25,6 +25,10 @@ namespace Tango.BL.Entities public partial class RolesPermission : ObservableEntity<RolesPermission> { + public event EventHandler<Permission> PermissionChanged; + + public event EventHandler<Role> RoleChanged; + protected String _roleguid; /// <summary> @@ -43,9 +47,12 @@ namespace Tango.BL.Entities set { - _roleguid = value; RaisePropertyChanged(nameof(RoleGuid)); + if (_roleguid != value) + { + _roleguid = value; + RaisePropertyChanged(nameof(RoleGuid)); + } } - } protected String _permissionguid; @@ -66,9 +73,12 @@ namespace Tango.BL.Entities set { - _permissionguid = value; RaisePropertyChanged(nameof(PermissionGuid)); + if (_permissionguid != value) + { + _permissionguid = value; + RaisePropertyChanged(nameof(PermissionGuid)); + } } - } protected Permission _permission; @@ -88,9 +98,15 @@ namespace Tango.BL.Entities set { - _permission = value; RaisePropertyChanged(nameof(Permission)); - } + if (_permission != value) + { + _permission = value; + PermissionChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Permission)); + } + } } protected Role _role; @@ -110,9 +126,15 @@ namespace Tango.BL.Entities set { - _role = value; RaisePropertyChanged(nameof(Role)); - } + if (_role != value) + { + _role = value; + RoleChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Role)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/Segment.cs b/Software/Visual_Studio/Tango.BL/Entities/Segment.cs index c6e13ee3c..962610749 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Segment.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Segment.cs @@ -25,6 +25,16 @@ namespace Tango.BL.Entities public partial class Segment : ObservableEntity<Segment> { + public event EventHandler<String> NameChanged; + + public event EventHandler<Double> LengthChanged; + + public event EventHandler<Int32> SegmentIndexChanged; + + public event EventHandler<SynchronizedObservableCollection<BrushStop>> BrushStopsChanged; + + public event EventHandler<Job> JobChanged; + protected String _name; /// <summary> @@ -42,9 +52,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + NameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Name)); + } + } } protected String _jobguid; @@ -65,9 +81,12 @@ namespace Tango.BL.Entities set { - _jobguid = value; RaisePropertyChanged(nameof(JobGuid)); + if (_jobguid != value) + { + _jobguid = value; + RaisePropertyChanged(nameof(JobGuid)); + } } - } protected Double _length; @@ -87,9 +106,15 @@ namespace Tango.BL.Entities set { - _length = value; RaisePropertyChanged(nameof(Length)); - } + if (_length != value) + { + _length = value; + + LengthChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Length)); + } + } } protected Int32 _segmentindex; @@ -109,9 +134,15 @@ namespace Tango.BL.Entities set { - _segmentindex = value; RaisePropertyChanged(nameof(SegmentIndex)); - } + if (_segmentindex != value) + { + _segmentindex = value; + + SegmentIndexChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(SegmentIndex)); + } + } } protected SynchronizedObservableCollection<BrushStop> _brushstops; @@ -129,9 +160,15 @@ namespace Tango.BL.Entities set { - _brushstops = value; RaisePropertyChanged(nameof(BrushStops)); - } + if (_brushstops != value) + { + _brushstops = value; + BrushStopsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(BrushStops)); + } + } } protected Job _job; @@ -151,9 +188,15 @@ namespace Tango.BL.Entities set { - _job = value; RaisePropertyChanged(nameof(Job)); - } + if (_job != value) + { + _job = value; + JobChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Job)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/SpoolType.cs b/Software/Visual_Studio/Tango.BL/Entities/SpoolType.cs index 09c54f3ff..c81a28b02 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/SpoolType.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/SpoolType.cs @@ -25,6 +25,30 @@ namespace Tango.BL.Entities public partial class SpoolType : ObservableEntity<SpoolType> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<Double> LengthChanged; + + public event EventHandler<Double> WeightChanged; + + public event EventHandler<Double> DiameterChanged; + + public event EventHandler<Int32> StartOffsetPulsesChanged; + + public event EventHandler<Int32> BackingRateChanged; + + public event EventHandler<Int32> SegmentOffsetPulsesChanged; + + public event EventHandler<Int32> BottomBackingRateChanged; + + public event EventHandler<Double> RotationsPerPassageChanged; + + public event EventHandler<SynchronizedObservableCollection<Job>> JobsChanged; + + public event EventHandler<SynchronizedObservableCollection<Machine>> MachinesChanged; + protected Int32 _code; /// <summary> @@ -42,9 +66,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +94,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected Double _length; @@ -86,9 +122,15 @@ namespace Tango.BL.Entities set { - _length = value; RaisePropertyChanged(nameof(Length)); - } + if (_length != value) + { + _length = value; + + LengthChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Length)); + } + } } protected Double _weight; @@ -108,9 +150,15 @@ namespace Tango.BL.Entities set { - _weight = value; RaisePropertyChanged(nameof(Weight)); - } + if (_weight != value) + { + _weight = value; + + WeightChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Weight)); + } + } } protected Double _diameter; @@ -130,9 +178,15 @@ namespace Tango.BL.Entities set { - _diameter = value; RaisePropertyChanged(nameof(Diameter)); - } + if (_diameter != value) + { + _diameter = value; + + DiameterChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Diameter)); + } + } } protected Int32 _startoffsetpulses; @@ -152,9 +206,15 @@ namespace Tango.BL.Entities set { - _startoffsetpulses = value; RaisePropertyChanged(nameof(StartOffsetPulses)); - } + if (_startoffsetpulses != value) + { + _startoffsetpulses = value; + + StartOffsetPulsesChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(StartOffsetPulses)); + } + } } protected Int32 _backingrate; @@ -174,9 +234,15 @@ namespace Tango.BL.Entities set { - _backingrate = value; RaisePropertyChanged(nameof(BackingRate)); - } + if (_backingrate != value) + { + _backingrate = value; + + BackingRateChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(BackingRate)); + } + } } protected Int32 _segmentoffsetpulses; @@ -196,9 +262,15 @@ namespace Tango.BL.Entities set { - _segmentoffsetpulses = value; RaisePropertyChanged(nameof(SegmentOffsetPulses)); - } + if (_segmentoffsetpulses != value) + { + _segmentoffsetpulses = value; + + SegmentOffsetPulsesChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(SegmentOffsetPulses)); + } + } } protected Int32 _bottombackingrate; @@ -218,9 +290,15 @@ namespace Tango.BL.Entities set { - _bottombackingrate = value; RaisePropertyChanged(nameof(BottomBackingRate)); - } + if (_bottombackingrate != value) + { + _bottombackingrate = value; + + BottomBackingRateChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(BottomBackingRate)); + } + } } protected Double _rotationsperpassage; @@ -240,9 +318,15 @@ namespace Tango.BL.Entities set { - _rotationsperpassage = value; RaisePropertyChanged(nameof(RotationsPerPassage)); - } + if (_rotationsperpassage != value) + { + _rotationsperpassage = value; + + RotationsPerPassageChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(RotationsPerPassage)); + } + } } protected SynchronizedObservableCollection<Job> _jobs; @@ -260,9 +344,15 @@ namespace Tango.BL.Entities set { - _jobs = value; RaisePropertyChanged(nameof(Jobs)); - } + if (_jobs != value) + { + _jobs = value; + + JobsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Jobs)); + } + } } protected SynchronizedObservableCollection<Machine> _machines; @@ -280,9 +370,15 @@ namespace Tango.BL.Entities set { - _machines = value; RaisePropertyChanged(nameof(Machines)); - } + if (_machines != value) + { + _machines = value; + + MachinesChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Machines)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/Sysdiagram.cs b/Software/Visual_Studio/Tango.BL/Entities/Sysdiagram.cs index 043b2e064..3fbf6d876 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Sysdiagram.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Sysdiagram.cs @@ -25,6 +25,10 @@ namespace Tango.BL.Entities public partial class Sysdiagram : ObservableEntity<Sysdiagram> { + public event EventHandler<SynchronizedObservableCollection<Int32>> VersionChanged; + + public event EventHandler<Byte[]> DefinitionChanged; + protected SynchronizedObservableCollection<Int32> _version; /// <summary> @@ -40,9 +44,15 @@ namespace Tango.BL.Entities set { - _version = value; RaisePropertyChanged(nameof(Version)); - } + if (_version != value) + { + _version = value; + + VersionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Version)); + } + } } protected Byte[] _definition; @@ -62,9 +72,15 @@ namespace Tango.BL.Entities set { - _definition = value; RaisePropertyChanged(nameof(Definition)); - } + if (_definition != value) + { + _definition = value; + DefinitionChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Definition)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/TangoVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/TangoVersion.cs index e2c5190ec..2682cd7de 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TangoVersion.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TangoVersion.cs @@ -25,6 +25,16 @@ namespace Tango.BL.Entities public partial class TangoVersion : ObservableEntity<TangoVersion> { + public event EventHandler<String> VersionChanged; + + public event EventHandler<String> BlobNameChanged; + + public event EventHandler<String> CommentsChanged; + + public event EventHandler<MachineVersion> MachineVersionChanged; + + public event EventHandler<User> UserChanged; + protected String _version; /// <summary> @@ -42,9 +52,15 @@ namespace Tango.BL.Entities set { - _version = value; RaisePropertyChanged(nameof(Version)); - } + if (_version != value) + { + _version = value; + VersionChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Version)); + } + } } protected String _blobname; @@ -64,9 +80,15 @@ namespace Tango.BL.Entities set { - _blobname = value; RaisePropertyChanged(nameof(BlobName)); - } + if (_blobname != value) + { + _blobname = value; + BlobNameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(BlobName)); + } + } } protected String _comments; @@ -86,9 +108,15 @@ namespace Tango.BL.Entities set { - _comments = value; RaisePropertyChanged(nameof(Comments)); - } + if (_comments != value) + { + _comments = value; + + CommentsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Comments)); + } + } } protected String _userguid; @@ -109,9 +137,12 @@ namespace Tango.BL.Entities set { - _userguid = value; RaisePropertyChanged(nameof(UserGuid)); + if (_userguid != value) + { + _userguid = value; + RaisePropertyChanged(nameof(UserGuid)); + } } - } protected String _machineversionguid; @@ -132,9 +163,12 @@ namespace Tango.BL.Entities set { - _machineversionguid = value; RaisePropertyChanged(nameof(MachineVersionGuid)); + if (_machineversionguid != value) + { + _machineversionguid = value; + RaisePropertyChanged(nameof(MachineVersionGuid)); + } } - } protected MachineVersion _machineversion; @@ -154,9 +188,15 @@ namespace Tango.BL.Entities set { - _machineversion = value; RaisePropertyChanged(nameof(MachineVersion)); - } + if (_machineversion != value) + { + _machineversion = value; + MachineVersionChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(MachineVersion)); + } + } } protected User _user; @@ -176,9 +216,15 @@ namespace Tango.BL.Entities set { - _user = value; RaisePropertyChanged(nameof(User)); - } + if (_user != value) + { + _user = value; + UserChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(User)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechController.cs b/Software/Visual_Studio/Tango.BL/Entities/TechController.cs index 2a9e98510..bc217c58a 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TechController.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TechController.cs @@ -25,6 +25,18 @@ namespace Tango.BL.Entities public partial class TechController : ObservableEntity<TechController> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<Double> MinChanged; + + public event EventHandler<Double> MaxChanged; + + public event EventHandler<String> UnitsChanged; + protected Int32 _code; /// <summary> @@ -42,9 +54,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +82,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected String _description; @@ -86,9 +110,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + + DescriptionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Description)); + } + } } protected Double _min; @@ -108,9 +138,15 @@ namespace Tango.BL.Entities set { - _min = value; RaisePropertyChanged(nameof(Min)); - } + if (_min != value) + { + _min = value; + + MinChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Min)); + } + } } protected Double _max; @@ -130,9 +166,15 @@ namespace Tango.BL.Entities set { - _max = value; RaisePropertyChanged(nameof(Max)); - } + if (_max != value) + { + _max = value; + + MaxChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Max)); + } + } } protected String _units; @@ -152,9 +194,15 @@ namespace Tango.BL.Entities set { - _units = value; RaisePropertyChanged(nameof(Units)); - } + if (_units != value) + { + _units = value; + + UnitsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Units)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechDispenser.cs b/Software/Visual_Studio/Tango.BL/Entities/TechDispenser.cs index 8e730e6b4..e027dfc5c 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TechDispenser.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TechDispenser.cs @@ -25,6 +25,12 @@ namespace Tango.BL.Entities public partial class TechDispenser : ObservableEntity<TechDispenser> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + protected Int32 _code; /// <summary> @@ -42,9 +48,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +76,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected String _description; @@ -86,9 +104,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + + DescriptionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Description)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechHeater.cs b/Software/Visual_Studio/Tango.BL/Entities/TechHeater.cs index 5ebf86451..0a428f758 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TechHeater.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TechHeater.cs @@ -25,6 +25,12 @@ namespace Tango.BL.Entities public partial class TechHeater : ObservableEntity<TechHeater> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + protected Int32 _code; /// <summary> @@ -42,9 +48,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +76,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected String _description; @@ -86,9 +104,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + + DescriptionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Description)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechIo.cs b/Software/Visual_Studio/Tango.BL/Entities/TechIo.cs index 4d0c5186f..ba745d7bd 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TechIo.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TechIo.cs @@ -25,6 +25,28 @@ namespace Tango.BL.Entities public partial class TechIo : ObservableEntity<TechIo> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<Int32> TypeChanged; + + public event EventHandler<String> DesignatorChanged; + + public event EventHandler<String> AsmChanged; + + public event EventHandler<String> InterfaceNameChanged; + + public event EventHandler<String> SensorChanged; + + public event EventHandler<Double> InitValueChanged; + + public event EventHandler<Int32> AveragingChanged; + + public event EventHandler<Double> MinChanged; + + public event EventHandler<Double> MaxChanged; + protected Int32 _code; /// <summary> @@ -42,9 +64,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +92,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected Int32 _type; @@ -86,9 +120,15 @@ namespace Tango.BL.Entities set { - _type = value; RaisePropertyChanged(nameof(Type)); - } + if (_type != value) + { + _type = value; + + TypeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Type)); + } + } } protected String _designator; @@ -108,9 +148,15 @@ namespace Tango.BL.Entities set { - _designator = value; RaisePropertyChanged(nameof(Designator)); - } + if (_designator != value) + { + _designator = value; + + DesignatorChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Designator)); + } + } } protected String _asm; @@ -130,9 +176,15 @@ namespace Tango.BL.Entities set { - _asm = value; RaisePropertyChanged(nameof(Asm)); - } + if (_asm != value) + { + _asm = value; + + AsmChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Asm)); + } + } } protected String _interfacename; @@ -152,9 +204,15 @@ namespace Tango.BL.Entities set { - _interfacename = value; RaisePropertyChanged(nameof(InterfaceName)); - } + if (_interfacename != value) + { + _interfacename = value; + + InterfaceNameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(InterfaceName)); + } + } } protected String _sensor; @@ -174,9 +232,15 @@ namespace Tango.BL.Entities set { - _sensor = value; RaisePropertyChanged(nameof(Sensor)); - } + if (_sensor != value) + { + _sensor = value; + + SensorChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Sensor)); + } + } } protected Double _initvalue; @@ -196,9 +260,15 @@ namespace Tango.BL.Entities set { - _initvalue = value; RaisePropertyChanged(nameof(InitValue)); - } + if (_initvalue != value) + { + _initvalue = value; + InitValueChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(InitValue)); + } + } } protected Int32 _averaging; @@ -218,9 +288,15 @@ namespace Tango.BL.Entities set { - _averaging = value; RaisePropertyChanged(nameof(Averaging)); - } + if (_averaging != value) + { + _averaging = value; + AveragingChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Averaging)); + } + } } protected Double _min; @@ -240,9 +316,15 @@ namespace Tango.BL.Entities set { - _min = value; RaisePropertyChanged(nameof(Min)); - } + if (_min != value) + { + _min = value; + MinChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Min)); + } + } } protected Double _max; @@ -262,9 +344,15 @@ namespace Tango.BL.Entities set { - _max = value; RaisePropertyChanged(nameof(Max)); - } + if (_max != value) + { + _max = value; + MaxChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Max)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechMonitor.cs b/Software/Visual_Studio/Tango.BL/Entities/TechMonitor.cs index d47fd5955..2e6d39770 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TechMonitor.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TechMonitor.cs @@ -25,6 +25,24 @@ namespace Tango.BL.Entities public partial class TechMonitor : ObservableEntity<TechMonitor> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<Double> MinChanged; + + public event EventHandler<Double> MaxChanged; + + public event EventHandler<String> UnitsChanged; + + public event EventHandler<Int32> PointsPerFrameChanged; + + public event EventHandler<Boolean> MultiChannelChanged; + + public event EventHandler<Int32> ChannelCountChanged; + protected Int32 _code; /// <summary> @@ -42,9 +60,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +88,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected String _description; @@ -86,9 +116,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + DescriptionChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Description)); + } + } } protected Double _min; @@ -108,9 +144,15 @@ namespace Tango.BL.Entities set { - _min = value; RaisePropertyChanged(nameof(Min)); - } + if (_min != value) + { + _min = value; + + MinChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Min)); + } + } } protected Double _max; @@ -130,9 +172,15 @@ namespace Tango.BL.Entities set { - _max = value; RaisePropertyChanged(nameof(Max)); - } + if (_max != value) + { + _max = value; + + MaxChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Max)); + } + } } protected String _units; @@ -152,9 +200,15 @@ namespace Tango.BL.Entities set { - _units = value; RaisePropertyChanged(nameof(Units)); - } + if (_units != value) + { + _units = value; + UnitsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Units)); + } + } } protected Int32 _pointsperframe; @@ -174,9 +228,15 @@ namespace Tango.BL.Entities set { - _pointsperframe = value; RaisePropertyChanged(nameof(PointsPerFrame)); - } + if (_pointsperframe != value) + { + _pointsperframe = value; + + PointsPerFrameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(PointsPerFrame)); + } + } } protected Boolean _multichannel; @@ -196,9 +256,15 @@ namespace Tango.BL.Entities set { - _multichannel = value; RaisePropertyChanged(nameof(MultiChannel)); - } + if (_multichannel != value) + { + _multichannel = value; + + MultiChannelChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(MultiChannel)); + } + } } protected Int32 _channelcount; @@ -218,9 +284,15 @@ namespace Tango.BL.Entities set { - _channelcount = value; RaisePropertyChanged(nameof(ChannelCount)); - } + if (_channelcount != value) + { + _channelcount = value; + ChannelCountChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(ChannelCount)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechValve.cs b/Software/Visual_Studio/Tango.BL/Entities/TechValve.cs index 68c55867d..091e495cb 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TechValve.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TechValve.cs @@ -30,6 +30,18 @@ namespace Tango.BL.Entities public partial class TechValve : ObservableEntity<TechValve> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<Int32> TypeChanged; + + public event EventHandler<String> State1Changed; + + public event EventHandler<String> State2Changed; + protected Int32 _code; /// <summary> @@ -47,9 +59,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -69,9 +87,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + + NameChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Name)); + } + } } protected String _description; @@ -91,9 +115,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + + DescriptionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Description)); + } + } } protected Int32 _type; @@ -114,9 +144,15 @@ namespace Tango.BL.Entities set { - _type = value; RaisePropertyChanged(nameof(Type)); - } + if (_type != value) + { + _type = value; + + TypeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Type)); + } + } } protected String _state1; @@ -136,9 +172,15 @@ namespace Tango.BL.Entities set { - _state1 = value; RaisePropertyChanged(nameof(State1)); - } + if (_state1 != value) + { + _state1 = value; + + State1Changed?.Invoke(this, value); + RaisePropertyChanged(nameof(State1)); + } + } } protected String _state2; @@ -158,9 +200,15 @@ namespace Tango.BL.Entities set { - _state2 = value; RaisePropertyChanged(nameof(State2)); - } + if (_state2 != value) + { + _state2 = value; + + State2Changed?.Invoke(this, value); + RaisePropertyChanged(nameof(State2)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/User.cs b/Software/Visual_Studio/Tango.BL/Entities/User.cs index 1a121217b..3929e7e47 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/User.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/User.cs @@ -25,6 +25,30 @@ namespace Tango.BL.Entities public partial class User : ObservableEntity<User> { + public event EventHandler<Boolean> DeletedChanged; + + public event EventHandler<String> EmailChanged; + + public event EventHandler<String> PasswordChanged; + + public event EventHandler<Nullable<DateTime>> LastLoginChanged; + + public event EventHandler<Address> AddressChanged; + + public event EventHandler<Contact> ContactChanged; + + public event EventHandler<SynchronizedObservableCollection<Job>> JobsChanged; + + public event EventHandler<SynchronizedObservableCollection<MachineStudioVersion>> MachineStudioVersionsChanged; + + public event EventHandler<SynchronizedObservableCollection<MachinesEvent>> MachinesEventsChanged; + + public event EventHandler<Organization> OrganizationChanged; + + public event EventHandler<SynchronizedObservableCollection<TangoVersion>> TangoVersionsChanged; + + public event EventHandler<SynchronizedObservableCollection<UsersRole>> UsersRolesChanged; + protected Boolean _deleted; /// <summary> @@ -42,9 +66,15 @@ namespace Tango.BL.Entities set { - _deleted = value; RaisePropertyChanged(nameof(Deleted)); - } + if (_deleted != value) + { + _deleted = value; + DeletedChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Deleted)); + } + } } protected String _email; @@ -64,9 +94,15 @@ namespace Tango.BL.Entities set { - _email = value; RaisePropertyChanged(nameof(Email)); - } + if (_email != value) + { + _email = value; + + EmailChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Email)); + } + } } protected String _password; @@ -86,9 +122,15 @@ namespace Tango.BL.Entities set { - _password = value; RaisePropertyChanged(nameof(Password)); - } + if (_password != value) + { + _password = value; + + PasswordChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Password)); + } + } } protected String _organizationguid; @@ -109,9 +151,12 @@ namespace Tango.BL.Entities set { - _organizationguid = value; RaisePropertyChanged(nameof(OrganizationGuid)); + if (_organizationguid != value) + { + _organizationguid = value; + RaisePropertyChanged(nameof(OrganizationGuid)); + } } - } protected String _contactguid; @@ -132,9 +177,12 @@ namespace Tango.BL.Entities set { - _contactguid = value; RaisePropertyChanged(nameof(ContactGuid)); + if (_contactguid != value) + { + _contactguid = value; + RaisePropertyChanged(nameof(ContactGuid)); + } } - } protected String _addressguid; @@ -155,9 +203,12 @@ namespace Tango.BL.Entities set { - _addressguid = value; RaisePropertyChanged(nameof(AddressGuid)); + if (_addressguid != value) + { + _addressguid = value; + RaisePropertyChanged(nameof(AddressGuid)); + } } - } protected Nullable<DateTime> _lastlogin; @@ -177,9 +228,15 @@ namespace Tango.BL.Entities set { - _lastlogin = value; RaisePropertyChanged(nameof(LastLogin)); - } + if (_lastlogin != value) + { + _lastlogin = value; + + LastLoginChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(LastLogin)); + } + } } protected Address _address; @@ -199,9 +256,15 @@ namespace Tango.BL.Entities set { - _address = value; RaisePropertyChanged(nameof(Address)); - } + if (_address != value) + { + _address = value; + AddressChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Address)); + } + } } protected Contact _contact; @@ -221,9 +284,15 @@ namespace Tango.BL.Entities set { - _contact = value; RaisePropertyChanged(nameof(Contact)); - } + if (_contact != value) + { + _contact = value; + + ContactChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Contact)); + } + } } protected SynchronizedObservableCollection<Job> _jobs; @@ -241,9 +310,15 @@ namespace Tango.BL.Entities set { - _jobs = value; RaisePropertyChanged(nameof(Jobs)); - } + if (_jobs != value) + { + _jobs = value; + + JobsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Jobs)); + } + } } protected SynchronizedObservableCollection<MachineStudioVersion> _machinestudioversions; @@ -261,9 +336,15 @@ namespace Tango.BL.Entities set { - _machinestudioversions = value; RaisePropertyChanged(nameof(MachineStudioVersions)); - } + if (_machinestudioversions != value) + { + _machinestudioversions = value; + + MachineStudioVersionsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(MachineStudioVersions)); + } + } } protected SynchronizedObservableCollection<MachinesEvent> _machinesevents; @@ -281,9 +362,15 @@ namespace Tango.BL.Entities set { - _machinesevents = value; RaisePropertyChanged(nameof(MachinesEvents)); - } + if (_machinesevents != value) + { + _machinesevents = value; + + MachinesEventsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(MachinesEvents)); + } + } } protected Organization _organization; @@ -303,9 +390,15 @@ namespace Tango.BL.Entities set { - _organization = value; RaisePropertyChanged(nameof(Organization)); - } + if (_organization != value) + { + _organization = value; + + OrganizationChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Organization)); + } + } } protected SynchronizedObservableCollection<TangoVersion> _tangoversions; @@ -323,9 +416,15 @@ namespace Tango.BL.Entities set { - _tangoversions = value; RaisePropertyChanged(nameof(TangoVersions)); - } + if (_tangoversions != value) + { + _tangoversions = value; + + TangoVersionsChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(TangoVersions)); + } + } } protected SynchronizedObservableCollection<UsersRole> _usersroles; @@ -343,9 +442,15 @@ namespace Tango.BL.Entities set { - _usersroles = value; RaisePropertyChanged(nameof(UsersRoles)); - } + if (_usersroles != value) + { + _usersroles = value; + + UsersRolesChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(UsersRoles)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/UsersRole.cs b/Software/Visual_Studio/Tango.BL/Entities/UsersRole.cs index 9839028a0..10a6d774f 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/UsersRole.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/UsersRole.cs @@ -25,6 +25,12 @@ namespace Tango.BL.Entities public partial class UsersRole : ObservableEntity<UsersRole> { + public event EventHandler<Boolean> DeletedChanged; + + public event EventHandler<Role> RoleChanged; + + public event EventHandler<User> UserChanged; + protected Boolean _deleted; /// <summary> @@ -42,9 +48,15 @@ namespace Tango.BL.Entities set { - _deleted = value; RaisePropertyChanged(nameof(Deleted)); - } + if (_deleted != value) + { + _deleted = value; + DeletedChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Deleted)); + } + } } protected String _userguid; @@ -65,9 +77,12 @@ namespace Tango.BL.Entities set { - _userguid = value; RaisePropertyChanged(nameof(UserGuid)); + if (_userguid != value) + { + _userguid = value; + RaisePropertyChanged(nameof(UserGuid)); + } } - } protected String _roleguid; @@ -88,9 +103,12 @@ namespace Tango.BL.Entities set { - _roleguid = value; RaisePropertyChanged(nameof(RoleGuid)); + if (_roleguid != value) + { + _roleguid = value; + RaisePropertyChanged(nameof(RoleGuid)); + } } - } protected Role _role; @@ -110,9 +128,15 @@ namespace Tango.BL.Entities set { - _role = value; RaisePropertyChanged(nameof(Role)); - } + if (_role != value) + { + _role = value; + RoleChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Role)); + } + } } protected User _user; @@ -132,9 +156,15 @@ namespace Tango.BL.Entities set { - _user = value; RaisePropertyChanged(nameof(User)); - } + if (_user != value) + { + _user = value; + + UserChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(User)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/WindingMethod.cs b/Software/Visual_Studio/Tango.BL/Entities/WindingMethod.cs index 6d3978591..9de13f11d 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/WindingMethod.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/WindingMethod.cs @@ -25,6 +25,14 @@ namespace Tango.BL.Entities public partial class WindingMethod : ObservableEntity<WindingMethod> { + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<SynchronizedObservableCollection<Job>> JobsChanged; + protected Int32 _code; /// <summary> @@ -42,9 +50,15 @@ namespace Tango.BL.Entities set { - _code = value; RaisePropertyChanged(nameof(Code)); - } + if (_code != value) + { + _code = value; + + CodeChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Code)); + } + } } protected String _name; @@ -64,9 +78,15 @@ namespace Tango.BL.Entities set { - _name = value; RaisePropertyChanged(nameof(Name)); - } + if (_name != value) + { + _name = value; + NameChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Name)); + } + } } protected String _description; @@ -86,9 +106,15 @@ namespace Tango.BL.Entities set { - _description = value; RaisePropertyChanged(nameof(Description)); - } + if (_description != value) + { + _description = value; + + DescriptionChanged?.Invoke(this, value); + RaisePropertyChanged(nameof(Description)); + } + } } protected SynchronizedObservableCollection<Job> _jobs; @@ -106,9 +132,15 @@ namespace Tango.BL.Entities set { - _jobs = value; RaisePropertyChanged(nameof(Jobs)); - } + if (_jobs != value) + { + _jobs = value; + JobsChanged?.Invoke(this, value); + + RaisePropertyChanged(nameof(Jobs)); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.CSV/CsvFile.cs b/Software/Visual_Studio/Tango.CSV/CsvFile.cs index d180f0139..4a4e8d99f 100644 --- a/Software/Visual_Studio/Tango.CSV/CsvFile.cs +++ b/Software/Visual_Studio/Tango.CSV/CsvFile.cs @@ -36,7 +36,7 @@ namespace Tango.CSV TextQualifier = '"' }; UseLambdas = true; - UseTasks = true; + UseTasks = false; FastIndexOfAny = true; } diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml index 2231c30f1..daa4e7d51 100644 --- a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml +++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml @@ -34,6 +34,16 @@ namespace Tango.BL.Entities { @foreach (var prop in Model.Fields) { + if (!prop.Name.EndsWith("Guid")) + { + <div> + public event EventHandler<@(prop.Type)> @(prop.Name)Changed; + </div> + } + } + + @foreach (var prop in Model.Fields) + { <div> protected @(prop.Type) _@(prop.Name.ToLower()); @if (prop.DbDescription != null) @@ -59,7 +69,20 @@ namespace Tango.BL.Entities public @(prop.Construct || prop.Complex ? "virtual" : "") @(prop.Type) @(prop.Name) { get { return _@(prop.Name.ToLower()); } - set { _@(prop.Name.ToLower()) = value; RaisePropertyChanged(nameof(@(prop.Name))); } + set + { + if (_@(prop.Name.ToLower()) != value) + { + _@(prop.Name.ToLower()) = value; + @if (!prop.Name.EndsWith("Guid")) + { + <div> + @(prop.Name)Changed?.Invoke(this, value); + </div> + } + RaisePropertyChanged(nameof(@(prop.Name))); + } + } } </div> } diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs index 9dabb6508..499138e0a 100644 --- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs +++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs @@ -375,8 +375,18 @@ namespace Tango.Emulations.Emulators monitors.BlowerVoltage.Add(blower_state.IsActive ? blower_state.Voltage : 0); } - monitors.Dancer2Angle.Add(Cursor.Position.Y); - monitors.Dancer3Angle.Add(Cursor.Position.Y); + int y = Cursor.Position.Y; + + for (int i = 0; i < 30; i++) + { + monitors.Dancer2Angle.Add(y); + } + + for (int i = 0; i < 30; i++) + { + monitors.Dancer3Angle.Add(y); + } + var dispenserFrequencies = new RepeatedField<DoubleArray>(); |
