Merge pull request #18 from dotnet-campus/t/lindexi/PixelSize

加上像素尺寸支持

Author: walterlv

src/dotnetCampus.OpenXMLUnitConverter/PixelSize.cs

@@ -0,0 +1,71 @@
+using System;
+
+namespace dotnetCampus.OpenXmlUnitConverter
+{
+    /// <summary>
+    /// 像素尺寸
+    /// </summary>
+    public readonly struct PixelSize : IEquatable<PixelSize>
+    {
+        /// <summary>
+        /// 像素尺寸
+        /// </summary>
+        /// <param name="width"></param>
+        /// <param name="height"></param>
+        public PixelSize(Pixel width, Pixel height)
+        {
+            Width = width;
+            Height = height;
+        }
+
+        /// <summary>
+        /// 宽度
+        /// </summary>
+        public Pixel Width { get; }
+
+        /// <summary>
+        /// 高度
+        /// </summary>
+        public Pixel Height { get; }
+
+        /// <inheritdoc />
+        public bool Equals(PixelSize other)
+        {
+            return Width.Equals(other.Width) && Height.Equals(other.Height);
+        }
+
+        /// <inheritdoc />
+        public override bool Equals(object? obj)
+        {
+            return obj is PixelSize other && Equals(other);
+        }
+
+        /// <inheritdoc />
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return (Width.GetHashCode() * 397) ^ Height.GetHashCode();
+            }
+        }
+
+        /// <summary>
+        /// 判断相等
+        /// </summary>
+        public static bool operator ==(PixelSize left, PixelSize right)
+        {
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// 判断不相等
+        /// </summary>
+        public static bool operator !=(PixelSize left, PixelSize right)
+        {
+            return !left.Equals(right);
+        }
+
+        /// <inheritdoc />
+        public override string ToString() => $"W={Width}; H={Height}";
+    }
+}

src/dotnetCampus.OpenXmlUnitConverter/UnitConverter.cs

@@ -206,5 +206,15 @@ public static EmuPoint ToEmuPoint(this PixelPoint pixelPoint) =>
             new EmuPoint(pixelPoint.X.ToEmu(), pixelPoint.Y.ToEmu());
 
         #endregion
+
+        #region PixelSize
+
+        public static PixelSize ToPixelSize(this EmuSize emuPoint) =>
+            new PixelSize(emuPoint.Width.ToPixel(), emuPoint.Height.ToPixel());
+
+        public static EmuSize ToEmuSize(this PixelSize pixelPoint) =>
+            new EmuSize(pixelPoint.Width.ToEmu(), pixelPoint.Height.ToEmu());
+
+        #endregion
     }
 }

tests/dotnetCampus.OpenXmlUnitConverter.Tests/PixelSizeTest.cs

@@ -0,0 +1,24 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using MSTest.Extensions.Contracts;
+
+namespace dotnetCampus.OpenXmlUnitConverter.Tests
+{
+    [TestClass]
+    public class PixelSizeTest
+    {
+        [ContractTestCase]
+        public void Convert()
+        {
+            "传入 EMU 表示的尺寸，可以转换为像素表示的尺寸，反向互转值相同".Test(() =>
+            {
+                var emuSize = new EmuSize(new Emu(952500), new Emu(95250));
+                var pixelSize = emuSize.ToPixelSize();
+
+                Assert.AreEqual(100, pixelSize.Width.Value);
+                Assert.AreEqual(10, pixelSize.Height.Value);
+
+                Assert.AreEqual(emuSize, pixelSize.ToEmuSize());
+            });
+        }
+    }
+}