Merge pull request #685 from jwbruce93/Issue_675

Issue #675 - GetMinMax
fo-dicom · Sep 12, 2018 · 335f3ce · 335f3ce
2 parents 3cb7c6f + 39afa91
commit 335f3ce
Show file tree

Hide file tree

Showing 4 changed files with 128 additions and 50 deletions.
diff --git a/Contributors.md b/Contributors.md
@@ -32,4 +32,5 @@
 * [Niall O'Donnell] (https://github.com/nodonnell)
 * [Bob Woods](https://github.com/BobSter3000)
 * [Joost van Griethuysen](https://github.com/JoostJM)
+* [Jamie Bruce](https://github.com/jwbruce93)
 * [Cregganbane](https://github.com/Cregganbane)
diff --git a/DICOM/DicomRange.cs b/DICOM/DicomRange.cs
@@ -22,5 +22,18 @@ public bool Contains(T value)
         {
             return Minimum.CompareTo(value) <= 0 && Maximum.CompareTo(value) >= 0;
         }
+
+        public void Join(T value)
+        {
+            if (Minimum.CompareTo(value) > 0)
+            {
+                Minimum = value;
+            }
+            if (Maximum.CompareTo(value) < 0)
+            {
+                Maximum = value;
+            }
+        }
+
     }
 }
diff --git a/DICOM/Imaging/Render/PixelData.cs b/DICOM/Imaging/Render/PixelData.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections;
+using System.Linq;
 
 #if !NET35
 using System.Threading.Tasks;
@@ -38,11 +39,18 @@ public interface IPixelData
 
         /// <summary>
         /// Return the minimum and maximum pixel values from pixel data.
+        /// The padding value is taken into account.
         /// </summary>
         /// <param name="padding">Padding value to ignore in min-max determination.</param>
         /// <returns>Range of calculated minimum and maximum values.</returns>
         DicomRange<double> GetMinMax(int padding);
 
+        /// <summary>
+        /// Return the minimum and maximum pixel values from pixel data.
+        /// </summary>
+        /// <returns>Range of calculated minimum and maximum values.</returns>
+        DicomRange<double> GetMinMax();
+
         /// <summary>
         /// Gets the value of the pixel at the specified coordinates.
         /// </summary>
@@ -262,20 +270,27 @@ protected internal GrayscalePixelDataU8(int width, int height, byte[] data)
         /// <inheritdoc />
         public DicomRange<double> GetMinMax(int padding)
         {
-            var min = double.MaxValue;
-            var max = double.MinValue;
+            if (Data == null || Data.Length == 0)
+            {
+                return default(DicomRange<double>);
+            }
 
-            var data = Data;
-            var length = data.Length;
-            for (var i = 0; i < length; i++)
+            var range = new DicomRange<double>(double.MaxValue, double.MinValue);
+            Data.Where(v => v != padding).Each(v => range.Join(v));
+            return range;
+        }
+
+        /// <inheritdoc />
+        public DicomRange<double> GetMinMax()
+        {
+            if (Data == null || Data.Length == 0)
             {
-                var value = data[i];
-                if (value == padding) continue;
-                if (value > max) max = value;
-                else if (value < min) min = value;
+                return default(DicomRange<double>);
             }
 
-            return new DicomRange<double>(min, max);
+            var range = new DicomRange<double>(double.MaxValue, double.MinValue);
+            Data.Each(v => range.Join(v));
+            return range;
         }
 
         /// <inheritdoc />
@@ -516,20 +531,27 @@ private GrayscalePixelDataS16(int width, int height, short[] data)
         /// <inheritdoc />
         public DicomRange<double> GetMinMax(int padding)
         {
-            var min = double.MaxValue;
-            var max = double.MinValue;
+            if (Data == null || Data.Length == 0)
+            {
+                return default(DicomRange<double>);
+            }
 
-            var data = Data;
-            var length = data.Length;
-            for (var i = 0; i < length; i++)
+            var range = new DicomRange<double>(double.MaxValue, double.MinValue);
+            Data.Where(v => v != padding).Each(v => range.Join(v));
+            return range;
+        }
+
+        /// <inheritdoc />
+        public DicomRange<double> GetMinMax()
+        {
+            if (Data == null || Data.Length == 0)
             {
-                var value = data[i];
-                if (value == padding) continue;
-                if (value > max) max = value;
-                else if (value < min) min = value;
+                return default(DicomRange<double>);
             }
 
-            return new DicomRange<double>(min, max);
+            var range = new DicomRange<double>(double.MaxValue, double.MinValue);
+            Data.Each(v => range.Join(v));
+            return range;
         }
 
         /// <inheritdoc />
@@ -703,20 +725,27 @@ private GrayscalePixelDataU16(int width, int height, ushort[] data)
         /// <inheritdoc />
         public DicomRange<double> GetMinMax(int padding)
         {
-            var min = double.MaxValue;
-            var max = double.MinValue;
+            if (Data == null || Data.Length == 0)
+            {
+                return default(DicomRange<double>);
+            }
 
-            var data = Data;
-            var length = data.Length;
-            for (var i = 0; i < length; i++)
+            var range = new DicomRange<double>(double.MaxValue, double.MinValue);
+            Data.Where(v => v != padding).Each(v => range.Join(v));
+            return range;
+        }
+
+        /// <inheritdoc />
+        public DicomRange<double> GetMinMax()
+        {
+            if (Data == null || Data.Length == 0)
             {
-                var value = data[i];
-                if (value == padding) continue;
-                if (value > max) max = value;
-                else if (value < min) min = value;
+                return default(DicomRange<double>);
             }
 
-            return new DicomRange<double>(min, max);
+            var range = new DicomRange<double>(double.MaxValue, double.MinValue);
+            Data.Each(v => range.Join(v));
+            return range;
         }
 
         /// <inheritdoc />
@@ -883,20 +912,27 @@ private GrayscalePixelDataS32(int width, int height, int[] data)
         /// <inheritdoc />
         public DicomRange<double> GetMinMax(int padding)
         {
-            var min = double.MaxValue;
-            var max = double.MinValue;
+            if (Data == null || Data.Length == 0)
+            {
+                return default(DicomRange<double>);
+            }
 
-            var data = Data;
-            var length = data.Length;
-            for (var i = 0; i < length; i++)
+            var range = new DicomRange<double>(double.MaxValue, double.MinValue);
+            Data.Where(v => v != padding).Each(v => range.Join(v));
+            return range;
+        }
+
+        /// <inheritdoc />
+        public DicomRange<double> GetMinMax()
+        {
+            if (Data == null || Data.Length == 0)
             {
-                var value = data[i];
-                if (value == padding) continue;
-                if (value > max) max = value;
-                else if (value < min) min = value;
+                return default(DicomRange<double>);
             }
 
-            return new DicomRange<double>(min, max);
+            var range = new DicomRange<double>(double.MaxValue, double.MinValue);
+            Data.Each(v => range.Join(v));
+            return range;
         }
 
         /// <inheritdoc />
@@ -1059,20 +1095,27 @@ private GrayscalePixelDataU32(int width, int height, uint[] data)
         /// <inheritdoc />
         public DicomRange<double> GetMinMax(int padding)
         {
-            var min = double.MaxValue;
-            var max = double.MinValue;
+            if (Data == null || Data.Length == 0)
+            {
+                return default(DicomRange<double>);
+            }
 
-            var data = Data;
-            var length = data.Length;
-            for (var i = 0; i < length; i++)
+            var range = new DicomRange<double>(double.MaxValue, double.MinValue);
+            Data.Where(v => v != padding).Each(v => range.Join(v));
+            return range;
+        }
+
+        /// <inheritdoc />
+        public DicomRange<double> GetMinMax()
+        {
+            if (Data == null || Data.Length == 0)
             {
-                var value = data[i];
-                if (value == padding) continue;
-                if (value > max) max = value;
-                else if (value < min) min = value;
+                return default(DicomRange<double>);
             }
 
-            return new DicomRange<double>(min, max);
+            var range = new DicomRange<double>(double.MaxValue, double.MinValue);
+            Data.Each(v => range.Join(v));
+            return range;
         }
 
         /// <inheritdoc />
@@ -1207,6 +1250,13 @@ public DicomRange<double> GetMinMax(int padding)
                 "Calculation of min/max pixel values is not supported for 24-bit color pixel data.");
         }
 
+        /// <inheritdoc />
+        public DicomRange<double> GetMinMax()
+        {
+            throw new InvalidOperationException(
+                "Calculation of min/max pixel values is not supported for 24-bit color pixel data.");
+        }
+
         /// <inheritdoc />
         public double GetPixel(int x, int y)
         {

diff --git a/DICOM/StringExtensions.cs b/DICOM/StringExtensions.cs
@@ -2,6 +2,7 @@
 // Licensed under the Microsoft Public License (MS-PL).
 
 using System;
+using System.Collections.Generic;
 
 namespace Dicom
 {
@@ -112,4 +113,17 @@ public static bool Wildcard(this string s, string pattern, bool caseSensitive)
             return j >= pattern.Length;
         }
     }
+
+    public static class EnumerableExtensions
+    {
+
+        public static void Each<T>(this IEnumerable<T> source, Action<T> action)
+        {
+            foreach(T item in source)
+            {
+                action(item);
+            }
+        }
+
+    }
 }