Skip to content

Commit

Permalink
feature/catAxStrings (#8)
Browse files Browse the repository at this point in the history
Slicing readdressed, now works with multilines.
Now slicing is based on the reset function decision that has improved the similarity between Excel XML and only OnlyOffice XML.
Alignment added to labels.
Code refactored for readability purposes
Co-authored-by: ansaraidarbek <[email protected]>
Co-committed-by: ansaraidarbek <[email protected]>
  • Loading branch information
ansaraidarbek authored and GoshaZotov committed Sep 20, 2024
1 parent b2ff161 commit 887fd11
Show file tree
Hide file tree
Showing 3 changed files with 294 additions and 128 deletions.
11 changes: 7 additions & 4 deletions common/Charts/ChartsDrawer.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ var c_oChartBar3dFaces =

var globalGapDepth = 150;
var isTurnOn3DCharts = true;
var standartMarginForCharts = 13;
var standartMarginForCharts = 15;

function arrReverse(arr) {
if(!arr || !arr.length)
Expand Down Expand Up @@ -3097,12 +3097,15 @@ CChartsDrawer.prototype =
this._calculateMarginsChart(chartSpace);
}

if (!this.calcProp.chartGutter.left && !this.calcProp.chartGutter.right && !this.calcProp.chartGutter._bottom && !this.calcProp.chartGutter.top) {
this._calculateMarginsChart(chartSpace);
}

var widthCanvas = chartSpace.extX;
var heightCanvas = chartSpace.extY;

var w = widthCanvas - (this.calcProp.chartGutter._left + this.calcProp.chartGutter._right) / this.calcProp.pxToMM;
var h = heightCanvas - (this.calcProp.chartGutter._top + this.calcProp.chartGutter._bottom) / this.calcProp.pxToMM;


return {w: w , h: h , startX: this.calcProp.chartGutter._left / this.calcProp.pxToMM, startY: this.calcProp.chartGutter._top / this.calcProp.pxToMM};
},
Expand Down Expand Up @@ -16622,9 +16625,9 @@ plotAreaChart.prototype =
var px = 1/this.chartProp.pxToMM;
var plotAreaPoints = this.cChartDrawer.getPlotAreaPoints();
var left = plotAreaPoints.left - px;
var right = plotAreaPoints.right - px;
var right = plotAreaPoints.right;
var top = plotAreaPoints.top - px;
var bottom = plotAreaPoints.bottom - px;
var bottom = plotAreaPoints.bottom;

path.moveTo(left * pathW, bottom * pathH);
path.lnTo(right * pathW, bottom * pathH);
Expand Down
Loading

0 comments on commit 887fd11

Please sign in to comment.