Fixed drawingResize dimensions calculation

adjust.go

@@ -38,10 +38,10 @@ var adjustHelperFunc = [9]func(*File, *xlsxWorksheet, string, adjustDirection, i
 		return f.adjustDataValidations(ws, sheet, dir, num, offset, sheetID)
 	},
 	func(f *File, ws *xlsxWorksheet, sheet string, dir adjustDirection, num, offset, sheetID int) error {
-		return f.adjustDefinedNames(ws, sheet, dir, num, offset, sheetID)
+		return f.adjustDefinedNames(sheet, dir, num, offset)
 	},
 	func(f *File, ws *xlsxWorksheet, sheet string, dir adjustDirection, num, offset, sheetID int) error {
-		return f.adjustDrawings(ws, sheet, dir, num, offset, sheetID)
+		return f.adjustDrawings(ws, sheet, dir, num, offset)
 	},
 	func(f *File, ws *xlsxWorksheet, sheet string, dir adjustDirection, num, offset, sheetID int) error {
 		return f.adjustMergeCells(ws, sheet, dir, num, offset, sheetID)
@@ -1034,7 +1034,7 @@ func (from *xlsxFrom) adjustDrawings(dir adjustDirection, num, offset int, editA
 
 // adjustDrawings updates the ending anchor of the two cell anchor pictures
 // and charts object when inserting or deleting rows or columns.
-func (to *xlsxTo) adjustDrawings(dir adjustDirection, num, offset int, editAs string, ok bool) error {
+func (to *xlsxTo) adjustDrawings(dir adjustDirection, num, offset int, ok bool) error {
 	if dir == columns && to.Col+1 >= num && to.Col+offset >= 0 && ok {
 		if to.Col+offset >= MaxColumns {
 			return ErrColumnNumber
@@ -1054,32 +1054,38 @@ func (to *xlsxTo) adjustDrawings(dir adjustDirection, num, offset int, editAs st
 // inserting or deleting rows or columns.
 func (a *xdrCellAnchor) adjustDrawings(dir adjustDirection, num, offset int) error {
 	editAs := a.EditAs
-	if a.From == nil || a.To == nil || editAs == "absolute" {
+	if (a.From == nil && (a.To == nil || a.Ext == nil)) || editAs == "absolute" {
 		return nil
 	}
 	ok, err := a.From.adjustDrawings(dir, num, offset, editAs)
 	if err != nil {
 		return err
 	}
-	return a.To.adjustDrawings(dir, num, offset, editAs, ok || editAs == "")
+	if a.To != nil {
+		return a.To.adjustDrawings(dir, num, offset, ok || editAs == "")
+	}
+	return err
 }
 
 // adjustDrawings updates the existing two cell anchor pictures and charts
 // object when inserting or deleting rows or columns.
 func (a *xlsxCellAnchorPos) adjustDrawings(dir adjustDirection, num, offset int, editAs string) error {
-	if a.From == nil || a.To == nil || editAs == "absolute" {
+	if (a.From == nil && (a.To == nil || a.Ext == nil)) || editAs == "absolute" {
 		return nil
 	}
 	ok, err := a.From.adjustDrawings(dir, num, offset, editAs)
 	if err != nil {
 		return err
 	}
-	return a.To.adjustDrawings(dir, num, offset, editAs, ok || editAs == "")
+	if a.To != nil {
+		return a.To.adjustDrawings(dir, num, offset, ok || editAs == "")
+	}
+	return err
 }
 
 // adjustDrawings updates the pictures and charts object when inserting or
 // deleting rows or columns.
-func (f *File) adjustDrawings(ws *xlsxWorksheet, sheet string, dir adjustDirection, num, offset, sheetID int) error {
+func (f *File) adjustDrawings(ws *xlsxWorksheet, sheet string, dir adjustDirection, num, offset int) error {
 	if ws.Drawing == nil {
 		return nil
 	}
@@ -1128,12 +1134,17 @@ func (f *File) adjustDrawings(ws *xlsxWorksheet, sheet string, dir adjustDirecti
 			return err
 		}
 	}
+	for _, anchor := range wsDr.OneCellAnchor {
+		if err = anchorCb(anchor); err != nil {
+			return err
+		}
+	}
 	return nil
 }
 
 // adjustDefinedNames updates the cell reference of the defined names when
 // inserting or deleting rows or columns.
-func (f *File) adjustDefinedNames(ws *xlsxWorksheet, sheet string, dir adjustDirection, num, offset, sheetID int) error {
+func (f *File) adjustDefinedNames(sheet string, dir adjustDirection, num, offset int) error {
 	wb, err := f.workbookReader()
 	if err != nil {
 		return err

adjust_test.go

@@ -1206,7 +1206,7 @@ func TestAdjustDrawings(t *testing.T) {
 	assert.NoError(t, f.InsertRows("Sheet1", 15, 1))
 	cells, err := f.GetPictureCells("Sheet1")
 	assert.NoError(t, err)
-	assert.Equal(t, []string{"D3", "D13", "B21"}, cells)
+	assert.Equal(t, []string{"D3", "B21", "D13"}, cells)
 	wb := filepath.Join("test", "TestAdjustDrawings.xlsx")
 	assert.NoError(t, f.SaveAs(wb))
 
@@ -1215,7 +1215,7 @@ func TestAdjustDrawings(t *testing.T) {
 	assert.NoError(t, f.RemoveRow("Sheet1", 1))
 	cells, err = f.GetPictureCells("Sheet1")
 	assert.NoError(t, err)
-	assert.Equal(t, []string{"C2", "C12", "B21"}, cells)
+	assert.Equal(t, []string{"C2", "B21", "C12"}, cells)
 
 	// Test adjust existing pictures on inserting columns and rows
 	f, err = OpenFile(wb)
@@ -1227,7 +1227,7 @@ func TestAdjustDrawings(t *testing.T) {
 	assert.NoError(t, f.InsertRows("Sheet1", 16, 1))
 	cells, err = f.GetPictureCells("Sheet1")
 	assert.NoError(t, err)
-	assert.Equal(t, []string{"F4", "F15", "B21"}, cells)
+	assert.Equal(t, []string{"F4", "B21", "F15"}, cells)
 
 	// Test adjust drawings with unsupported charset
 	f, err = OpenFile(wb)
@@ -1267,6 +1267,11 @@ func TestAdjustDrawings(t *testing.T) {
 	assert.NoError(t, err)
 	f.Pkg.Store("xl/drawings/drawing1.xml", []byte(xml.Header+`<wsDr xmlns="http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing"><twoCellAnchor><from><col>0</col><colOff>0</colOff><row>0</row><rowOff>0</rowOff></from><to><col>1</col><colOff>0</colOff><row>1</row><rowOff>0</rowOff></to><mc:AlternateContent xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"></mc:AlternateContent><clientData/></twoCellAnchor></wsDr>`))
 	assert.NoError(t, f.InsertCols("Sheet1", "A", 1))
+
+	f, err = OpenFile(wb)
+	assert.NoError(t, err)
+	f.Pkg.Store("xl/drawings/drawing1.xml", []byte(xml.Header+fmt.Sprintf(`<wsDr xmlns="http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing"><oneCellAnchor><from><col>%d</col><row>0</row></from><mc:AlternateContent xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"></mc:AlternateContent><clientData/></oneCellAnchor></wsDr>`, MaxColumns)))
+	assert.EqualError(t, f.InsertCols("Sheet1", "A", 1), "the column number must be greater than or equal to 1 and less than or equal to 16384")
 }
 
 func TestAdjustDefinedNames(t *testing.T) {
@@ -1330,5 +1335,5 @@ func TestAdjustDefinedNames(t *testing.T) {
 	f = NewFile()
 	f.WorkBook = nil
 	f.Pkg.Store(defaultXMLPathWorkbook, MacintoshCyrillicCharset)
-	assert.EqualError(t, f.adjustDefinedNames(nil, "Sheet1", columns, 0, 0, 1), "XML syntax error on line 1: invalid UTF-8")
+	assert.EqualError(t, f.adjustDefinedNames("Sheet1", columns, 0, 0), "XML syntax error on line 1: invalid UTF-8")
 }

chart_test.go

@@ -93,8 +93,8 @@ func TestChartSize(t *testing.T) {
 		t.FailNow()
 	}
 
-	if !assert.Equal(t, 14, anchor.To.Col, "Expected 'to' column 14") ||
-		!assert.Equal(t, 29, anchor.To.Row, "Expected 'to' row 29") {
+	if !assert.Equal(t, 11, anchor.To.Col, "Expected 'to' column 11") ||
+		!assert.Equal(t, 27, anchor.To.Row, "Expected 'to' row 27") {
 
 		t.FailNow()
 	}

col.go

@@ -14,7 +14,6 @@ package excelize
 import (
 	"bytes"
 	"encoding/xml"
-	"math"
 	"strconv"
 	"strings"
 
@@ -23,10 +22,10 @@ import (
 
 // Define the default cell size and EMU unit of measurement.
 const (
-	defaultColWidth        float64 = 9.140625
-	defaultColWidthPixels  float64 = 64
-	defaultRowHeight       float64 = 15
-	defaultRowHeightPixels float64 = 20
+	defaultColWidth        float64 = 10.5
+	defaultColWidthPixels  float64 = 84.0
+	defaultRowHeight       float64 = 15.6
+	defaultRowHeightPixels float64 = 20.8
 	EMU                    int     = 9525
 )
 
@@ -621,40 +620,35 @@ func flatCols(col xlsxCol, cols []xlsxCol, replacer func(fc, c xlsxCol) xlsxCol)
 //
 //	width           # Width of object frame.
 //	height          # Height of object frame.
-func (f *File) positionObjectPixels(sheet string, col, row, x1, y1, width, height int) (int, int, int, int, int, int) {
+func (f *File) positionObjectPixels(sheet string, col, row, width, height int, opts *GraphicOptions) (int, int, int, int, int, int, int, int) {
 	colIdx, rowIdx := col-1, row-1
-	// Adjust start column for offsets that are greater than the col width.
-	for x1 >= f.getColWidth(sheet, colIdx+1) {
-		colIdx++
-		x1 -= f.getColWidth(sheet, colIdx)
-	}
-
-	// Adjust start row for offsets that are greater than the row height.
-	for y1 >= f.getRowHeight(sheet, rowIdx+1) {
-		rowIdx++
-		y1 -= f.getRowHeight(sheet, rowIdx)
-	}
-
 	// Initialized end cell to the same as the start cell.
 	colEnd, rowEnd := colIdx, rowIdx
+	x1, y1, x2, y2 := opts.OffsetX, opts.OffsetY, width, height
+	if opts.Positioning == "" || opts.Positioning == "twoCell" {
+		// Using a twoCellAnchor, the maximum possible offset is limited by the
+		// "from" cell dimensions. If these were to be exceeded the "toPoint" would
+		// be calculated incorrectly, since the requested "fromPoint" is not possible
+
+		x1 = min(x1, f.getColWidth(sheet, col))
+		y1 = min(y1, f.getRowHeight(sheet, row))
+
+		x2 += x1
+		y2 += y1
+		// Subtract the underlying cell widths to find end cell of the object.
+		for x2 >= f.getColWidth(sheet, colEnd+1) {
+			colEnd++
+			x2 -= f.getColWidth(sheet, colEnd)
+		}
 
-	width += x1
-	height += y1
-
-	// Subtract the underlying cell widths to find end cell of the object.
-	for width >= f.getColWidth(sheet, colEnd+1) {
-		colEnd++
-		width -= f.getColWidth(sheet, colEnd)
-	}
-
-	// Subtract the underlying cell heights to find end cell of the object.
-	for height >= f.getRowHeight(sheet, rowEnd+1) {
-		rowEnd++
-		height -= f.getRowHeight(sheet, rowEnd)
+		// Subtract the underlying cell heights to find end cell of the object.
+		for y2 >= f.getRowHeight(sheet, rowEnd+1) {
+			rowEnd++
+			y2 -= f.getRowHeight(sheet, rowEnd)
+		}
 	}
-
 	// The end vertices are whatever is left from the width and height.
-	return colIdx, rowIdx, colEnd, rowEnd, width, height
+	return colIdx, rowIdx, colEnd, rowEnd, x1, y1, x2, y2
 }
 
 // getColWidth provides a function to get column width in pixels by given
@@ -664,13 +658,14 @@ func (f *File) getColWidth(sheet string, col int) int {
 	ws.mu.Lock()
 	defer ws.mu.Unlock()
 	if ws.Cols != nil {
-		var width float64
+		width := -1.0
 		for _, v := range ws.Cols.Col {
 			if v.Min <= col && col <= v.Max && v.Width != nil {
 				width = *v.Width
+				break
 			}
 		}
-		if width != 0 {
+		if width != -1.0 {
 			return int(convertColWidthToPixels(width))
 		}
 	}
@@ -800,16 +795,15 @@ func (f *File) RemoveCol(sheet, col string) error {
 // pixel. If the width hasn't been set by the user we use the default value.
 // If the column is hidden it has a value of zero.
 func convertColWidthToPixels(width float64) float64 {
-	var padding float64 = 5
 	var pixels float64
-	var maxDigitWidth float64 = 7
+	var maxDigitWidth float64 = 8
 	if width == 0 {
 		return pixels
 	}
 	if width < 1 {
 		pixels = (width * 12) + 0.5
-		return math.Ceil(pixels)
+		return float64(int(pixels))
 	}
-	pixels = (width*maxDigitWidth + 0.5) + padding
-	return math.Ceil(pixels)
+	pixels = (width*maxDigitWidth + 0.5)
+	return float64(int(pixels))
 }

col_test.go

@@ -396,7 +396,7 @@ func TestColWidth(t *testing.T) {
 	width, err = f.GetColWidth("Sheet1", "A")
 	assert.NoError(t, err)
 	assert.Equal(t, 10.0, width)
-	assert.Equal(t, 76, f.getColWidth("Sheet1", 1))
+	assert.Equal(t, 80, f.getColWidth("Sheet1", 1))
 
 	// Test set and get column width with illegal cell reference
 	width, err = f.GetColWidth("Sheet1", "*")

drawing.go

@@ -1392,7 +1392,7 @@ func (f *File) addDrawingChart(sheet, drawingXML, cell string, width, height, rI
 	}
 	width = int(float64(width) * opts.ScaleX)
 	height = int(float64(height) * opts.ScaleY)
-	colStart, rowStart, colEnd, rowEnd, x2, y2 := f.positionObjectPixels(sheet, col, row, opts.OffsetX, opts.OffsetY, width, height)
+	colStart, rowStart, colEnd, rowEnd, x1, y1, x2, y2 := f.positionObjectPixels(sheet, col, row, width, height, opts)
 	content, cNvPrID, err := f.drawingParser(drawingXML)
 	if err != nil {
 		return err
@@ -1401,9 +1401,9 @@ func (f *File) addDrawingChart(sheet, drawingXML, cell string, width, height, rI
 	twoCellAnchor.EditAs = opts.Positioning
 	from := xlsxFrom{}
 	from.Col = colStart
-	from.ColOff = opts.OffsetX * EMU
+	from.ColOff = x1 * EMU
 	from.Row = rowStart
-	from.RowOff = opts.OffsetY * EMU
+	from.RowOff = y1 * EMU
 	to := xlsxTo{}
 	to.Col = colEnd
 	to.ColOff = x2 * EMU

picture.go

@@ -366,25 +366,29 @@ func (f *File) addDrawingPicture(sheet, drawingXML, cell, ext string, rID, hyper
 		width = int(float64(width) * opts.ScaleX)
 		height = int(float64(height) * opts.ScaleY)
 	}
-	colStart, rowStart, colEnd, rowEnd, x2, y2 := f.positionObjectPixels(sheet, col, row, opts.OffsetX, opts.OffsetY, width, height)
+	colStart, rowStart, colEnd, rowEnd, x1, y1, x2, y2 := f.positionObjectPixels(sheet, col, row, width, height, opts)
 	content, cNvPrID, err := f.drawingParser(drawingXML)
 	if err != nil {
 		return err
 	}
-	twoCellAnchor := xdrCellAnchor{}
-	twoCellAnchor.EditAs = opts.Positioning
+	cellAnchor := xdrCellAnchor{}
+	cellAnchor.EditAs = opts.Positioning
 	from := xlsxFrom{}
 	from.Col = colStart
-	from.ColOff = opts.OffsetX * EMU
+	from.ColOff = x1 * EMU
 	from.Row = rowStart
-	from.RowOff = opts.OffsetY * EMU
-	to := xlsxTo{}
-	to.Col = colEnd
-	to.ColOff = x2 * EMU
-	to.Row = rowEnd
-	to.RowOff = y2 * EMU
-	twoCellAnchor.From = &from
-	twoCellAnchor.To = &to
+	from.RowOff = y1 * EMU
+	cellAnchor.From = &from
+
+	if opts.Positioning != "oneCell" {
+		to := xlsxTo{}
+		to.Col = colEnd
+		to.ColOff = x2 * EMU
+		to.Row = rowEnd
+		to.RowOff = y2 * EMU
+		cellAnchor.To = &to
+	}
+
 	pic := xlsxPic{}
 	pic.NvPicPr.CNvPicPr.PicLocks.NoChangeAspect = opts.LockAspectRatio
 	pic.NvPicPr.CNvPr.ID = cNvPrID
@@ -413,14 +417,29 @@ func (f *File) addDrawingPicture(sheet, drawingXML, cell, ext string, rID, hyper
 	}
 	pic.SpPr.PrstGeom.Prst = "rect"
 
-	twoCellAnchor.Pic = &pic
-	twoCellAnchor.ClientData = &xdrClientData{
+	if opts.Positioning == "oneCell" {
+		cx := x2 * EMU
+		cy := y2 * EMU
+		cellAnchor.Ext = &aExt{
+			Cx: cx,
+			Cy: cy,
+		}
+		pic.SpPr.Xfrm.Ext.Cx = cx
+		pic.SpPr.Xfrm.Ext.Cy = cy
+	}
+
+	cellAnchor.Pic = &pic
+	cellAnchor.ClientData = &xdrClientData{
 		FLocksWithSheet:  *opts.Locked,
 		FPrintsWithSheet: *opts.PrintObject,
 	}
 	content.mu.Lock()
 	defer content.mu.Unlock()
-	content.TwoCellAnchor = append(content.TwoCellAnchor, &twoCellAnchor)
+	if opts.Positioning == "oneCell" {
+		content.OneCellAnchor = append(content.OneCellAnchor, &cellAnchor)
+	} else {
+		content.TwoCellAnchor = append(content.TwoCellAnchor, &cellAnchor)
+	}
 	f.Drawings.Store(drawingXML, content)
 	return err
 }
@@ -753,18 +772,15 @@ func (f *File) drawingResize(sheet, cell string, width, height float64, opts *Gr
 			cellHeight += f.getRowHeight(sheet, row)
 		}
 	}
-	if float64(cellWidth) < width {
-		asp := float64(cellWidth) / width
-		width, height = float64(cellWidth), height*asp
-	}
-	if float64(cellHeight) < height {
-		asp := float64(cellHeight) / height
-		height, width = float64(cellHeight), width*asp
+	if float64(cellWidth) < width || float64(cellHeight) < height {
+		aspWidth := float64(cellWidth) / width
+		aspHeight := float64(cellHeight) / height
+		asp := min(aspWidth, aspHeight)
+		width, height = width*asp, height*asp
 	}
 	if opts.AutoFitIgnoreAspect {
 		width, height = float64(cellWidth), float64(cellHeight)
 	}
-	width, height = width-float64(opts.OffsetX), height-float64(opts.OffsetY)
 	w, h = int(width*opts.ScaleX), int(height*opts.ScaleY)
 	return
 }