Commit 3926982f authored by Sergey Luzyanin's avatar Sergey Luzyanin

не пересчитывались DLbls

parent a2eaaee6
......@@ -1105,7 +1105,9 @@ CDLbl.prototype =
{
if(noCopyTxBody === true)
{
var oldParent = dLbl.txPr.parent;
this.setTxPr(dLbl.txPr);
dLbl.txPr.parent = oldParent;
}
else
{
......@@ -2690,6 +2692,10 @@ CBarChart.prototype =
{
History.Add(this, {Type: AscDFH.historyitem_BarChart_SetDLbls, oldPr: this.dLbls, newPr:pr});
this.dLbls = pr;
if(this.dLbls)
{
this.dLbls.setParent(this);
}
if(this.parent && this.parent.parent && this.parent.parent.parent)
{
this.parent.parent.parent.handleUpdateDataLabels();
......
......@@ -847,6 +847,11 @@ CChartSpace.prototype.applyLabelsFunction = function(fCallback, value)
{
entry = new AscFormat.CLegendEntry();
entry.setIdx(this.selection.legendEntry);
if(this.selection.legend.txPr)
{
entry.setTxPr(this.selection.legend.txPr.createDuplicate());
}
this.selection.legend.addLegendEntry(entry);
}
if(entry)
......@@ -900,7 +905,12 @@ CChartSpace.prototype.applyLabelsFunction = function(fCallback, value)
{
dLbl = new AscFormat.CDLbl();
dLbl.setIdx(pt.idx);
if(ser.dLbls.txPr)
{
dLbl.merge(ser.dLbls);
}
ser.dLbls.addDLbl(dLbl);
}
fCallback(dLbl, value, this.getDrawingDocument(), 10);
}
......@@ -7731,7 +7741,7 @@ CChartSpace.prototype.recalculateDLbls = function()
compiled_dlb.merge(this.chart.plotArea.chart.dLbls.findDLblByIdx(pt.idx), false);
compiled_dlb.merge(ser.dLbls);
if(ser.dLbls)
compiled_dlb.merge(ser.dLbls.findDLblByIdx(pt.idx), true);
compiled_dlb.merge(ser.dLbls.findDLblByIdx(pt.idx));
if(compiled_dlb.checkNoLbl())
{
......
......@@ -4793,7 +4793,7 @@ ParaDrawing.prototype =
c.setExtent(this.Extent.W, this.Extent.H);
}
var EE = this.EffectExtent;
if(EE.L > 0 || EE.T > 0 || EE.R || EE.B)
if(EE.L > 0 || EE.T > 0 || EE.R > 0 || EE.B > 0)
{
c.setEffectExtent(EE.L, EE.T, EE.R, EE.B);
}
......
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