FSE TUP/TFP.

Refactored progress with TangoProgress<T>

2 files changed, 104 insertions, 1 deletions

diff --git a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj
index 49a7f3912..8765a3b9f 100644
--- a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj
+++ b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj
@@ -104,6 +104,7 @@
     <Compile Include="IO\KnownFolders.cs" />
     <Compile Include="Json\ProtobufContractResolver.cs" />
     <Compile Include="PriorityProducerConsumerQueue.cs" />
+    <Compile Include="TangoProgress.cs" />
     <Compile Include="Threading\ActionTimer.cs" />
     <Compile Include="Threading\IntervalMessageDispatcher.cs" />
     <Compile Include="Threading\TaskSequencer.cs" />
@@ -213,7 +214,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
   <Import Project="..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets')" />
diff --git a/Software/Visual_Studio/Tango.Core/TangoProgress.cs b/Software/Visual_Studio/Tango.Core/TangoProgress.cs
new file mode 100644
index 000000000..ef2afa6f6
--- /dev/null
+++ b/Software/Visual_Studio/Tango.Core/TangoProgress.cs
@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.Core
+{
+    /// <summary>
+    /// Represents a progress of some process.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public class TangoProgress<T> where T : IComparable, IFormattable, IConvertible
+    {
+        /// <summary>
+        /// Gets or sets the progress message.
+        /// </summary>
+        public String Message { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the progress is indeterminate.
+        /// </summary>
+        public bool IsIndeterminate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the current progress value.
+        /// </summary>
+        public T Value { get; set; }
+
+        /// <summary>
+        /// Gets or sets the current maximum progress.
+        /// </summary>
+        public T Maximum { get; set; }
+
+        /// <summary>
+        /// Gets the progress percentage.
+        /// </summary>
+        public double Percentage
+        {
+            get
+            {
+                double max = Convert.ToDouble(Maximum);
+                double value = Convert.ToDouble(Value);
+
+                if (max > 0)
+                {
+                    return Math.Round(value / max * 100d, 0);
+                }
+                else
+                {
+                    return 0;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TangoProgress{T}"/> class.
+        /// </summary>
+        public TangoProgress()
+        {
+            
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TangoProgress{T}"/> class.
+        /// </summary>
+        public TangoProgress(String message, bool isIndeterminate = true, T value = default(T), T maximum = default(T)) : this()
+        {
+
+        }
+    }
+
+    /// <summary>
+    /// Represents a component process progress event arguments.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <seealso cref="System.EventArgs" />
+    public class TangoProgressChangedEventArgs<T> : EventArgs where T : IComparable, IFormattable, IConvertible
+    {
+        /// <summary>
+        /// Gets or sets the progress.
+        /// </summary>
+        public TangoProgress<T> Progress { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TangoProgressChangedEventArgs{T}"/> class.
+        /// </summary>
+        public TangoProgressChangedEventArgs()
+        {
+            Progress = new TangoProgress<T>();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TangoProgressChangedEventArgs{T}"/> class.
+        /// </summary>
+        /// <param name="progress">The progress.</param>
+        public TangoProgressChangedEventArgs(TangoProgress<T> progress) : this()
+        {
+            Progress = progress;
+        }
+    }
+}