Commit 23e9cd4f authored by GoshaZotov's avatar GoshaZotov

fix bug 33407

parent 0755ee91
...@@ -4521,25 +4521,28 @@ drawLineChart.prototype = ...@@ -4521,25 +4521,28 @@ drawLineChart.prototype =
//todo возможно стоит проверить fill.type на FILL_TYPE_NOFILL и рисовать отдельно границы, если они заданы! //todo возможно стоит проверить fill.type на FILL_TYPE_NOFILL и рисовать отдельно границы, если они заданы!
//brush = pen.Fill; //brush = pen.Fill;
if(brush.fill.color === undefined && brush.fill.colors === undefined)
return;
if(k !== 2) if(k !== 2)
{ {
var props = this.cChartSpace.getParentObjects(); var props = this.cChartSpace.getParentObjects();
var duplicateBrush = brush.createDuplicate(); var duplicateBrush = brush.createDuplicate();
var cColorMod = new AscFormat.CColorMod; var cColorMod = new AscFormat.CColorMod;
cColorMod.name = "shade";
if(k == 1 || k == 4) if(k == 1 || k == 4)
{
cColorMod.val = 45000; cColorMod.val = 45000;
}
else else
{
cColorMod.val = 35000; cColorMod.val = 35000;
cColorMod.name = "shade"; }
this._addColorMods(cColorMod, duplicateBrush) this._addColorMods(cColorMod, duplicateBrush)
duplicateBrush.calculate(props.theme, props.slide, props.layout, props.master, new AscFormat.CUniColor().RGBA); duplicateBrush.calculate(props.theme, props.slide, props.layout, props.master, new AscFormat.CUniColor().RGBA);
pen = AscFormat.CreatePenFromParams(duplicateBrush, undefined, undefined, undefined, undefined, 0.1); pen = AscFormat.CreatePenFromParams(duplicateBrush, undefined, undefined, undefined, undefined, 0.1);
//pen.setFill(duplicateBrush);
this.cChartDrawer.drawPath(path, pen, duplicateBrush); this.cChartDrawer.drawPath(path, pen, duplicateBrush);
} }
else else
...@@ -4551,21 +4554,9 @@ drawLineChart.prototype = ...@@ -4551,21 +4554,9 @@ drawLineChart.prototype =
_addColorMods: function(cColorMod, duplicateBrush) _addColorMods: function(cColorMod, duplicateBrush)
{ {
if(duplicateBrush.fill.color) if(duplicateBrush)
{ {
duplicateBrush.fill.color.Mods.addMod(cColorMod); duplicateBrush.addColorMod(cColorMod);
}
else
{
for(var i = 0; i < duplicateBrush.fill.colors.length; i++)
{
if(duplicateBrush.fill.colors[i].color.Mods === null)
{
duplicateBrush.fill.colors[i].color.Mods = new AscFormat.CColorModifiers();
}
duplicateBrush.fill.colors[i].color.Mods.addMod(cColorMod);
}
} }
} }
}; };
......
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