Skip to content

Commit fe74203

Browse files
OssianEPPlusJanKallmanAdrianEPPlus
authored
Feature/svg chart and shape (#2326)
* WIP:Refactor * WIP:Fixed errors * WIP:Fixed more errors * Fixed broken shape drawing (bounds were not set) * Fixes issue #2254 * Ugly quick-fix shape theme colors * Added missing file * Added theme to base renderItem constructor. Added paragraph default font * WIP:Fixes for text handling in new implementation * added corrected fillcolors and paragraph spacing * Potential solve if string.Concat was the issue (#2256) * Potential solve if string.Concat was the issue * Added space * Fixed first case * Changed AddText to use DefaultParagraph instead. * Tried to fix center align. WIP * Wip:text fixes * Still two pixels off. Likely Border size * WIP:Fixed bounding boxes to tranform to inherit from transform * Merge fix * Fixed minor spelling mistake * Adjusted rectangle to not be doubled * WIP:Fixes for the Svg Textbox in differnet chart objects. * fixed endgroup for shape + minor misspelling * removed unimplemented function * Measurer from > to >= to adjust for round. + test debug * WIP:Fixes for new positioning system * Major re-write of line handling * WIP:Textbox fixes+powerquery metadata * Fixes issue #2261 * WIP:Textbox * Broken messy solution * Added more checks on the ExcelCustomXml.Save method - #2254 (#2264) * Fixed the major issues. width still wrong after 1st line * WIP:Work on auto value axis * Fixes issue #2265 (#2267) * fixed checking for negative sign when using custom number format. (#2259) * Functional non-bugged return of textLines * WIP:Added support for stacked line charts * Removed check for double negative sign in custom format. Replaced by … (#2270) * Removed check for double negative sign in custom format. Replaced by Math.Abs when formatting the string. * Added more tests * added comment * Reverted to using regexp * Added some additional checks for custom format. * EPPlus version 8.4.2 * Added functional implementation of new system * Cleanup and starting to add to addtext * Made it work for charts/regular text * WIP:Added glow effect for chart objects. * Fixed test and a few minor bugs * fixed constructor RunItem now point height * WIP:Changed to unit for bounds to use points everyware. Changed svg render to output pixels. * WIP:Changed to Points in bound and Pixels in render. * Switched additional classes to point from pixel * Fixed rename merge issue * Merge * Fixed calculation error for fonts of same size * Removed commented out classes * Removed old unused TestContainer debug concept * Fixed textLines wrapper * WIP: Fixed several issues related to Textboxes * fixed bug in textData. Started textLines refactor * Recommit last commit * Nearly functrional refactor * Wrapping improvements * Removed irrelevant tests * Fixed richtext wrapping * Removed unneccesary if * Removed unused variables/cleanup * fix: textwrapper, added svg: new wrap + ctr align * Several improvements to centering * Solved space width centering issue * Ensured consistent behaviour of spaces * Partially ruined all things chart in taking in new rt handling * Fixed axis label centering for cat on chart * Made textbox essentially unnecesary?§ * Added titleSvgItem. Added textbox tooltip * Added support for multiple addresses in chart title linked cell * fixed concatenation * Added right-align for svgCharts * Fixed legend and axis issues for svg charts * WIP:Fixes for legend and axis lable * WIP:Fixed ranges in date axis to reflect Excel better * Added vertical alignments to textbody * WIP:Fixed top legend position and Data asix scale * Added multiple tests to verify vertical alignment * Added start of adding datalabels * WIP:Merge with develop8. Right align vertical axis textboxes * Added datalabels without position to line chart * Added basic datalabels with corrected positioning * Added legendIcon to datalabels * Fixed chart legend to be in pts instead of pixels * Fixed datalabel when legend is null bug * WIP:Added new property LabelAlignment to ExcelAxisStandard * Added standalone test options * Fix datalabel bug add testcase * Added independent testing class * Ensured handling of individual datalabels * Added manual layout and font size * Broke out connection lines etc * WIP:Fixes compound lines on line charts. Fixed several issues with axis and line paths. * Added connection points calculation etc * WIP:Fixed thickthin, thinthick and triple compound lines * WIP:Added outer shadow effect on lines * Fixed drawing fill and alignment for line-break chart title * implemented labelpositions and fixed bugs * Added functional manual layout and icon * Fixed datalabels all options at once. Cleanup left * Removed chunky comments * Slight cleanup * Structured and cleanup * WIP:Work on diagonal and vertical horizontal labels * WIP:Fixed diagnal axis label placement. * Wip features * WIP:Vertical and diagonal axis labels * WIP:Fixed vertical/diagonal axis labels for category axis * Added new handling of group items * Actually added new handling of items * Verified that new group item functions as expected * fixed alternative chart-legend handling * WIP:Fixes several failing and hanging tests * Added test options to imagerenderer * WIP:Start work on column/bar charts * storage commit for proof-of-concept ideas * WIP:Work on column charts * Moved tests * WIP:Work on column charts to svg * Fixed axis for svg bar charts * Added first draft of fill translator * WIP:Work on legends with multiple rows * Created basic css-exporter for svg fill and border * Added tests for veryfying corrupt wb * Ensured testing correct file * Fixed ApplyStyles creating corrupt workbook * WIP:Fixed legend issues for barcharts and linecharts * Made use class for gridlines still off * WIP:More fixes for chart legends positioning * "use" lines now appear the same as prev implementation * fixed conflict * WIP:Fixes for Axis and Legends. * WIP:Fix for charts with no visible axis to display series. * Fixed vertical gridlines * Made vertical lines positively signed * WIP:Fixed column chart rendering when having multiple series. * WIP:Axis Title positioning * Added styling items and start of new defs * WIP:Fix for Legends and Bar Chart rendering * WIP: Fixes cap property. Fixes axis positions. * Added alternative defsItems * Fixed one accidental reName * Ensured dynamic grid works when using local pos * WIP:Fixed bar chart redering. * Fixed duplicated code lines git merge miss-match * Fixed other bugs caused by merge/duplication * WIP:Moved axis textboxes to a separate class to allow separate rendering (z-order).Fixed column charts for stacked and stacked percent. * Removed ITextWrapper (replaced by textshaper) * Moved dataHolders. Cleanup and test re-write * Added prev commit test rewrites * WIP:Started work on rendering bar charts * Replaced more of old functionality * Added forgotten file * Removed old references created class wrapper * WIP:Work on Column and Bar Charts * Fixed some wrapping issues * Fixed tests. Were inaccurate to excel * Fixed last of the tests * Fixed linecharts * WIP:Fixes for axis on bar charts * Fixed regression test to not use aptos --------- Co-authored-by: Jan Källman <jan.kallman@epplussoftware.com> Co-authored-by: AdrianEPPlus <162118292+AdrianEPPlus@users.noreply.github.com>
1 parent 2595f04 commit fe74203

File tree

276 files changed

+14275
-4818
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

276 files changed

+14275
-4818
lines changed

appveyor8.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 8.4.2.{build}
1+
version: 8.5.0.{build}
22
branches:
33
only:
44
- develop8
@@ -10,15 +10,15 @@ install:
1010
& $env:temp\dotnet-install.ps1 -Architecture x64 -Version '10.0.100' -InstallDir "$env:ProgramFiles\dotnet"
1111
init:
1212
- ps: >-
13-
Update-AppveyorBuild -Version "8.4.2.$env:appveyor_build_number-$(Get-Date -format yyyyMMdd)-$env:appveyor_repo_branch"
13+
Update-AppveyorBuild -Version "8.5.0.$env:appveyor_build_number-$(Get-Date -format yyyyMMdd)-$env:appveyor_repo_branch"
1414
15-
Write-Host "8.4.2.$env:appveyor_build_number-$(Get-Date -format yyyyMMdd)-$env:appveyor_repo_branch"
15+
Write-Host "8.5.0.$env:appveyor_build_number-$(Get-Date -format yyyyMMdd)-$env:appveyor_repo_branch"
1616
dotnet_csproj:
1717
patch: true
1818
file: '**\*.csproj'
1919
version: '{version}'
20-
assembly_version: 8.4.2.{build}
21-
file_version: 8.4.2.{build}
20+
assembly_version: 8.5.0.{build}
21+
file_version: 8.5.0.{build}
2222
nuget:
2323
project_feed: true
2424
before_build:

docs/api/index.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# EPPlus API Documentation
2+
3+
This section contains the full API reference for EPPlus, generated from the XML comments in the source code.
4+
5+
Browse the namespaces in the sidebar to explore the available classes and members.

docs/articles/breakingchanges.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,4 +215,10 @@ Renaming worksheet's will now change the formula correctly to include single quo
215215
`ExcelColor.Tint` from `decimal` to `double`.
216216

217217
### 8.0.2
218-
* Removed base class from ExcelVmlDrawingPosition and with that the Load, UpdateXml methods and the RowOff and ColOff properties as they were duplicates.
218+
* Removed base class from ExcelVmlDrawingPosition and with that the Load, UpdateXml methods and the RowOff and ColOff properties as they were duplicates.
219+
### 8.5.0
220+
* Setting dataLabelPosition.Top on BarCharts corrupted the excel file when saved. Trying to set this now throws an error instead.
221+
* NumberFormatToTextArgs.NumberFormat now returns the interface IExcelNumberFormat rather than the ExcelNumberFormatXml class. All public variables remain the same and it can be safely cast to ´ExcelNumberFormatXml´ as long as ´Package.Workbook.NumberFormatToTextHandler´ is null.
222+
223+
### 9.0.0
224+
The misspelled enum eCompundLineStyle has been renamed eCompoundLineStyle.

docs/articles/fixedissues.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,24 @@
11
# Features / Fixed issues - EPPlus 8
2+
## Version 8.5.0
3+
### Minor Features
4+
* Added ´CancellationToken´ to Calculate - see [Cancelling a calculation](https://github.com/EPPlusSoftware/EPPlus/wiki/Cancelling-a-calculation).
5+
* Added property ´ValueFromCellsRange´ and the ´SetValueFromCellsRange´ method to data labels on chart series.
6+
* Improved performance for SUMIFS, AVERAGEIFS, COUNTIFS.
7+
* Improved performance for formula calculation with full column references (e.g. A:A, $B:$B).
8+
### Fixed issues
9+
* Deleting pictures in cells, caused a corrupt workbook in rare cases.
10+
* Fixed several formatting issues when reading and writing tables with checkboxes in them.
11+
* Fixed several issues when using a custom ExcelPackage.Workbook.NumberFormatToTextHandler:
12+
* Fixed unary minus coercion on dynamic array results.
13+
* Fixed off-by-one in ´InsertAndShift´ resize condition. This caused an ´ArgumentException´ when calling ´InsertColumn´ on xlsx files where the number of defined columns was at the array boundary.
14+
* Fixed culture-specific DateTime in PowerQuery metadata.
15+
* Calculated field computation in pivot tables did not work correctly in some cases.
16+
* Copying a Connection shape from one workbook to another caused an unhandled exception.
17+
* Having the wrong content type/extension on an image in the workbook package, caused an unhandled exception on load.
18+
Breaking Change:
19+
* Setting dataLabelPosition.Top on BarCharts corrupted the excel file when saved. Trying to set this now throws an error instead.
20+
* NumberFormatToTextArgs.NumberFormat now returns the interface IExcelNumberFormat rather than the ExcelNumberFormatXml class. All public variables remain the same and it can be safely cast to ´ExcelNumberFormatXml´ as long as ´Package.Workbook.NumberFormatToTextHandler´ is null.
21+
222
## Version 8.4.2
323
* Fixed an issue where the ExcelRange.Text property could format negative values with double minus signs in rare cases.
424
* Fixed a performance issue when using FollowDependencyChain = false in the Calculate method. With this option, EPPlus no longer calculates dependent cells or dynamic array formula spills.

docs/docfx.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,10 @@
6464
"default",
6565
"templates/epplus"
6666
],
67-
"globalMetadata":{
68-
"_disableContribution":true
67+
"globalMetadata": {
68+
"_disableContribution": true,
69+
"_appLogoPath": "images/logo.png",
70+
"_appFaviconPath": "images/favicon.ico"
6971
},
7072
"postProcessors": [],
7173
"markdownEngineName": "markdig",

docs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ EPPlus is a .NET Framework/.NET Core library for managing Office Open XML spread
44
The API documentation provided is generated from the XML comments in the EPPlus source code. It is updated when we releases new versions of the library.
55

66
### Breaking changes
7-
See this list of [breaking changes](articles/breakingchanges.html) in version 5.
7+
See this list of [breaking changes](articles/breakingchanges.md) in version 5.

docs/templates/epplus/layout/_master.tmpl

Lines changed: 0 additions & 55 deletions
This file was deleted.

docs/templates/epplus/partials/_logo.liquid

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)