merge

1 files changed, 16 insertions, 55 deletions

diff --git a/Software/Visual_Studio/Tango.BL/Entities/SpoolBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SpoolBase.cs
index b1ac62815..5794da91b 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/SpoolBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/SpoolBase.cs
@@ -19,7 +19,6 @@ using System.Linq;
 using Tango.DAL.Remote.DB;
 using Tango.Core;
 using System.ComponentModel;
-using Tango.Core.CustomAttributes;
 
 namespace Tango.BL.Entities
 {
@@ -27,15 +26,13 @@ namespace Tango.BL.Entities
     public abstract class SpoolBase : ObservableEntity<Spool>
     {
 
-        public event EventHandler<Nullable<Int32>> StartOffsetPulsesChanged;
+        public event EventHandler<Int32> StartOffsetPulsesChanged;
 
-        public event EventHandler<Nullable<Int32>> BackingRateChanged;
+        public event EventHandler<Int32> BackingRateChanged;
 
-        public event EventHandler<Nullable<Int32>> SegmentOffsetPulsesChanged;
+        public event EventHandler<Int32> SegmentOffsetPulsesChanged;
 
-        public event EventHandler<Nullable<Int32>> BottomBackingRateChanged;
-
-        public event EventHandler<Nullable<Int32>> LimitSwitchStartPointOffsetChanged;
+        public event EventHandler<Int32> BottomBackingRateChanged;
 
         public event EventHandler<Machine> MachineChanged;
 
@@ -93,7 +90,7 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected Nullable<Int32> _startoffsetpulses;
+        protected Int32 _startoffsetpulses;
 
         /// <summary>
         /// Gets or sets the spoolbase start offset pulses.
@@ -101,7 +98,7 @@ namespace Tango.BL.Entities
 
         [Column("START_OFFSET_PULSES")]
 
-        public  Nullable<Int32> StartOffsetPulses
+        public  Int32 StartOffsetPulses
         {
             get 
             {
@@ -120,7 +117,7 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected Nullable<Int32> _backingrate;
+        protected Int32 _backingrate;
 
         /// <summary>
         /// Gets or sets the spoolbase backing rate.
@@ -128,7 +125,7 @@ namespace Tango.BL.Entities
 
         [Column("BACKING_RATE")]
 
-        public  Nullable<Int32> BackingRate
+        public  Int32 BackingRate
         {
             get 
             {
@@ -147,7 +144,7 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected Nullable<Int32> _segmentoffsetpulses;
+        protected Int32 _segmentoffsetpulses;
 
         /// <summary>
         /// Gets or sets the spoolbase segment offset pulses.
@@ -155,7 +152,7 @@ namespace Tango.BL.Entities
 
         [Column("SEGMENT_OFFSET_PULSES")]
 
-        public  Nullable<Int32> SegmentOffsetPulses
+        public  Int32 SegmentOffsetPulses
         {
             get 
             {
@@ -174,7 +171,7 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected Nullable<Int32> _bottombackingrate;
+        protected Int32 _bottombackingrate;
 
         /// <summary>
         /// Gets or sets the spoolbase bottom backing rate.
@@ -182,7 +179,7 @@ namespace Tango.BL.Entities
 
         [Column("BOTTOM_BACKING_RATE")]
 
-        public  Nullable<Int32> BottomBackingRate
+        public  Int32 BottomBackingRate
         {
             get 
             {
@@ -201,33 +198,6 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected Nullable<Int32> _limitswitchstartpointoffset;
-
-        /// <summary>
-        /// Gets or sets the spoolbase limit switch start point offset.
-        /// </summary>
-
-        [Column("LIMIT_SWITCH_START_POINT_OFFSET")]
-
-        public  Nullable<Int32> LimitSwitchStartPointOffset
-        {
-            get 
-            {
-                return _limitswitchstartpointoffset; 
-            }
-
-            set 
-            {
-                if (_limitswitchstartpointoffset != value)
-                {
-                    _limitswitchstartpointoffset = value;
-
-                    OnLimitSwitchStartPointOffsetChanged(value);
-
-                }
-            }
-        }
-
         protected Machine _machine;
 
         /// <summary>
@@ -295,7 +265,7 @@ namespace Tango.BL.Entities
         /// <summary>
         /// Called when the StartOffsetPulses has changed.
         /// </summary>
-        protected virtual void OnStartOffsetPulsesChanged(Nullable<Int32> startoffsetpulses)
+        protected virtual void OnStartOffsetPulsesChanged(Int32 startoffsetpulses)
         {
             StartOffsetPulsesChanged?.Invoke(this, startoffsetpulses);
             RaisePropertyChanged(nameof(StartOffsetPulses));
@@ -304,7 +274,7 @@ namespace Tango.BL.Entities
         /// <summary>
         /// Called when the BackingRate has changed.
         /// </summary>
-        protected virtual void OnBackingRateChanged(Nullable<Int32> backingrate)
+        protected virtual void OnBackingRateChanged(Int32 backingrate)
         {
             BackingRateChanged?.Invoke(this, backingrate);
             RaisePropertyChanged(nameof(BackingRate));
@@ -313,7 +283,7 @@ namespace Tango.BL.Entities
         /// <summary>
         /// Called when the SegmentOffsetPulses has changed.
         /// </summary>
-        protected virtual void OnSegmentOffsetPulsesChanged(Nullable<Int32> segmentoffsetpulses)
+        protected virtual void OnSegmentOffsetPulsesChanged(Int32 segmentoffsetpulses)
         {
             SegmentOffsetPulsesChanged?.Invoke(this, segmentoffsetpulses);
             RaisePropertyChanged(nameof(SegmentOffsetPulses));
@@ -322,22 +292,13 @@ namespace Tango.BL.Entities
         /// <summary>
         /// Called when the BottomBackingRate has changed.
         /// </summary>
-        protected virtual void OnBottomBackingRateChanged(Nullable<Int32> bottombackingrate)
+        protected virtual void OnBottomBackingRateChanged(Int32 bottombackingrate)
         {
             BottomBackingRateChanged?.Invoke(this, bottombackingrate);
             RaisePropertyChanged(nameof(BottomBackingRate));
         }
 
         /// <summary>
-        /// Called when the LimitSwitchStartPointOffset has changed.
-        /// </summary>
-        protected virtual void OnLimitSwitchStartPointOffsetChanged(Nullable<Int32> limitswitchstartpointoffset)
-        {
-            LimitSwitchStartPointOffsetChanged?.Invoke(this, limitswitchstartpointoffset);
-            RaisePropertyChanged(nameof(LimitSwitchStartPointOffset));
-        }
-
-        /// <summary>
         /// Called when the Machine has changed.
         /// </summary>
         protected virtual void OnMachineChanged(Machine machine)