Skip to content

S
sdkjs
Commit 3a090fac authored by Sergey.Luzyanin's avatar Sergey.Luzyanin
Browse files
Options

Bug #31512 - Смещение подписи вертикальной оси диаграммы в DOCX файле 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68292 954022d7-b5bf-4e40-9824-e11837661b57
parent 2d2bd416
Show whitespace changes
Inline Side-by-side
Showing with 139 additions and 160 deletions
Common/Drawings/CommonController.js
View file @ 3a090fac
...@@ -3272,7 +3272,8 @@ DrawingObjectsController.prototype = ...@@ -3272,7 +3272,8 @@ DrawingObjectsController.prototype =
} }
if(tx_body) if(tx_body)
{ {
if( tx_body.bodyPr && tx_body.bodyPr.vert === nVertTThorz) var oBodyPr = vert_axis.title.getBodyPr();
if(oBodyPr && oBodyPr.vert === nVertTThorz)
{ {
_label = c_oAscChartVertAxisLabelShowSettings.horizontal; _label = c_oAscChartVertAxisLabelShowSettings.horizontal;
} }
......
Common/Drawings/Format/ChartFormat.js
View file @ 3a090fac
...@@ -359,13 +359,17 @@ CDLbl.prototype = ...@@ -359,13 +359,17 @@ CDLbl.prototype =
var _vertical_shift; var _vertical_shift;
var _text_rect_height = _b - _t; var _text_rect_height = _b - _t;
var _text_rect_width = _r - _l; var _text_rect_width = _r - _l;
if (_body_pr.upright === false) var nVert = _body_pr.vert;
if (!_body_pr.upright)
{ {
if (!(_body_pr.vert === nVertTTvert || _body_pr.vert === nVertTTvert270)) if (!(nVert === nVertTTvert || nVert === nVertTTvert270))
{ {
if (/*_content_height < _text_rect_height*/true) switch (_body_pr.anchor)
{ {
switch (_body_pr.anchor) {
case 0: //b case 0: //b
{ // (Text Anchor Enum ( Bottom )) { // (Text Anchor Enum ( Bottom ))
_vertical_shift = _text_rect_height - _content_height; _vertical_shift = _text_rect_height - _content_height;
...@@ -392,36 +396,22 @@ CDLbl.prototype = ...@@ -392,36 +396,22 @@ CDLbl.prototype =
break; break;
} }
} }
}
else {
_vertical_shift = 0;
//_vertical_shift = _text_rect_height - _content_height;
/*if(_body_pr.anchor === 0)
{
_vertical_shift = _text_rect_height - _content_height;
}
else
{
_vertical_shift = 0;
} */
}
global_MatrixTransformer.TranslateAppend(_text_transform, 0, _vertical_shift); global_MatrixTransformer.TranslateAppend(_text_transform, 0, _vertical_shift);
if (_dx_lt_rb * _dy_t - _dy_lt_rb * _dx_t <= 0) { if (_dx_lt_rb * _dy_t - _dy_lt_rb * _dx_t <= 0) {
var alpha = Math.atan2(_dy_t, _dx_t); var alpha = Math.atan2(_dy_t, _dx_t);
global_MatrixTransformer.RotateRadAppend(_text_transform, -alpha - (isRealNumber(_body_pr.rot) ? _body_pr.rot*cToRad2 : 0)); global_MatrixTransformer.RotateRadAppend(_text_transform, -alpha);
global_MatrixTransformer.TranslateAppend(_text_transform, _t_x_lt, _t_y_lt); global_MatrixTransformer.TranslateAppend(_text_transform, _t_x_lt, _t_y_lt);
} }
else { else {
alpha = Math.atan2(_dy_t, _dx_t); alpha = Math.atan2(_dy_t, _dx_t);
global_MatrixTransformer.RotateRadAppend(_text_transform, Math.PI - alpha - (isRealNumber(_body_pr.rot) ? _body_pr.rot*cToRad2 : 0)); global_MatrixTransformer.RotateRadAppend(_text_transform, Math.PI - alpha);
global_MatrixTransformer.TranslateAppend(_text_transform, _t_x_rt, _t_y_rt); global_MatrixTransformer.TranslateAppend(_text_transform, _t_x_rt, _t_y_rt);
} }
} }
else { else
if (/*_content_height < _text_rect_width*/true) { {
switch (_body_pr.anchor) { switch (_body_pr.anchor)
{
case 0: //b case 0: //b
{ // (Text Anchor Enum ( Bottom )) { // (Text Anchor Enum ( Bottom ))
_vertical_shift = _text_rect_width - _content_height; _vertical_shift = _text_rect_width - _content_height;
...@@ -448,45 +438,33 @@ CDLbl.prototype = ...@@ -448,45 +438,33 @@ CDLbl.prototype =
break; break;
} }
} }
}
else {
_vertical_shift = 0;
/*if(_body_pr.anchor === 0)
{
_vertical_shift = _text_rect_width - _content_height;
}
else
{
_vertical_shift = 0;
} */
}
global_MatrixTransformer.TranslateAppend(_text_transform, 0, _vertical_shift); global_MatrixTransformer.TranslateAppend(_text_transform, 0, _vertical_shift);
var _alpha; var _alpha;
_alpha = Math.atan2(_dy_t, _dx_t); _alpha = Math.atan2(_dy_t, _dx_t);
if (_body_pr.vert === nVertTTvert) { if (nVert === nVertTTvert) {
if (_dx_lt_rb * _dy_t - _dy_lt_rb * _dx_t <= 0) { if (_dx_lt_rb * _dy_t - _dy_lt_rb * _dx_t <= 0) {
global_MatrixTransformer.RotateRadAppend(_text_transform, -_alpha - Math.PI * 0.5 + (isRealNumber(_body_pr.rot) ? _body_pr.rot*cToRad2 : 0)); global_MatrixTransformer.RotateRadAppend(_text_transform, -_alpha - Math.PI * 0.5);
global_MatrixTransformer.TranslateAppend(_text_transform, _t_x_rt, _t_y_rt); global_MatrixTransformer.TranslateAppend(_text_transform, _t_x_rt, _t_y_rt);
} }
else { else {
global_MatrixTransformer.RotateRadAppend(_text_transform, Math.PI * 0.5 - _alpha + (isRealNumber(_body_pr.rot) ? _body_pr.rot*cToRad2 : 0)); global_MatrixTransformer.RotateRadAppend(_text_transform, Math.PI * 0.5 - _alpha);
global_MatrixTransformer.TranslateAppend(_text_transform, _t_x_lt, _t_y_lt); global_MatrixTransformer.TranslateAppend(_text_transform, _t_x_lt, _t_y_lt);
} }
} }
else { else {
if (_dx_lt_rb * _dy_t - _dy_lt_rb * _dx_t <= 0) { if (_dx_lt_rb * _dy_t - _dy_lt_rb * _dx_t <= 0) {
global_MatrixTransformer.RotateRadAppend(_text_transform, -_alpha - Math.PI * 1.5 + (isRealNumber(_body_pr.rot) ? _body_pr.rot*cToRad2 : 0)); global_MatrixTransformer.RotateRadAppend(_text_transform, -_alpha - Math.PI * 1.5);
global_MatrixTransformer.TranslateAppend(_text_transform, _t_x_lb, _t_y_lb); global_MatrixTransformer.TranslateAppend(_text_transform, _t_x_lb, _t_y_lb);
} }
else { else {
global_MatrixTransformer.RotateRadAppend(_text_transform, -Math.PI * 0.5 - _alpha + (isRealNumber(_body_pr.rot) ? _body_pr.rot*cToRad2 : 0)); global_MatrixTransformer.RotateRadAppend(_text_transform, -Math.PI * 0.5 - _alpha);
global_MatrixTransformer.TranslateAppend(_text_transform, _t_x_rb, _t_y_rb); global_MatrixTransformer.TranslateAppend(_text_transform, _t_x_rb, _t_y_rb);
} }
} }
} }
} }
else { else {
var _full_rotate = 0;
var _full_flip = {flipH: false, flipV: false}; var _full_flip = {flipH: false, flipV: false};
var _hc = this.extX * 0.5; var _hc = this.extX * 0.5;
...@@ -496,9 +474,7 @@ CDLbl.prototype = ...@@ -496,9 +474,7 @@ CDLbl.prototype =
var _content_width, content_height2; var _content_width, content_height2;
if (checkNormalRotate(_full_rotate) ) if (!(nVert === nVertTTvert || nVert === nVertTTvert270))
{
if (!(_body_pr.vert === nVertTTvert || _body_pr.vert === nVertTTvert270))
{ {
_content_width = _r - _l; _content_width = _r - _l;
content_height2 = _b - _t; content_height2 = _b - _t;
...@@ -508,21 +484,9 @@ CDLbl.prototype = ...@@ -508,21 +484,9 @@ CDLbl.prototype =
_content_width = _b - _t; _content_width = _b - _t;
content_height2 = _r - _l; content_height2 = _r - _l;
} }
}
else {
if (!(_body_pr.vert === nVertTTvert || _body_pr.vert === nVertTTvert270)) {
_content_width = _b - _t;
content_height2 = _r - _l;
} switch (_body_pr.anchor)
else { {
_content_width = _r - _l;
content_height2 = _b - _t;
}
}
if (/*_content_height < content_height2*/true) {
switch (_body_pr.anchor) {
case 0: //b case 0: //b
{ // (Text Anchor Enum ( Bottom )) { // (Text Anchor Enum ( Bottom ))
_vertical_shift = content_height2 - _content_height; _vertical_shift = content_height2 - _content_height;
...@@ -549,18 +513,6 @@ CDLbl.prototype = ...@@ -549,18 +513,6 @@ CDLbl.prototype =
break; break;
} }
} }
}
else {
_vertical_shift = 0;
/*if(_body_pr.anchor === 0)
{
_vertical_shift = content_height2 - _content_height;
}
else
{
_vertical_shift = 0;
} */
}
var _text_rect_xc = _l + (_r - _l) * 0.5; var _text_rect_xc = _l + (_r - _l) * 0.5;
var _text_rect_yc = _t + (_b - _t) * 0.5; var _text_rect_yc = _t + (_b - _t) * 0.5;
...@@ -584,28 +536,25 @@ CDLbl.prototype = ...@@ -584,28 +536,25 @@ CDLbl.prototype =
} }
global_MatrixTransformer.TranslateAppend(_text_transform, 0, _vertical_shift); global_MatrixTransformer.TranslateAppend(_text_transform, 0, _vertical_shift);
if (_body_pr.vert === nVertTTvert) { if (nVert === nVertTTvert) {
global_MatrixTransformer.TranslateAppend(_text_transform, -_content_width * 0.5, -content_height2 * 0.5); global_MatrixTransformer.TranslateAppend(_text_transform, -_content_width * 0.5, -content_height2 * 0.5);
global_MatrixTransformer.RotateRadAppend(_text_transform, -Math.PI * 1.5); global_MatrixTransformer.RotateRadAppend(_text_transform, -Math.PI * 1.5);
global_MatrixTransformer.TranslateAppend(_text_transform, _content_width * 0.5, content_height2 * 0.5); global_MatrixTransformer.TranslateAppend(_text_transform, _content_width * 0.5, content_height2 * 0.5);
} }
if (_body_pr.vert === nVertTTvert270) { if (nVert === nVertTTvert270) {
global_MatrixTransformer.TranslateAppend(_text_transform, -_content_width * 0.5, -content_height2 * 0.5); global_MatrixTransformer.TranslateAppend(_text_transform, -_content_width * 0.5, -content_height2 * 0.5);
global_MatrixTransformer.RotateRadAppend(_text_transform, -Math.PI * 1.5); global_MatrixTransformer.RotateRadAppend(_text_transform, -Math.PI * 1.5);
global_MatrixTransformer.TranslateAppend(_text_transform, _content_width * 0.5, content_height2 * 0.5); global_MatrixTransformer.TranslateAppend(_text_transform, _content_width * 0.5, content_height2 * 0.5);
} }
global_MatrixTransformer.TranslateAppend(_text_transform, _transformed_text_xc - _content_width * 0.5, _transformed_text_yc - content_height2 * 0.5); global_MatrixTransformer.TranslateAppend(_text_transform, _transformed_text_xc - _content_width * 0.5, _transformed_text_yc - content_height2 * 0.5);
var l_ins = typeof _body_pr.lIns === "number" ? _body_pr.lIns : 2.54; this.clipRect =
var t_ins = typeof _body_pr.tIns === "number" ? _body_pr.tIns : 1.27; {
var r_ins = typeof _body_pr.rIns === "number" ? _body_pr.rIns : 2.54; x: -_body_pr.lIns,
var b_ins = typeof _body_pr.bIns === "number" ? _body_pr.bIns : 1.27; y: -_vertical_shift - _body_pr.tIns,
this.clipRect = { w: this.contentWidth + (_body_pr.rIns + _body_pr.lIns),
x: -l_ins, h: this.contentHeight + (_body_pr.bIns + _body_pr.tIns)
y: -_vertical_shift - t_ins,
w: this.contentWidth + (r_ins + l_ins),
h: this.contentHeight + (b_ins + t_ins)
}; };
} }
...@@ -862,6 +811,35 @@ CDLbl.prototype = ...@@ -862,6 +811,35 @@ CDLbl.prototype =
ret.anchor = 1; ret.anchor = 1;
} }
//Пока не поддерживаем bodyPr.rot. Костыль под эффект_штурмовика.docx.
if(isRealNumber(ret.rot) && 0 !== ret.rot)
{
if(Math.abs(ret.rot - 5400000) < 1000)
{
if(ret.vert === nVertTTvert270)
{
ret.vert = nVertTThorz;
}
else if(ret.vert === nVertTThorz)
{
ret.vert = nVertTTvert;
}
}
else if(Math.abs(ret.rot + 5400000) < 1000)
{
if(ret.vert === nVertTTvert)
{
ret.vert = nVertTThorz;
}
else if(ret.vert === nVertTThorz)
{
ret.vert = nVertTTvert270;
}
}
}
//
switch (ret.vert) switch (ret.vert)
{ {
case nVertTTeaVert: case nVertTTeaVert:
......
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