This related qax-os#1813, mitigate inserted image aspect ratio incorrect issue in some cases (qax-os#1842)

- Check the specified base column width and convert it to pixels
- GetPictures returns the Format.ScaleX and Format.ScaleY property with a precision of two decimal places
- Update docs for AddPicture and GetPictures functions
- Update unit tests

Author: t4traw

col.go

@@ -669,8 +669,13 @@ func (f *File) getColWidth(sheet string, col int) int {
 			return int(convertColWidthToPixels(width))
 		}
 	}
-	if ws.SheetFormatPr != nil && ws.SheetFormatPr.DefaultColWidth > 0 {
-		return int(convertColWidthToPixels(ws.SheetFormatPr.DefaultColWidth))
+	if ws.SheetFormatPr != nil {
+		if ws.SheetFormatPr.DefaultColWidth > 0 {
+			return int(convertColWidthToPixels(ws.SheetFormatPr.DefaultColWidth))
+		}
+		if ws.SheetFormatPr.BaseColWidth > 0 {
+			return int(convertColWidthToPixels(float64(ws.SheetFormatPr.BaseColWidth))) + 5
+		}
 	}
 	// Optimization for when the column widths haven't changed.
 	return int(defaultColWidthPixels)
@@ -730,8 +735,13 @@ func (f *File) GetColWidth(sheet, col string) (float64, error) {
 			return width, err
 		}
 	}
-	if ws.SheetFormatPr != nil && ws.SheetFormatPr.DefaultColWidth > 0 {
-		return ws.SheetFormatPr.DefaultColWidth, err
+	if ws.SheetFormatPr != nil {
+		if ws.SheetFormatPr.DefaultColWidth > 0 {
+			return ws.SheetFormatPr.DefaultColWidth, err
+		}
+		if ws.SheetFormatPr.BaseColWidth > 0 {
+			return float64(ws.SheetFormatPr.BaseColWidth), err
+		}
 	}
 	// Optimization for when the column widths haven't changed.
 	return defaultColWidth, err

picture.go

@@ -16,6 +16,7 @@ import (
 	"encoding/xml"
 	"image"
 	"io"
+	"math"
 	"os"
 	"path"
 	"path/filepath"
@@ -151,10 +152,14 @@ func parseGraphicOptions(opts *GraphicOptions) *GraphicOptions {
 // object with the cell, the default value of that is 0.
 //
 // The optional parameter "ScaleX" specifies the horizontal scale of graph
-// object, the default value of that is 1.0 which presents 100%.
+// object. The value of ScaleY must be a floating-point number greater than 0
+// with a precision of two decimal places. The default value of that is 1.0
+// which presents 100%.
 //
-// The optional parameter "ScaleY" specifies the vertical scale of graph object,
-// the default value of that is 1.0 which presents 100%.
+// The optional parameter "ScaleY" specifies the vertical scale of graph object.
+// The value of ScaleY must be a floating-point number greater than 0 with a
+// precision of two decimal places. The default value of that is 1.0 which
+// presents 100%.
 //
 // The optional parameter "Hyperlink" specifies the hyperlink of the graph
 // object.
@@ -488,8 +493,8 @@ func (f *File) addMedia(file []byte, ext string) string {
 // returns the image contents as []byte data types. This function is
 // concurrency safe. Note that this function currently does not support
 // retrieving all properties from the image's Format property, and the value of
-// the ScaleX and ScaleY property may be an approximate precision value in some
-// cases. For example:
+// the ScaleX and ScaleY property is a floating-point number greater than 0 with 
+// a precision of two decimal places. For example:
 //
 //	f, err := excelize.OpenFile("Book1.xlsx")
 //	if err != nil {
@@ -707,8 +712,8 @@ func (f *File) calculatePictureScale(pic *Picture, cx, cy int) {
 	if err != nil || imgCfg.Width <= 0 || imgCfg.Height <= 0 || cx <= 0 || cy <= 0 {
 		return
 	}
-	pic.Format.ScaleX = float64(cx) / float64(EMU) / float64(imgCfg.Width)
-	pic.Format.ScaleY = float64(cy) / float64(EMU) / float64(imgCfg.Height)
+	pic.Format.ScaleX = math.Round(float64(cx)/float64(EMU)/float64(imgCfg.Width)*100) / 100
+	pic.Format.ScaleY = math.Round(float64(cy)/float64(EMU)/float64(imgCfg.Height)*100) / 100
 }
 
 // extractPictureFromDecodeAnchor extracts picture data from a decoded cell

picture_test.go

@@ -39,7 +39,7 @@ func TestAddPicture(t *testing.T) {
 	opts := []GraphicOptions{
 		{Hyperlink: "#Sheet2!D8", HyperlinkType: "Location"},
 		{OffsetX: 10, OffsetY: 10, ScaleX: 0.5, ScaleY: 0.5, Hyperlink: "https://github.com/xuri/excelize", HyperlinkType: "External", Positioning: "oneCell"},
-		{OffsetX: 10, OffsetY: 10, ScaleX: 1.5, ScaleY: 1.5, Hyperlink: "https://github.com/xuri/excelize", HyperlinkType: "External"},
+		{OffsetX: 10, OffsetY: 10, ScaleX: 0.88, ScaleY: 0.88, Hyperlink: "https://github.com/xuri/excelize", HyperlinkType: "External"},
 		{PrintObject: boolPtr(true), Locked: boolPtr(true), OffsetX: 200, ScaleX: 1, ScaleY: 1, Positioning: "oneCell"},
 		{PrintObject: boolPtr(true), Locked: boolPtr(true), AltText: "Excel Logo", LockAspectRatio: true, ScaleX: 1, ScaleY: 1},
 	}

sheetpr_test.go

@@ -85,6 +85,13 @@ func TestSetSheetProps(t *testing.T) {
 	ws.(*xlsxWorksheet).SheetPr = nil
 	assert.NoError(t, f.SetSheetProps("Sheet1", &SheetPropsOptions{TabColorTint: float64Ptr(1)}))
 
+	// Test get column width after set base column width
+	_, err = f.NewSheet("Sheet2")
+	assert.NoError(t, err)
+	assert.NoError(t, f.SetSheetProps("Sheet2", &SheetPropsOptions{BaseColWidth: &baseColWidth}))
+	width, err := f.GetColWidth("Sheet2", "A")
+	assert.NoError(t, err)
+	assert.Equal(t, 8.0, width)
 	// Test set worksheet properties on not exists worksheet
 	assert.EqualError(t, f.SetSheetProps("SheetN", nil), "sheet SheetN does not exist")
 	// Test set worksheet properties with invalid sheet name