Skip to content

S
sdkjs
Commit 9fe0711f authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov
Browse files
Options

delete _filled_accumulative 

delete _noendxtick
delete _noendytick

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51856 954022d7-b5bf-4e40-9824-e11837661b57
parent 77d66f81
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 141 deletions
Common/Charts/charts.js
View file @ 9fe0711f
......@@ -1800,9 +1800,6 @@ function DrawLineChart(chartCanvas, chartType, chartSubType, data, chart) {
bar.firstData = copyData;
bar._otherProps._ylabels_count = 'auto';
//обводка графика для поверхностной диаграммы
bar._otherProps._filled_accumulative = false;
if (bar._otherProps._filled != true) {
bar._chartGutter._left = 35;
bar._chartGutter._bottom = 35;
......
Common/Charts/libraries/OfficeExcel.bar.js
View file @ 9fe0711f
......@@ -288,25 +288,17 @@
yEnd = AA(this, yEnd);
//////////////// X TICKS ////////////////
var noEndXTick = this._otherProps._noendxtick;
for (x=this._chartGutter._left + (yaxispos == 'left' ? xTickGap : 0); x<this.canvas.width - this._chartGutter._right + (yaxispos == 'left' ? 5 : 0); x+=xTickGap) {
if (yaxispos == 'left' && !noEndXTick && x > this._chartGutter._left) {
if (yaxispos == 'left' && x > this._chartGutter._left) {
this.context.moveTo(AA(this, x), yStart);
this.context.lineTo(AA(this, x), yEnd);
} else if (yaxispos == 'left' && noEndXTick && x > this._chartGutter._left && x < (this.canvas.width - this._chartGutter._right) ) {
} else if (yaxispos == 'right' && x < (this.canvas.width - this._chartGutter._right)) {
this.context.moveTo(AA(this, x), yStart);
this.context.lineTo(AA(this, x), yEnd);
} else if (yaxispos == 'right' && x < (this.canvas.width - this._chartGutter._right) && !noEndXTick) {
this.context.moveTo(AA(this, x), yStart);
this.context.lineTo(AA(this, x), yEnd);
} else if (yaxispos == 'right' && x < (this.canvas.width - this._chartGutter._right) && x > (this._chartGutter._left) && noEndXTick) {
this.context.moveTo(AA(this, x), yStart);
this.context.lineTo(AA(this, x), yEnd);
}
}
......
Common/Charts/libraries/OfficeExcel.chartProperties.js
View file @ 9fe0711f
......@@ -132,12 +132,8 @@ OfficeExcel.OtherProps = function()
this._key_halign = 'right';
this._key_text_size = 10;
this._noendxtick = false;
this._noendytick = true;
this._filled = false;
this._filled_range = false;
this._filled_accumulative = true;
this._xaxis = true;
......
Common/Charts/libraries/OfficeExcel.line.js
View file @ 9fe0711f
......@@ -71,18 +71,6 @@
// Reset max
this.max = 0;
if (this._otherProps._filled && !this._otherProps._filled_range && this.data.length > 1 && this._otherProps._filled_accumulative) {
var accumulation = [];
for (var _set = 0; _set < this.data.length; ++_set) {
for (var point = 0; point < this.data[_set].length; ++point) {
this.data[_set][point] = Number(accumulation[point] ? accumulation[point] : 0) + this.data[_set][point];
accumulation[point] = this.data[_set][point];
}
}
}
// Max y
//if('auto' != this._otherProps._ylabels_count)
if (this._otherProps._ymax && this.scale) {
......@@ -212,65 +200,6 @@
this.context.stroke();
}
/**
* If the line is filled re-stroke the lines
*/
if (this._otherProps._filled && this._otherProps._filled_accumulative) {
for (var i=0; i<this.coords2.length; ++i) {
this.context.beginPath();
this.context.lineWidth = this.GetLineWidth(i);
this.context.strokeStyle = this._otherProps._colors[i];
for (var j=0; j<this.coords2[i].length; ++j) {
if (j == 0 || this.coords2[i][j][1] == null || (this.coords2[i][j - 1] && this.coords2[i][j - 1][1] == null)) {
this.context.moveTo(this.coords2[i][j][0], this.coords2[i][j][1]);
} else {
if (this._otherProps._stepped) {
this.context.lineTo(this.coords2[i][j][0], this.coords2[i][j - 1][1]);
}
this.context.lineTo(this.coords2[i][j][0], this.coords2[i][j][1]);
}
}
this.context.stroke();
// No fill!
}
//Redraw the tickmarks
if (this._otherProps._tickmarks) {
this.context.beginPath();
this.context.fillStyle = 'white';
for (var i = 0; i < this.coords2.length; ++i) {
this.context.beginPath();
this.context.strokeStyle = this._otherProps._colors[i];
for (var j = 0; j < this.coords2[i].length; ++j) {
if (typeof(this.coords2[i][j]) == 'object' && typeof(this.coords2[i][j][0]) == 'number' && typeof(this.coords2[i][j][1]) == 'number') {
var tickmarks = typeof(this._otherProps._tickmarks) == 'object' ? this._otherProps._tickmarks[i] : this._otherProps._tickmarks;
this.DrawTick ( this.coords2[i][j],
this.coords2[i][j][0],
this.coords2[i][j][1],
this.context.strokeStyle,
j == 0 ? 0 : this.coords2[i][j - 1][0],
j == 0 ? 0 : this.coords2[i][j - 1][1],
tickmarks,
j);
}
}
}
this.context.stroke();
this.context.fill();
}
}
// Draw the labels
this.DrawLabels(isFormatCell);
......@@ -432,14 +361,6 @@
if (this._otherProps._yaxispos == 'right' && x >= (this.canvas.width - this._chartGutter._right - 1) )
break;
// If the last tick is not desired...
if (this._otherProps._noendxtick) {
if (this._otherProps._yaxispos == 'left' && x >= (this.canvas.width - this._chartGutter._right))
break;
else if (this._otherProps._yaxispos == 'right' && x == this._chartGutter._left)
continue;
}
var yStart = this._otherProps._xaxispos == 'center' ? (this._chartGutter._top + (this.grapharea / 2)) - 3 : this.canvas.height - this._chartGutter._bottom;
var yEnd = this._otherProps._xaxispos == 'center' ? yStart + 6 : this.canvas.height - this._chartGutter._bottom - (x % 60 == 0 ? this._otherProps._largexticks * this._otherProps._tickdirection : this._otherProps._smallxticks * this._otherProps._tickdirection);
......@@ -1252,35 +1173,15 @@
*/
if (this._otherProps._filled && !this._otherProps._filled_range) {
// Is this needed ??
var fillStyle = this._otherProps._fillstyle;
/**
* Draw the bottom edge of the filled bit using either the X axis or the prevlinedata,
* depending on the index of the line. The first line uses the X axis, and subsequent
* lines use the prevLineCoords array
*/
if (index > 0 && this._otherProps._filled_accumulative) {
this.context.lineTo(xPos, prevLineCoords ? prevLineCoords[i - 1][1] : (this.canvas.height - this._chartGutter._bottom - 1 + (this._otherProps._xaxispos == 'center' ? (this.canvas.height - this._chartGutter._top - this._chartGutter._bottom) / 2 : 0)));
for (var k=(i - 1); k>=0; --k) {
this.context.lineTo(k == 0 ? prevLineCoords[k][0] + 1: prevLineCoords[k][0], prevLineCoords[k][1]);
}
} else {
if (this._otherProps._xaxispos == 'top') {
this.context.lineTo(xPos, this._chartGutter._top + 1);
this.context.lineTo(lineCoords[0][0],this._chartGutter._top + 1);
} else if (typeof(lineCoords[i - 1][1]) == 'number') {
var yPosition = this.nullPositionOX;
// Draw a line down to the X axis
if (this._otherProps._xaxispos == 'top') {
this.context.lineTo(xPos, this._chartGutter._top + 1);
this.context.lineTo(lineCoords[0][0],this._chartGutter._top + 1);
} else if (typeof(lineCoords[i - 1][1]) == 'number') {
var yPosition = this.nullPositionOX;
this.context.lineTo(xPos,yPosition);
this.context.lineTo(lineCoords[0][0],yPosition);
}
}
this.context.lineTo(xPos,yPosition);
this.context.lineTo(lineCoords[0][0],yPosition);
}
this.context.fillStyle = fill;
......
Common/Charts/libraries/OfficeExcel.scatter.js
View file @ 9fe0711f
......@@ -353,25 +353,11 @@
for (y=this._chartGutter._top,countTick = 0; y <= this.canvas.height - this._chartGutter._bottom + 1 + (this._otherProps._xaxispos == 'center' ? 1 : 0) ; y+=(graphHeight / numyticks),countTick++) {
// This is here to accomodate the X axis being at the center
//if (y == (this._chartGutter._top + ((this.canvas.height - this._chartGutter._top - this._chartGutter._bottom) / 2)) ) continue;
if(countTick == numyticks)
y = this.canvas.height - this._chartGutter._bottom;
// if (this._otherProps._yaxispos == 'left') {
context.moveTo(this.nullPositionOX, AA(this, y));
context.lineTo(this.nullPositionOX - 3, AA(this, y));
/*} else {
context.moveTo(this.nullPositionOX +3, AA(this, y));
context.lineTo(this.nullPositionOX, AA(this, y));
}*/
/**
* Draw an extra tick if the X axis isn't being shown
*/
if (this._otherProps._xaxis == false && this._otherProps._noendytick == false) {
this.context.moveTo(this._chartGutter._left, AA(this, this.canvas.height - this._chartGutter._bottom));
this.context.lineTo(this._chartGutter._left - 3, AA(this, this.canvas.height - this._chartGutter._bottom));
}
context.moveTo(this.nullPositionOX, AA(this, y));
context.lineTo(this.nullPositionOX - 3, AA(this, y));
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7