Commit 6ddd502b authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

delete _text_angle

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51872 954022d7-b5bf-4e40-9824-e11837661b57
parent 297d0d2d
...@@ -729,7 +729,6 @@ ...@@ -729,7 +729,6 @@
OfficeExcel.Bar.prototype.DrawLabels = function (isFormatCell) OfficeExcel.Bar.prototype.DrawLabels = function (isFormatCell)
{ {
var context = this.context; var context = this.context;
var text_angle = this._otherProps._text_angle;
var labels = this._otherProps._labels; var labels = this._otherProps._labels;
var scaleFactor = 1; var scaleFactor = 1;
if(OfficeExcel.drawingCtxCharts && OfficeExcel.drawingCtxCharts.scaleFactor) if(OfficeExcel.drawingCtxCharts && OfficeExcel.drawingCtxCharts.scaleFactor)
...@@ -755,17 +754,6 @@ ...@@ -755,17 +754,6 @@
var angle = 0; var angle = 0;
var halign = 'center'; var halign = 'center';
if (text_angle > 0) {
angle = -1 * text_angle;
halign = 'right';
yOffset -= 5;
if (this._otherProps._xaxispos == 'top') {
halign = 'left';
yOffset += 5;
}
}
// Draw the X axis labels // Draw the X axis labels
context.fillStyle = this._otherProps._text_color; context.fillStyle = this._otherProps._text_color;
...@@ -806,10 +794,10 @@ ...@@ -806,10 +794,10 @@
diffHeight = axisOxAngleOptions ? (axisOxAngleOptions[countLabels]*Math.cos(angle*Math.PI/180) - 10) : 0; diffHeight = axisOxAngleOptions ? (axisOxAngleOptions[countLabels]*Math.cos(angle*Math.PI/180) - 10) : 0;
OfficeExcel.Text(context, font, OfficeExcel.Text(context, font,
text_size, text_size,
x + (this._otherProps._text_angle == 90 ? 0 : 0) - diffWidth, x - diffWidth,
this.nullPositionOX + yOffset*scaleFactor + diffHeight, this.nullPositionOX + yOffset*scaleFactor + diffHeight,
String(labels[i++]), String(labels[i++]),
(this._otherProps._text_angle == 90 ? 'center' : null), null,
halign, halign,
null, null,
angle, angle,
...@@ -822,10 +810,10 @@ ...@@ -822,10 +810,10 @@
{ {
OfficeExcel.Text(context, font, OfficeExcel.Text(context, font,
text_size, text_size,
x + (this._otherProps._text_angle == 90 ? 0 : 0), x,
this._otherProps._xaxispos == 'top' ? this._chartGutter._top - yOffset + text_size - 1: (OfficeExcel.GetHeight(this) - this._chartGutter._bottom) + yOffset, this._otherProps._xaxispos == 'top' ? this._chartGutter._top - yOffset + text_size - 1: (OfficeExcel.GetHeight(this) - this._chartGutter._bottom) + yOffset,
String(labels[i++]), String(labels[i++]),
(this._otherProps._text_angle == 90 ? 'center' : null), null,
halign, halign,
null, null,
angle, angle,
......
...@@ -34,7 +34,6 @@ OfficeExcel.OtherProps = function() ...@@ -34,7 +34,6 @@ OfficeExcel.OtherProps = function()
this._text_color = 'black'; this._text_color = 'black';
this._text_font = 'Arial'; this._text_font = 'Arial';
this._text_size = 10; this._text_size = 10;
this._text_angle = 0;
this._axis_color = 'black'; this._axis_color = 'black';
......
...@@ -218,7 +218,6 @@ ...@@ -218,7 +218,6 @@
OfficeExcel.HBar.prototype.DrawLabels = function (isFormatCell) OfficeExcel.HBar.prototype.DrawLabels = function (isFormatCell)
{ {
var context = this.context; var context = this.context;
var canvas = this.canvas;
var units_pre = this._otherProps._units_pre; var units_pre = this._otherProps._units_pre;
var units_post = this._otherProps._units_post; var units_post = this._otherProps._units_post;
var text_size = this._otherProps._xlabels_size; var text_size = this._otherProps._xlabels_size;
......
...@@ -818,17 +818,6 @@ ...@@ -818,17 +818,6 @@
yOffset += 2; yOffset += 2;
} }
if (typeof(this._otherProps._text_angle) == 'number' && this._otherProps._text_angle > 0) {
angle = -1 * this._otherProps._text_angle;
valign = 'center';
halign = 'right';
yOffset = 10;
if (this._otherProps._xaxispos == 'top') {
yOffset = 10;
}
}
if(this._otherProps._xaxispos == 'top' && 'auto' == this._otherProps._ylabels_count) if(this._otherProps._xaxispos == 'top' && 'auto' == this._otherProps._ylabels_count)
yOffset = 20; yOffset = 20;
else if('auto' == this._otherProps._ylabels_count) else if('auto' == this._otherProps._ylabels_count)
...@@ -866,9 +855,6 @@ ...@@ -866,9 +855,6 @@
labelX = this._chartGutter._left + this._otherProps._hmargin; labelX = this._chartGutter._left + this._otherProps._hmargin;
} }
if (this._otherProps._xaxispos == 'top' && this._otherProps._text_angle > 0) {
halign = 'left';
}
if('auto' == this._otherProps._ylabels_count) if('auto' == this._otherProps._ylabels_count)
{ {
diffWidth = axisOxAngleOptions ? (axisOxAngleOptions[i]*Math.sin(angle*Math.PI/180))/(4) : 0; diffWidth = axisOxAngleOptions ? (axisOxAngleOptions[i]*Math.sin(angle*Math.PI/180))/(4) : 0;
......
...@@ -793,13 +793,6 @@ ...@@ -793,13 +793,6 @@
var valign = null; var valign = null;
var halign = 'center'; var halign = 'center';
if (this._otherProps._text_angle > 0) {
angle = -1 * this._otherProps._text_angle;
valign = 'center';
halign = 'right';
yPos -= 10;
}
for (i=0; i<labels.length; ++i) { for (i=0; i<labels.length; ++i) {
if (typeof(labels[i]) == 'object') { if (typeof(labels[i]) == 'object') {
......
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