Commit 2133a8c1 authored by Sergey Luzyanin's avatar Sergey Luzyanin Committed by Alexander.Trofimov

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

parent 90a8cc9a
...@@ -1067,7 +1067,9 @@ CDLbl.prototype = ...@@ -1067,7 +1067,9 @@ CDLbl.prototype =
{ {
if(noCopyTxBody === true) if(noCopyTxBody === true)
{ {
var oldParent = dLbl.txPr.parent;
this.setTxPr(dLbl.txPr); this.setTxPr(dLbl.txPr);
dLbl.txPr.parent = oldParent;
} }
else else
{ {
...@@ -2652,6 +2654,10 @@ CBarChart.prototype = ...@@ -2652,6 +2654,10 @@ CBarChart.prototype =
{ {
History.Add(this, {Type: AscDFH.historyitem_BarChart_SetDLbls, oldPr: this.dLbls, newPr:pr}); History.Add(this, {Type: AscDFH.historyitem_BarChart_SetDLbls, oldPr: this.dLbls, newPr:pr});
this.dLbls = pr; this.dLbls = pr;
if(this.dLbls)
{
this.dLbls.setParent(this);
}
if(this.parent && this.parent.parent && this.parent.parent.parent) if(this.parent && this.parent.parent && this.parent.parent.parent)
{ {
this.parent.parent.parent.handleUpdateDataLabels(); this.parent.parent.parent.handleUpdateDataLabels();
......
...@@ -827,6 +827,11 @@ CChartSpace.prototype.paragraphAdd = function(paraItem, bRecalculate) ...@@ -827,6 +827,11 @@ CChartSpace.prototype.paragraphAdd = function(paraItem, bRecalculate)
{ {
entry = new CLegendEntry(); entry = new CLegendEntry();
entry.setIdx(this.selection.legendEntry); entry.setIdx(this.selection.legendEntry);
if(this.selection.legend.txPr)
{
entry.setTxPr(this.selection.legend.txPr.createDuplicate());
}
this.selection.legend.addLegendEntry(entry); this.selection.legend.addLegendEntry(entry);
} }
if(entry) if(entry)
...@@ -880,7 +885,12 @@ CChartSpace.prototype.paragraphAdd = function(paraItem, bRecalculate) ...@@ -880,7 +885,12 @@ CChartSpace.prototype.paragraphAdd = function(paraItem, bRecalculate)
{ {
dLbl = new CDLbl(); dLbl = new CDLbl();
dLbl.setIdx(pt.idx); dLbl.setIdx(pt.idx);
if(ser.dLbls.txPr)
{
dLbl.merge(ser.dLbls);
}
ser.dLbls.addDLbl(dLbl); ser.dLbls.addDLbl(dLbl);
} }
fCallback(dLbl, value, this.getDrawingDocument(), 10); fCallback(dLbl, value, this.getDrawingDocument(), 10);
} }
...@@ -7695,7 +7705,7 @@ CChartSpace.prototype.recalculateDLbls = function() ...@@ -7695,7 +7705,7 @@ CChartSpace.prototype.recalculateDLbls = function()
compiled_dlb.merge(this.chart.plotArea.chart.dLbls.findDLblByIdx(pt.idx), false); compiled_dlb.merge(this.chart.plotArea.chart.dLbls.findDLblByIdx(pt.idx), false);
compiled_dlb.merge(ser.dLbls); compiled_dlb.merge(ser.dLbls);
if(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()) if(compiled_dlb.checkNoLbl())
{ {
......
...@@ -4769,7 +4769,7 @@ ParaDrawing.prototype = ...@@ -4769,7 +4769,7 @@ ParaDrawing.prototype =
c.setExtent(this.Extent.W, this.Extent.H); c.setExtent(this.Extent.W, this.Extent.H);
} }
var EE = this.EffectExtent; 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); 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