diff options
| author | xuri <xuri.me@gmail.com> | 2020-11-10 23:48:09 +0800 |
|---|---|---|
| committer | xuri <xuri.me@gmail.com> | 2020-11-11 01:03:56 +0800 |
| commit | 2514bb16c682679485dfb5298e1a5797b97bdcd7 (patch) | |
| tree | a53f0e7de3fa76b6462e2016e9a734cbd46b3a42 /drawing.go | |
| parent | 5dd0b4aec2931079e064f1fb393b034ce4934540 (diff) | |
Fix #724, standardize variable naming and update unit tests
Diffstat (limited to 'drawing.go')
| -rw-r--r-- | drawing.go | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -24,11 +24,11 @@ import ( // prepareDrawing provides a function to prepare drawing ID and XML by given // drawingID, worksheet name and default drawingXML. -func (f *File) prepareDrawing(xlsx *xlsxWorksheet, drawingID int, sheet, drawingXML string) (int, string) { +func (f *File) prepareDrawing(ws *xlsxWorksheet, drawingID int, sheet, drawingXML string) (int, string) { sheetRelationshipsDrawingXML := "../drawings/drawing" + strconv.Itoa(drawingID) + ".xml" - if xlsx.Drawing != nil { + if ws.Drawing != nil { // The worksheet already has a picture or chart relationships, use the relationships drawing ../drawings/drawing%d.xml. - sheetRelationshipsDrawingXML = f.getSheetRelationshipsTargetByID(sheet, xlsx.Drawing.RID) + sheetRelationshipsDrawingXML = f.getSheetRelationshipsTargetByID(sheet, ws.Drawing.RID) drawingID, _ = strconv.Atoi(strings.TrimSuffix(strings.TrimPrefix(sheetRelationshipsDrawingXML, "../drawings/drawing"), ".xml")) drawingXML = strings.Replace(sheetRelationshipsDrawingXML, "..", "xl", -1) } else { @@ -42,13 +42,13 @@ func (f *File) prepareDrawing(xlsx *xlsxWorksheet, drawingID int, sheet, drawing // prepareChartSheetDrawing provides a function to prepare drawing ID and XML // by given drawingID, worksheet name and default drawingXML. -func (f *File) prepareChartSheetDrawing(xlsx *xlsxChartsheet, drawingID int, sheet string) { +func (f *File) prepareChartSheetDrawing(cs *xlsxChartsheet, drawingID int, sheet string) { sheetRelationshipsDrawingXML := "../drawings/drawing" + strconv.Itoa(drawingID) + ".xml" // Only allow one chart in a chartsheet. sheetRels := "xl/chartsheets/_rels/" + strings.TrimPrefix(f.sheetMap[trimSheetName(sheet)], "xl/chartsheets/") + ".rels" rID := f.addRels(sheetRels, SourceRelationshipDrawingML, sheetRelationshipsDrawingXML, "") f.addSheetNameSpace(sheet, SourceRelationship) - xlsx.Drawing = &xlsxDrawing{ + cs.Drawing = &xlsxDrawing{ RID: "rId" + strconv.Itoa(rID), } return |