- auto get image extension name #10

- Image custom width and height

Author: shps951023

samples/docx/TestBasicImage.png

@@ -51,12 +51,14 @@ static void ReplaceTag(this OpenXmlElement xmlElement, WordprocessingDocument do
 									}
 
 									var mainPart = docx.MainDocumentPart;
-                                    var imagePart = mainPart.AddImagePart(ImagePartType.Png);//TODO: jpg..
+
+									var imagePart = mainPart.AddImagePart(pic.GetImagePartType);
                                     using (var stream = new MemoryStream(l_Data))
                                     {
                                         imagePart.FeedData(stream);
                                         AddPicture(run, mainPart.GetIdOfPart(imagePart), pic);
-                                    }
+
+									}
 									t.Remove();
                                 }
                                 else
@@ -76,7 +78,7 @@ private static void AddPicture(OpenXmlElement appendElement, string relationship
 			var element =
 				 new Drawing(
 					 new DW.Inline(
-						 new DW.Extent() { Cx = pic.Width, Cy = pic.Height },
+						 new DW.Extent() { Cx = pic.Cx, Cy = pic.Cy },
 						 new DW.EffectExtent()
 						 {
 							 LeftEdge = 0L,
@@ -98,7 +100,7 @@ private static void AddPicture(OpenXmlElement appendElement, string relationship
 										 new PIC.NonVisualDrawingProperties()
 										 {
 											 Id = (UInt32Value)0U,
-											 Name = $"New Bitmap Image{Guid.NewGuid().ToString()}.png"
+											 Name = $"Image {Guid.NewGuid().ToString()}.{pic.Extension}"
 										 },
 										 new PIC.NonVisualPictureDrawingProperties()),
 									 new PIC.BlipFill(
@@ -120,7 +122,7 @@ private static void AddPicture(OpenXmlElement appendElement, string relationship
 									 new PIC.ShapeProperties(
 										 new A.Transform2D(
 											 new A.Offset() { X = 0L, Y = 0L },
-											 new A.Extents() { Cx = pic.Width, Cy = pic.Height }),
+											 new A.Extents() { Cx = pic.Cx, Cy = pic.Cy }),
 										 new A.PresetGeometry(
 											 new A.AdjustValueList()
 										 )

src/MiniWord/MiniWord.cs

@@ -1,13 +1,62 @@
 namespace MiniSoftware
 {
     using DocumentFormat.OpenXml;
+    using DocumentFormat.OpenXml.Packaging;
+    using System;
+    using System.Collections.Generic;
 
     public class MiniWordPicture
     {
+
+
         public string Path { get; set; }
-        public byte[] Bytes { get; set; }
-		public Int64Value Width { get; set; } = 990000L;
+        private string _extension;
+        public string Extension
+        {
+            get
+            {
+                if (Path != null)
+                    return System.IO.Path.GetExtension(Path).ToUpperInvariant().Replace(".", "");
+                else
+                {
+                    return _extension.ToUpper();
+                }
+            }
+            set { _extension = value; }
+        }
+        internal ImagePartType GetImagePartType
+        {
+            get
+            {
+                switch (Extension.ToLower())
+                {
+                    case "bmp": return ImagePartType.Bmp;
+                    case "emf": return ImagePartType.Emf;
+                    case "ico": return ImagePartType.Icon;
+                    case "jpg": return ImagePartType.Jpeg;
+                    case "jpeg": return ImagePartType.Jpeg;
+                    case "pcx": return ImagePartType.Pcx;
+                    case "png": return ImagePartType.Png;
+                    case "svg": return ImagePartType.Svg;
+                    case "tiff": return ImagePartType.Tiff;
+                    case "wmf": return ImagePartType.Wmf;
+                    default:
+                        throw new NotSupportedException($"{_extension} is not supported");
+                }
+            }
+        }
 
-		public Int64Value Height { get; set; } = 792000L;
-	}
+        public byte[] Bytes { get; set; }
+        /// <summary>
+        /// Unit is Pixel
+        /// </summary>
+		public Int64Value Width { get; set; } = 400;
+        internal Int64Value Cx { get { return Width * 9525; } }
+        /// <summary>
+        /// Unit is Pixel
+        /// </summary>
+        public Int64Value Height { get; set; } = 400;
+        //format resource from http://openxmltrix.blogspot.com/2011/04/updating-images-in-image-placeholde-and.html
+        internal Int64Value Cy { get { return Height * 9525; } }
+    }
 }

src/MiniWord/MiniWordPicture.cs

@@ -29,7 +29,7 @@ public void TestIssue3()
                 ["VIP"] = true,
                 ["Points"] = 123,
                 ["APP"] = "Demo APP",
-                ["Logo"] = new MiniWordPicture() { Path= @"D:\git\MiniWord\src\MiniWord\icon.png" ,Width= 392000L, Height= 392000L }
+                ["Logo"] = new MiniWordPicture() { Path= PathHelper.GetFile("TestBasicImage.png"), Width= 400, Height= 400 }
             };
             MiniWord.SaveAsByTemplate(path, templatePath, value);
             //Console.WriteLine(path);