Skip to content

S
sdkjs
Commit 85d3b0f4 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov
Browse files
Options

подписи для осей и названия диаграммы 


git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@54103 954022d7-b5bf-4e40-9824-e11837661b57
parent 56e61446
Show whitespace changes
Inline Side-by-side
Showing with 761 additions and 119 deletions
Common/Drawings/Format/ChartFormat.js
View file @ 85d3b0f4
"use strict"; "use strict";
var SCALE_INSET_COEFF = 1.016;//Возможно придется уточнять
function CAreaChart() function CAreaChart()
{ {
this.axId = []; this.axId = [];
...@@ -3138,15 +3140,16 @@ function CDLbl() ...@@ -3138,15 +3140,16 @@ function CDLbl()
this.recalcInfo = this.recalcInfo =
{ {
recalcTransform: true, recalcTransform: true,
recalcTranformText: true, recalcTransformText: true,
recalcStyle: true, recalcStyle: true,
recalculateTxBody: true, recalculateTxBody: true,
recalculateBrush: true, recalculateBrush: true,
recalculatePen: true recalculatePen: true,
} recalculateContent: true
};
this.chart = null;// this.chart = null;//������������ ��� ���������
this.series = null;// this.series = null;//������������ ��� ���������
this.x = 0; this.x = 0;
this.y = 0; this.y = 0;
...@@ -3159,6 +3162,10 @@ function CDLbl() ...@@ -3159,6 +3162,10 @@ function CDLbl()
this.transform = new CMatrix(); this.transform = new CMatrix();
this.transformText = new CMatrix(); this.transformText = new CMatrix();
this.ownTransform = new CMatrix();
this.ownTransformText = new CMatrix();
this.compiledStyles = null; this.compiledStyles = null;
this.Id = g_oIdCounter.Get_NewId(); this.Id = g_oIdCounter.Get_NewId();
...@@ -3182,7 +3189,6 @@ CDLbl.prototype = ...@@ -3182,7 +3189,6 @@ CDLbl.prototype =
return this.spPr && this.spPr.Fill ? this.spPr.Fill : null; return this.spPr && this.spPr.Fill ? this.spPr.Fill : null;
}, },
getCompiledLine: function() getCompiledLine: function()
{ {
return this.spPr && this.spPr.ln ? this.spPr.ln : null; return this.spPr && this.spPr.ln ? this.spPr.ln : null;
...@@ -3219,15 +3225,20 @@ CDLbl.prototype = ...@@ -3219,15 +3225,20 @@ CDLbl.prototype =
this.recalculateTxBody(); this.recalculateTxBody();
this.recalcInfo.recalculateTxBody = false; this.recalcInfo.recalculateTxBody = false;
} }
if(this.recalcInfo.recalculateContent)
{
this.recalculateContent();
this.recalcInfo.recalculateContent = false;
}
if(this.recalcInfo.recalcTransform) if(this.recalcInfo.recalcTransform)
{ {
this.recalculateTransform(); this.recalculateTransform();
this.recalcInfo.recalcTransform = false; this.recalcInfo.recalcTransform = false;
} }
if(this.recalcInfo.recalcTranformText) if(this.recalcInfo.recalcTransformText)
{ {
this.recalculateTransformText(); this.recalculateTransformText();
this.recalcInfo.recalcTranformText = false; this.recalcInfo.recalcTransformText = false;
} }
if(this.chart) if(this.chart)
{ {
...@@ -3251,48 +3262,321 @@ CDLbl.prototype = ...@@ -3251,48 +3262,321 @@ CDLbl.prototype =
recalculateTransform: function() recalculateTransform: function()
{ {
if(this.layout && this.layout.manualLayout)
{ },
if(typeof this.layout.manualLayout.x === "number")
recalculateTransformText: function()
{ {
this.calcX = this.chart.extX*this.layout.x + this.x; if (this.txBody === null)
return;
this.ownTransformText.Reset();
var _text_transform = this.ownTransformText;
var _shape_transform = this.ownTransform;
var _body_pr = this.getBodyPr();
var _content_height = this.txBody.content.Get_SummaryHeight();
var _l, _t, _r, _b;
var _t_x_lt, _t_y_lt, _t_x_rt, _t_y_rt, _t_x_lb, _t_y_lb, _t_x_rb, _t_y_rb;
if (isRealObject(this.spPr) && isRealObject(this.spPr.geometry) && isRealObject(this.spPr.geometry.rect)) {
var _rect = this.spPr.geometry.rect;
_l = _rect.l + _body_pr.lIns;
_t = _rect.t + _body_pr.tIns;
_r = _rect.r - _body_pr.rIns;
_b = _rect.b - _body_pr.bIns;
} }
else else {
_l = _body_pr.lIns;
_t = _body_pr.tIns;
_r = this.extX - _body_pr.rIns;
_b = this.extY - _body_pr.bIns;
}
if (_l >= _r) {
var _c = (_l + _r) * 0.5;
_l = _c - 0.01;
_r = _c + 0.01;
}
if (_t >= _b) {
_c = (_t + _b) * 0.5;
_t = _c - 0.01;
_b = _c + 0.01;
}
_t_x_lt = _shape_transform.TransformPointX(_l, _t);
_t_y_lt = _shape_transform.TransformPointY(_l, _t);
_t_x_rt = _shape_transform.TransformPointX(_r, _t);
_t_y_rt = _shape_transform.TransformPointY(_r, _t);
_t_x_lb = _shape_transform.TransformPointX(_l, _b);
_t_y_lb = _shape_transform.TransformPointY(_l, _b);
_t_x_rb = _shape_transform.TransformPointX(_r, _b);
_t_y_rb = _shape_transform.TransformPointY(_r, _b);
var _dx_t, _dy_t;
_dx_t = _t_x_rt - _t_x_lt;
_dy_t = _t_y_rt - _t_y_lt;
var _dx_lt_rb, _dy_lt_rb;
_dx_lt_rb = _t_x_rb - _t_x_lt;
_dy_lt_rb = _t_y_rb - _t_y_lt;
var _vertical_shift;
var _text_rect_height = _b - _t;
var _text_rect_width = _r - _l;
if (_body_pr.upright === false)
{ {
this.calcX = this.x; if (!(_body_pr.vert === nVertTTvert || _body_pr.vert === nVertTTvert270))
{
if (/*_content_height < _text_rect_height*/true)
{
switch (_body_pr.anchor) {
case 0: //b
{ // (Text Anchor Enum ( Bottom ))
_vertical_shift = _text_rect_height - _content_height;
break;
} }
if(typeof this.layout.manualLayout.y === "number") case 1: //ctr
{// (Text Anchor Enum ( Center ))
_vertical_shift = (_text_rect_height - _content_height) * 0.5;
break;
}
case 2: //dist
{// (Text Anchor Enum ( Distributed )) TODO: пока выравнивание по центру. Переделать!
_vertical_shift = (_text_rect_height - _content_height) * 0.5;
break;
}
case 3: //just
{// (Text Anchor Enum ( Justified )) TODO: пока выравнивание по центру. Переделать!
_vertical_shift = (_text_rect_height - _content_height) * 0.5;
break;
}
case 4: //t
{//Top
_vertical_shift = 0;
break;
}
}
}
else {
_vertical_shift = 0;
//_vertical_shift = _text_rect_height - _content_height;
/*if(_body_pr.anchor === 0)
{ {
this.calcY = this.chart.extY*this.layout.y + this.y; _vertical_shift = _text_rect_height - _content_height;
} }
else else
{ {
this.calcY = this.y; _vertical_shift = 0;
} */
} }
global_MatrixTransformer.TranslateAppend(_text_transform, 0, _vertical_shift);
if (_dx_lt_rb * _dy_t - _dy_lt_rb * _dx_t <= 0) {
var alpha = Math.atan2(_dy_t, _dx_t);
global_MatrixTransformer.RotateRadAppend(_text_transform, -alpha - (isRealNumber(_body_pr.rot) ? _body_pr.rot : 0));
global_MatrixTransformer.TranslateAppend(_text_transform, _t_x_lt, _t_y_lt);
} }
else else {
alpha = Math.atan2(_dy_t, _dx_t);
global_MatrixTransformer.RotateRadAppend(_text_transform, Math.PI - alpha - (isRealNumber(_body_pr.rot) ? _body_pr.rot : 0));
global_MatrixTransformer.TranslateAppend(_text_transform, _t_x_rt, _t_y_rt);
}
}
else {
if (/*_content_height < _text_rect_width*/true) {
switch (_body_pr.anchor) {
case 0: //b
{ // (Text Anchor Enum ( Bottom ))
_vertical_shift = _text_rect_width - _content_height;
break;
}
case 1: //ctr
{// (Text Anchor Enum ( Center ))
_vertical_shift = (_text_rect_width - _content_height) * 0.5;
break;
}
case 2: //dist
{// (Text Anchor Enum ( Distributed ))
_vertical_shift = (_text_rect_width - _content_height) * 0.5;
break;
}
case 3: //just
{// (Text Anchor Enum ( Justified ))
_vertical_shift = (_text_rect_width - _content_height) * 0.5;
break;
}
case 4: //t
{//Top
_vertical_shift = 0;
break;
}
}
}
else {
_vertical_shift = 0;
/*if(_body_pr.anchor === 0)
{ {
this.calcX = this.x; _vertical_shift = _text_rect_width - _content_height;
this.calcY = this.y;
} }
this.transform.Reset(); else
global_MatrixTransformer.TranslateAppend(this.transform, this.calcX, this.calcY);
if (isRealObject(this.chart))
{ {
global_MatrixTransformer.MultiplyAppend(this.transform, this.chart.getTransformMatrix()); _vertical_shift = 0;
} */
} }
this.invertTransform = global_MatrixTransformer.Invert(this.transform); global_MatrixTransformer.TranslateAppend(_text_transform, 0, _vertical_shift);
}, var _alpha;
_alpha = Math.atan2(_dy_t, _dx_t);
if (_body_pr.vert === nVertTTvert) {
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 : 0));
global_MatrixTransformer.TranslateAppend(_text_transform, _t_x_rt, _t_y_rt);
}
else {
global_MatrixTransformer.RotateRadAppend(_text_transform, Math.PI * 0.5 - _alpha - (isRealNumber(_body_pr.rot) ? _body_pr.rot : 0));
global_MatrixTransformer.TranslateAppend(_text_transform, _t_x_lt, _t_y_lt);
}
}
else {
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 : 0));
global_MatrixTransformer.TranslateAppend(_text_transform, _t_x_lb, _t_y_lb);
}
else {
global_MatrixTransformer.RotateRadAppend(_text_transform, -Math.PI * 0.5 - _alpha - (isRealNumber(_body_pr.rot) ? _body_pr.rot : 0));
global_MatrixTransformer.TranslateAppend(_text_transform, _t_x_rb, _t_y_rb);
}
}
}
}
else {
var _full_rotate = 0;
var _full_flip = {flipH: false, flipV: false};
recalculateTransformText: function() var _hc = this.extX * 0.5;
var _vc = this.extY * 0.5;
var _transformed_shape_xc = this.transform.TransformPointX(_hc, _vc);
var _transformed_shape_yc = this.transform.TransformPointY(_hc, _vc);
var _content_width, content_height2;
if ((_full_rotate >= 0 && _full_rotate < Math.PI * 0.25)
|| (_full_rotate > 3 * Math.PI * 0.25 && _full_rotate < 5 * Math.PI * 0.25)
|| (_full_rotate > 7 * Math.PI * 0.25 && _full_rotate < 2 * Math.PI)) {
if (!(_body_pr.vert === nVertTTvert || _body_pr.vert === nVertTTvert270)) {
_content_width = _r - _l;
content_height2 = _b - _t;
}
else {
_content_width = _b - _t;
content_height2 = _r - _l;
}
}
else {
if (!(_body_pr.vert === nVertTTvert || _body_pr.vert === nVertTTvert270)) {
_content_width = _b - _t;
content_height2 = _r - _l;
}
else {
_content_width = _r - _l;
content_height2 = _b - _t;
}
}
if (/*_content_height < content_height2*/true) {
switch (_body_pr.anchor) {
case 0: //b
{ // (Text Anchor Enum ( Bottom ))
_vertical_shift = content_height2 - _content_height;
break;
}
case 1: //ctr
{// (Text Anchor Enum ( Center ))
_vertical_shift = (content_height2 - _content_height) * 0.5;
break;
}
case 2: //dist
{// (Text Anchor Enum ( Distributed ))
_vertical_shift = (content_height2 - _content_height) * 0.5;
break;
}
case 3: //just
{// (Text Anchor Enum ( Justified ))
_vertical_shift = (content_height2 - _content_height) * 0.5;
break;
}
case 4: //t
{//Top
_vertical_shift = 0;
break;
}
}
}
else {
_vertical_shift = 0;
/*if(_body_pr.anchor === 0)
{ {
this.transformText.Reset(); _vertical_shift = content_height2 - _content_height;
global_MatrixTransformer.TranslateAppend(this.transformText, this.calcX + 1, this.calcY + 0.5); }
if (isRealObject(this.chart)) else
{ {
global_MatrixTransformer.MultiplyAppend(this.transformText, this.chart.getTransformMatrix()); _vertical_shift = 0;
} */
}
var _text_rect_xc = _l + (_r - _l) * 0.5;
var _text_rect_yc = _t + (_b - _t) * 0.5;
var _vx = _text_rect_xc - _hc;
var _vy = _text_rect_yc - _vc;
var _transformed_text_xc, _transformed_text_yc;
if (!_full_flip.flipH) {
_transformed_text_xc = _transformed_shape_xc + _vx;
} }
this.invertTransformText = global_MatrixTransformer.Invert(this.transformText); else {
_transformed_text_xc = _transformed_shape_xc - _vx;
}
if (!_full_flip.flipV) {
_transformed_text_yc = _transformed_shape_yc + _vy;
}
else {
_transformed_text_yc = _transformed_shape_yc - _vy;
}
global_MatrixTransformer.TranslateAppend(_text_transform, 0, _vertical_shift);
if (_body_pr.vert === nVertTTvert) {
global_MatrixTransformer.TranslateAppend(_text_transform, -_content_width * 0.5, -content_height2 * 0.5);
global_MatrixTransformer.RotateRadAppend(_text_transform, -Math.PI * 0.5);
global_MatrixTransformer.TranslateAppend(_text_transform, _content_width * 0.5, content_height2 * 0.5);
}
if (_body_pr.vert === nVertTTvert270) {
global_MatrixTransformer.TranslateAppend(_text_transform, -_content_width * 0.5, -content_height2 * 0.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, _transformed_text_xc - _content_width * 0.5, _transformed_text_yc - content_height2 * 0.5);
var body_pr = this.bodyPr;
var l_ins = typeof body_pr.lIns === "number" ? body_pr.lIns : 2.54;
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;
var b_ins = typeof body_pr.bIns === "number" ? body_pr.bIns : 1.27;
this.clipRect = {
x: -l_ins,
y: -_vertical_shift - t_ins,
w: this.contentWidth + (r_ins + l_ins),
h: this.contentHeight + (b_ins + t_ins)
};
}
this.transformText = this.ownTransformText.CreateDublicate();
}, },
recalculateStyle: function() recalculateStyle: function()
...@@ -3320,13 +3604,28 @@ CDLbl.prototype = ...@@ -3320,13 +3604,28 @@ CDLbl.prototype =
text_pr.RFonts.Hint = {Name: font_name, Index: -1}; text_pr.RFonts.Hint = {Name: font_name, Index: -1};
style.TextPr = text_pr; style.TextPr = text_pr;
var chart_text_pr;
if(this.chart.txPr if(this.chart.txPr
&& this.chart.txPr.content && this.chart.txPr.content
&& this.chart.txPr.content.Content[0] && this.chart.txPr.content.Content[0]
&& this.chart.txPr.content.Content[0].Pr && this.chart.txPr.content.Content[0].Pr
&& this.chart.txPr.content.Content[0].Pr.DefaultRunPr) && this.chart.txPr.content.Content[0].Pr.DefaultRunPr)
{ {
style.TextPr.Merge(this.chart.txPr.content.Content[0].Pr.DefaultRunPr); chart_text_pr = this.chart.txPr.content.Content[0].Pr.DefaultRunPr;
style.TextPr.Merge(chart_text_pr);
}
if(this instanceof CTitle)
{
style.TextPr.Bold = true;
if(this.parent instanceof CChart)
{
if(chart_text_pr && typeof chart_text_pr.FontSize === "number")
style.TextPr.FontSize *= 1.2;
else
style.TextPr.FontSize = 18;
}
} }
if(this.txPr if(this.txPr
&& this.txPr.content && this.txPr.content
...@@ -3362,17 +3661,8 @@ CDLbl.prototype = ...@@ -3362,17 +3661,8 @@ CDLbl.prototype =
} }
}, },
recalculateTxBody: function() getDefaultTextForTxBody: function()
{ {
if(this.tx && this.tx.rich)
{
this.txBody = this.tx.rich;
}
else
{
var tx_body = new CTextBody();
tx_body.setParent(this);
tx_body.setContent(new CDocumentContent(tx_body, this.chart.getDrawingDocument(), 0, 0, 0, 0, false, false));
var compiled_string = ""; var compiled_string = "";
var separator = typeof this.separator === "string" ? this.separator : ", "; var separator = typeof this.separator === "string" ? this.separator : ", ";
if(this.showSerName) if(this.showSerName)
...@@ -3391,36 +3681,80 @@ CDLbl.prototype = ...@@ -3391,36 +3681,80 @@ CDLbl.prototype =
compiled_string += separator; compiled_string += separator;
compiled_string += this.series.getValByIndex(this.pt.idx); compiled_string += this.series.getValByIndex(this.pt.idx);
} }
var content = tx_body.content; return compiled_string;
for(var i = 0; i < compiled_string.length; ++i) },
getMaxWidth: function(bodyPr)
{ {
var ch = compiled_string[i]; switch (bodyPr.vert)
if (ch == '\t')
{ {
content.Paragraph_Add( new ParaTab(), false ); case nVertTTeaVert:
case nVertTTmongolianVert:
case nVertTTvert:
case nVertTTwordArtVert:
case nVertTTwordArtVertRtl:
case nVertTTvert270:
{
return this.chart.extY/2;
} }
else if (ch == '\n') case nVertTThorz:
{ {
content.Paragraph_Add( new ParaNewLine(break_Line), false ); return this.chart.extX/5
} }
else if (ch == '\r') }
; return this.chart.extX/5;
else if (ch != ' ') },
getBodyPr: function()
{ {
content.Paragraph_Add(new ParaText(ch), false ); var ret = new CBodyPr();
ret.setDefault();
if(this.parent && this.chart && this.chart.plotArea && this.chart.plotArea.valAx === this.parent)
ret.vert = nVertTTvert;
if(this.txPr && this.txPr.bodyPr)
{
ret.merge(this.txPr.bodyPr);
} }
else
switch (ret.vert)
{ {
content.Paragraph_Add(new ParaSpace(1), false ); case nVertTTeaVert:
case nVertTTmongolianVert:
case nVertTTvert:
case nVertTTwordArtVert:
case nVertTTwordArtVertRtl:
case nVertTTvert270:
{
ret.lIns = SCALE_INSET_COEFF;
ret.rIns = SCALE_INSET_COEFF;
ret.tIns = SCALE_INSET_COEFF*0.5;
ret.bIns = SCALE_INSET_COEFF*0.5;
break;
} }
case nVertTThorz:
{
ret.lIns = SCALE_INSET_COEFF;
ret.rIns = SCALE_INSET_COEFF;
ret.tIns = SCALE_INSET_COEFF*0.5;
ret.bIns = SCALE_INSET_COEFF*0.5;
break;
} }
this.txBody = tx_body;
} }
return ret;
},
checkVert: function()
{},
recalculateContent: function()
{
if(this.txBody) if(this.txBody)
{ {
var max_box_width = this.chart.extX/5.1;/* */ var bodyPr = this.getBodyPr();
var max_content_width = max_box_width - 1.25;/*excel 1 0.25*/ var max_box_width = this.getMaxWidth(bodyPr);/*�������� ����������������� ����� ����� ��������*/
var max_content_width = max_box_width - 2*SCALE_INSET_COEFF;
var content = this.txBody.content; var content = this.txBody.content;
content.Reset(0, 0, max_content_width, 20000); content.Reset(0, 0, max_content_width, 20000);
content.Recalculate_Page(0, true); content.Recalculate_Page(0, true);
...@@ -3437,13 +3771,74 @@ CDLbl.prototype = ...@@ -3437,13 +3771,74 @@ CDLbl.prototype =
} }
} }
} }
max_width+=1; max_width += 2;
content.Reset(0, 0, max_width, 20000); content.Reset(0, 0, max_width, 20000);
content.Recalculate_Page(0, true); content.Recalculate_Page(0, true);
switch (bodyPr.vert)
{
case nVertTTeaVert:
case nVertTTmongolianVert:
case nVertTTvert:
case nVertTTwordArtVert:
case nVertTTwordArtVertRtl:
case nVertTTvert270:
{
this.extX = Math.min(content.Get_SummaryHeight() + 4.4*SCALE_INSET_COEFF, max_box_width);
this.extY = max_width + 2*SCALE_INSET_COEFF;
this.x = 0;
this.y = 0;
break;
}
default:
{
this.extX = max_width + 1.25; this.extX = max_width + 1.25;
this.extY = this.txBody.content.Get_SummaryHeight() + 1/* */; this.extY = this.txBody.content.Get_SummaryHeight() + SCALE_INSET_COEFF;
this.x = 0; this.x = 0;
this.y = 0; this.y = 0;
break;
}
}
}
},
recalculateTxBody: function()
{
if(this.tx && this.tx.rich)
{
this.txBody = this.tx.rich;
}
else
{
var tx_body = new CTextBody();
tx_body.setParent(this);
tx_body.setBodyPr(new CBodyPr());
tx_body.setContent(new CDocumentContent(tx_body, this.chart.getDrawingDocument(), 0, 0, 0, 0, false, false));
var compiled_string = this.getDefaultTextForTxBody();
var content = tx_body.content;
for(var i = 0; i < compiled_string.length; ++i)
{
var ch = compiled_string[i];
if (ch == '\t')
{
content.Paragraph_Add( new ParaTab(), false );
}
else if (ch == '\n')
{
content.Paragraph_Add( new ParaNewLine(break_Line), false );
}
else if (ch == '\r')
;
else if (ch != ' ')
{
content.Paragraph_Add(new ParaText(ch), false );
}
else
{
content.Paragraph_Add(new ParaSpace(1), false );
}
}
this.txBody = tx_body;
} }
}, },
...@@ -3557,7 +3952,49 @@ CDLbl.prototype = ...@@ -3557,7 +3952,49 @@ CDLbl.prototype =
{ {
this.x = x; this.x = x;
this.y = y; this.y = y;
this.recalculateTransform();
if(this.layout && this.layout.manualLayout)
{
if(typeof this.layout.manualLayout.x === "number")
{
this.calcX = this.chart.extX*this.layout.x + this.x;
}
else
{
this.calcX = this.x;
}
if(typeof this.layout.manualLayout.y === "number")
{
this.calcY = this.chart.extY*this.layout.y + this.y;
}
else
{
this.calcY = this.y;
}
}
else
{
this.calcX = this.x;
this.calcY = this.y;
}
this.transform.Reset();
global_MatrixTransformer.TranslateAppend(this.transform, this.calcX, this.calcY);
if (isRealObject(this.chart))
{
global_MatrixTransformer.MultiplyAppend(this.transform, this.chart.getTransformMatrix());
}
this.invertTransform = global_MatrixTransformer.Invert(this.transform);
this.transformText = this.ownTransformText.CreateDublicate();
global_MatrixTransformer.TranslateAppend(this.transformText, this.calcX, this.calcY);
if (isRealObject(this.chart))
{
global_MatrixTransformer.MultiplyAppend(this.transformText, this.chart.getTransformMatrix());
}
this.invertTransform = global_MatrixTransformer.Invert(this.transformText);
if(this.recalcInfo.recalcTransformText)
this.recalculateTransformText(); this.recalculateTransformText();
}, },
...@@ -12576,6 +13013,35 @@ function CTitle() ...@@ -12576,6 +13013,35 @@ function CTitle()
this.tx = null; this.tx = null;
this.txPr = null; this.txPr = null;
this.parent = null;//ссылка на родительский элемент
//расчетные знаяения
this.txBody = null;
this.x = null;
this.y = null;
this.calcX = null;
this.calcY = null;
this.extX = null;
this.extY = null;
this.transform = new CMatrix();
this.transformText = new CMatrix();
this.ownTransform = new CMatrix();
this.ownTransformText = new CMatrix();
this.recalcInfo =
{
recalculateTxBody: true,
recalcTransform: true,
recalcTransformText: true,
recalcContent: true,
recalculateBrush: true,
recalculatePen: true,
recalcStyle: true,
recalculateContent: true
};
this.Id = g_oIdCounter.Get_NewId(); this.Id = g_oIdCounter.Get_NewId();
g_oTableId.Add(this, this.Id); g_oTableId.Add(this, this.Id);
} }
...@@ -12603,6 +13069,118 @@ CTitle.prototype = ...@@ -12603,6 +13069,118 @@ CTitle.prototype =
this.Id = r.GetString2(); this.Id = r.GetString2();
}, },
getMaxWidth: function(bodyPr)
{
switch (bodyPr.vert)
{
case nVertTTeaVert:
case nVertTTmongolianVert:
case nVertTTvert:
case nVertTTwordArtVert:
case nVertTTwordArtVertRtl:
case nVertTTvert270:
{
return this.chart.extY/2;
}
case nVertTThorz:
{
return this.chart.extX*0.8;
}
}
return this.chart.extX*0.5;
},
getBodyPr: CDLbl.prototype.getBodyPr,
getCompiledStyle: CDLbl.prototype.getCompiledStyle,
getCompiledFill: CDLbl.prototype.getCompiledFill,
getCompiledLine: CDLbl.prototype.getCompiledLine,
getCompiledTransparent: CDLbl.prototype.getCompiledTransparent,
Get_Styles: CDLbl.prototype.Get_Styles,
draw: CDLbl.prototype.draw,
isEmptyPlaceholder: CDLbl.prototype.isEmptyPlaceholder,
recalculatePen: CShape.prototype.recalculatePen,
recalculateBrush: CShape.prototype.recalculateBrush,
getParentObjects: function()
{
return this.chart.getParentObjects();
},
getDefaultTextForTxBody: function()
{
//TODO: продумать с переводом
if(this.parent instanceof CChart)
{
return "Chart Title";
}
else
{
return "Axis Title";
}
},
recalculateStyle: CDLbl.prototype.recalculateStyle,
recalculateTxBody: CDLbl.prototype.recalculateTxBody,
recalculateTransform: CDLbl.prototype.recalculateTransform,
recalculateTransformText: CDLbl.prototype.recalculateTransformText,
recalculateContent: CDLbl.prototype.recalculateContent,
recalculate: function()
{
ExecuteNoHistory(function()
{
if(this.recalcInfo.recalculateBrush)
{
this.recalculateBrush();
this.recalcInfo.recalculateBrush = true;
}
if(this.recalcInfo.recalculatePen)
{
this.recalculatePen();
this.recalcInfo.recalculatePen = true;
}
if(this.recalcInfo.recalcStyle)
{
this.recalculateStyle();
this.recalcInfo.recalcStyle = false;
}
if(this.recalcInfo.recalculateTxBody)
{
this.recalculateTxBody();
this.recalcInfo.recalculateTxBody = false;
}
if(this.recalcInfo.recalculateContent)
{
this.recalculateContent();
this.recalcInfo.recalculateContent = false;
}
if(this.recalcInfo.recalcTransform)
{
this.recalculateTransform();
this.recalcInfo.recalcTransform = false;
}
if(this.recalcInfo.recalcTransformText)
{
this.recalculateTransformText();
this.recalcInfo.recalcTransformText = false;
}
if(this.chart)
{
this.chart.addToSetPosition(this);
}
}, this, []);
},
setLayout: function(pr) setLayout: function(pr)
{ {
History.Add(this, {Type: historyitem_Title_SetLayout, oldPr: this.layout, newPr: pr}); History.Add(this, {Type: historyitem_Title_SetLayout, oldPr: this.layout, newPr: pr});
...@@ -12613,6 +13191,8 @@ CTitle.prototype = ...@@ -12613,6 +13191,8 @@ CTitle.prototype =
History.Add(this, {Type: historyitem_Title_SetOverlay, oldPr: this.overlay, newPr: pr}); History.Add(this, {Type: historyitem_Title_SetOverlay, oldPr: this.overlay, newPr: pr});
this.overlay = pr; this.overlay = pr;
}, },
setSpPr: function(pr) setSpPr: function(pr)
{ {
History.Add(this, {Type: historyitem_Title_SetSpPr, oldPr: this.spPr, newPr: pr}); History.Add(this, {Type: historyitem_Title_SetSpPr, oldPr: this.spPr, newPr: pr});
......
Common/Drawings/Format/ChartSpace.js
View file @ 85d3b0f4
...@@ -1943,6 +1943,7 @@ function CreateLineChart(asc_series, type) ...@@ -1943,6 +1943,7 @@ function CreateLineChart(asc_series, type)
chart.setPlotArea(new CPlotArea()); chart.setPlotArea(new CPlotArea());
chart.setLegend(new CLegend()); chart.setLegend(new CLegend());
chart.setPlotVisOnly(true); chart.setPlotVisOnly(true);
chart.setTitle(new CTitle());
var disp_blanks_as; var disp_blanks_as;
if(type === GROUPING_STANDARD) if(type === GROUPING_STANDARD)
{ {
...@@ -1958,7 +1959,13 @@ function CreateLineChart(asc_series, type) ...@@ -1958,7 +1959,13 @@ function CreateLineChart(asc_series, type)
plot_area.setLayout(new CLayout()); plot_area.setLayout(new CLayout());
plot_area.setChart(new CLineChart()); plot_area.setChart(new CLineChart());
plot_area.setCatAx(new CAxis()); plot_area.setCatAx(new CAxis());
plot_area.catAx.setTitle(new CTitle());
plot_area.setValAx(new CAxis()); plot_area.setValAx(new CAxis());
plot_area.valAx.setTitle(new CTitle());
var title = plot_area.valAx.title;
title.setTxPr(new CTextBody());
title.txPr.setBodyPr(new CBodyPr());
title.txPr.bodyPr.setVert(nVertTTvert);
var line_chart = plot_area.chart; var line_chart = plot_area.chart;
line_chart.setGrouping(type); line_chart.setGrouping(type);
line_chart.setVaryColors(false); line_chart.setVaryColors(false);
......
Excel/model/DrawingObjects/Format/ChartSpacePrototype.js
View file @ 85d3b0f4
...@@ -36,7 +36,9 @@ CChartSpace.prototype.setRecalculateInfo = function() ...@@ -36,7 +36,9 @@ CChartSpace.prototype.setRecalculateInfo = function()
recalculateMarkers: true, recalculateMarkers: true,
recalculateGridLines: true, recalculateGridLines: true,
recalculateDLbls: true, recalculateDLbls: true,
dataLbls:[] recalculateAxisLabels: true,
dataLbls:[],
axisLabels: []
}; };
this.baseColors = []; this.baseColors = [];
this.bounds = {l: 0, t: 0, r: 0, b:0, w: 0, h:0}; this.bounds = {l: 0, t: 0, r: 0, b:0, w: 0, h:0};
...@@ -69,7 +71,10 @@ CChartSpace.prototype.recalcDLbls = function() ...@@ -69,7 +71,10 @@ CChartSpace.prototype.recalcDLbls = function()
CChartSpace.prototype.addToSetPosition = function(dLbl) CChartSpace.prototype.addToSetPosition = function(dLbl)
{ {
if(dLbl instanceof CDLbl)
this.recalcInfo.dataLbls.push(dLbl); this.recalcInfo.dataLbls.push(dLbl);
else if(dLbl instanceof CTitle)
this.recalcInfo.axisLabels.push(dLbl);
}; };
CChartSpace.prototype.addToRecalculate = CShape.prototype.addToRecalculate; CChartSpace.prototype.addToRecalculate = CShape.prototype.addToRecalculate;
...@@ -115,7 +120,7 @@ CChartSpace.prototype.canMove = CShape.prototype.canMove; ...@@ -115,7 +120,7 @@ CChartSpace.prototype.canMove = CShape.prototype.canMove;
CChartSpace.prototype.canRotate = function() CChartSpace.prototype.canRotate = function()
{ {
return false; return false;
} };
...@@ -134,7 +139,11 @@ CChartSpace.prototype.draw = function(graphics) ...@@ -134,7 +139,11 @@ CChartSpace.prototype.draw = function(graphics)
graphics.reset(); graphics.reset();
graphics.SetIntegerGrid(intGrid); graphics.SetIntegerGrid(intGrid);
if(this.chart && this.chart.plotArea && this.chart.plotArea.chart && this.chart.plotArea.chart.series) if(this.chart)
{
if(this.chart.plotArea)
{
if(this.chart.plotArea.chart && this.chart.plotArea.chart.series)
{ {
var series = this.chart.plotArea.chart.series; var series = this.chart.plotArea.chart.series;
for(var i = 0; i < series.length; ++i) for(var i = 0; i < series.length; ++i)
...@@ -148,7 +157,20 @@ CChartSpace.prototype.draw = function(graphics) ...@@ -148,7 +157,20 @@ CChartSpace.prototype.draw = function(graphics)
} }
} }
} }
if(this.chart.plotArea.catAx && this.chart.plotArea.catAx.title)
{
this.chart.plotArea.catAx.title.draw(graphics);
}
if(this.chart.plotArea.valAx && this.chart.plotArea.valAx.title)
{
this.chart.plotArea.valAx.title.draw(graphics);
}
}
if(this.chart.title)
{
this.chart.title.draw(graphics);
}
}
}; };
CChartSpace.prototype.recalculateBounds = function() CChartSpace.prototype.recalculateBounds = function()
...@@ -213,6 +235,11 @@ CChartSpace.prototype.recalculate = function() ...@@ -213,6 +235,11 @@ CChartSpace.prototype.recalculate = function()
this.recalculateDLbls(); this.recalculateDLbls();
this.recalcInfo.recalculateDLbls = false; this.recalcInfo.recalculateDLbls = false;
} }
if(this.recalcInfo.recalculateAxisLabels)
{
this.recalculateAxisLabels();
this.recalcInfo.recalculateAxisLabels = false;
}
if(this.recalcInfo.recalculateChart) if(this.recalcInfo.recalculateChart)
{ {
this.recalculateChart(); this.recalculateChart();
...@@ -226,6 +253,34 @@ CChartSpace.prototype.recalculate = function() ...@@ -226,6 +253,34 @@ CChartSpace.prototype.recalculate = function()
this.recalcInfo.dataLbls.length = 0; this.recalcInfo.dataLbls.length = 0;
}, this, []); }, this, []);
}; };
CChartSpace.prototype.recalculateAxisLabels = function()
{
if(this.chart && this.chart.title)
{
var title = this.chart.title;
title.parent = this.chart;
title.chart = this;
title.recalculate();
}
if(this.chart && this.chart.plotArea)
{
if(this.chart.plotArea.catAx && this.chart.plotArea.catAx.title)
{
var title = this.chart.plotArea.catAx.title;
title.parent = this.chart.plotArea.catAx;
title.chart = this;
title.recalculate();
}
if(this.chart.plotArea.valAx && this.chart.plotArea.valAx.title)
{
var title = this.chart.plotArea.valAx.title;
title.parent = this.chart.plotArea.valAx;
title.chart = this;
title.recalculate();
}
}
};
CChartSpace.prototype.deselect = CShape.prototype.deselect; CChartSpace.prototype.deselect = CShape.prototype.deselect;
CChartSpace.prototype.hitInWorkArea = function() CChartSpace.prototype.hitInWorkArea = function()
{ {
...@@ -411,7 +466,7 @@ CChartSpace.prototype.recalculateGridLines = function() ...@@ -411,7 +466,7 @@ CChartSpace.prototype.recalculateGridLines = function()
} }
axis.compiledMajorGridLines = calcGridLine(defaultStyle.axisAndMajorGridLines, axis.majorGridlines, subtleLine, parents); axis.compiledMajorGridLines = calcGridLine(defaultStyle.axisAndMajorGridLines, axis.majorGridlines, subtleLine, parents);
axis.compiledMinorGridLines = calcGridLine(defaultStyle.minorGridlines, axis.minorGridlines, subtleLine, parents); axis.compiledMinorGridLines = calcGridLine(defaultStyle.minorGridlines, axis.minorGridlines, subtleLine, parents);
} };
var default_style = CHART_STYLE_MANAGER.getDefaultLineStyleByIndex(this.style); var default_style = CHART_STYLE_MANAGER.getDefaultLineStyleByIndex(this.style);
var parent_objects = this.getParentObjects(); var parent_objects = this.getParentObjects();
var RGBA = {R:0, G:0, B:0, A: 255}; var RGBA = {R:0, G:0, B:0, A: 255};
...@@ -425,7 +480,7 @@ CChartSpace.prototype.recalculateGridLines = function() ...@@ -425,7 +480,7 @@ CChartSpace.prototype.recalculateGridLines = function()
calcMajorMinorGridLines(this.chart.plotArea.valAx, default_style, subtle_line, parent_objects); calcMajorMinorGridLines(this.chart.plotArea.valAx, default_style, subtle_line, parent_objects);
calcMajorMinorGridLines(this.chart.plotArea.catAx, default_style, subtle_line, parent_objects); calcMajorMinorGridLines(this.chart.plotArea.catAx, default_style, subtle_line, parent_objects);
} }
} };
CChartSpace.prototype.recalculateMarkers = function() CChartSpace.prototype.recalculateMarkers = function()
{ {
...@@ -944,6 +999,6 @@ CChartSpace.prototype.recalculateDLbls = function() ...@@ -944,6 +999,6 @@ CChartSpace.prototype.recalculateDLbls = function()
} }
} }
} }
} };
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