PPC "Use Flat Spool" + SpoolType logic improvements.

Added RML->SpoolType calibration new parameters.

2 files changed, 92 insertions, 0 deletions

diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTOBase.cs
index c17e2b426..d140c1435 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTOBase.cs
@@ -70,6 +70,22 @@ namespace Tango.BL.DTO
         }
 
         /// <summary>
+        /// start offset pulses
+        /// </summary>
+        public Nullable<Int32> StartOffsetPulses 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// segment offset pulses
+        /// </summary>
+        public Nullable<Int32> SegmentOffsetPulses 
+        {
+            get; set; 
+        }
+
+        /// <summary>
         /// btsr spool tension
         /// </summary>
         public Nullable<Int32> BtsrSpoolTension 
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlsSpoolBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlsSpoolBase.cs
index 0edd11cfd..a6ae877be 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/RmlsSpoolBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlsSpoolBase.cs
@@ -35,6 +35,10 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Nullable<Int32>> BottomBackingRateChanged;
 
+        public event EventHandler<Nullable<Int32>> StartOffsetPulsesChanged;
+
+        public event EventHandler<Nullable<Int32>> SegmentOffsetPulsesChanged;
+
         public event EventHandler<Nullable<Int32>> BtsrSpoolTensionChanged;
 
         public event EventHandler<Rml> RmlChanged;
@@ -201,6 +205,60 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Nullable<Int32> _startoffsetpulses;
+
+        /// <summary>
+        /// Gets or sets the rmlsspoolbase start offset pulses.
+        /// </summary>
+
+        [Column("START_OFFSET_PULSES")]
+
+        public  Nullable<Int32> StartOffsetPulses
+        {
+            get 
+            {
+                return _startoffsetpulses; 
+            }
+
+            set 
+            {
+                if (_startoffsetpulses != value)
+                {
+                    _startoffsetpulses = value;
+
+                    OnStartOffsetPulsesChanged(value);
+
+                }
+            }
+        }
+
+        protected Nullable<Int32> _segmentoffsetpulses;
+
+        /// <summary>
+        /// Gets or sets the rmlsspoolbase segment offset pulses.
+        /// </summary>
+
+        [Column("SEGMENT_OFFSET_PULSES")]
+
+        public  Nullable<Int32> SegmentOffsetPulses
+        {
+            get 
+            {
+                return _segmentoffsetpulses; 
+            }
+
+            set 
+            {
+                if (_segmentoffsetpulses != value)
+                {
+                    _segmentoffsetpulses = value;
+
+                    OnSegmentOffsetPulsesChanged(value);
+
+                }
+            }
+        }
+
         protected Nullable<Int32> _btsrspooltension;
 
         /// <summary>
@@ -329,6 +387,24 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the StartOffsetPulses has changed.
+        /// </summary>
+        protected virtual void OnStartOffsetPulsesChanged(Nullable<Int32> startoffsetpulses)
+        {
+            StartOffsetPulsesChanged?.Invoke(this, startoffsetpulses);
+            RaisePropertyChanged(nameof(StartOffsetPulses));
+        }
+
+        /// <summary>
+        /// Called when the SegmentOffsetPulses has changed.
+        /// </summary>
+        protected virtual void OnSegmentOffsetPulsesChanged(Nullable<Int32> segmentoffsetpulses)
+        {
+            SegmentOffsetPulsesChanged?.Invoke(this, segmentoffsetpulses);
+            RaisePropertyChanged(nameof(SegmentOffsetPulses));
+        }
+
+        /// <summary>
         /// Called when the BtsrSpoolTension has changed.
         /// </summary>
         protected virtual void OnBtsrSpoolTensionChanged(Nullable<Int32> btsrspooltension)