Commit 8f547edd authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Поправлен расчет заливки для PlotArea(plotArea в 3-d диаграммах по умолчанию...

Поправлен расчет заливки для PlotArea(plotArea в 3-d диаграммах по умолчанию рисуется с прозрачной заливкой) (Bug #31595). 
Перенес отрисовку walls до отрисовки gridlines( walls перекрывали Grdlines).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68305 954022d7-b5bf-4e40-9824-e11837661b57
parent 0fdd4e18
...@@ -184,13 +184,13 @@ CChartsDrawer.prototype = ...@@ -184,13 +184,13 @@ CChartsDrawer.prototype =
if(this.calcProp.type != "Pie" && this.calcProp.type != "DoughnutChart") if(this.calcProp.type != "Pie" && this.calcProp.type != "DoughnutChart")
{ {
this.gridChart.draw(this);
if(this.nDimensionCount === 3) if(this.nDimensionCount === 3)
{ {
this.floor3DChart.draw(this); this.floor3DChart.draw(this);
this.sideWall3DChart.draw(this); this.sideWall3DChart.draw(this);
this.backWall3DChart.draw(this); this.backWall3DChart.draw(this);
} }
this.gridChart.draw(this);
} }
this.chart.draw(this); this.chart.draw(this);
...@@ -4984,7 +4984,6 @@ drawAreaChart.prototype = ...@@ -4984,7 +4984,6 @@ drawAreaChart.prototype =
} }
else if(intersectionWithPrevSeriaNear && intersectionWithPrevSeriaNear.x < currentNear.x && (!prevNear || prevNear && prevNear.y > intersectionWithPrevSeriaNear.y)) else if(intersectionWithPrevSeriaNear && intersectionWithPrevSeriaNear.x < currentNear.x && (!prevNear || prevNear && prevNear.y > intersectionWithPrevSeriaNear.y))
{ {
result = {};
prevNear = intersectionWithPrevSeriaNear; prevNear = intersectionWithPrevSeriaNear;
prevFar = intersectionWithPrevSeriaFar; prevFar = intersectionWithPrevSeriaFar;
} }
......
...@@ -6733,6 +6733,12 @@ CChartSpace.prototype = ...@@ -6733,6 +6733,12 @@ CChartSpace.prototype =
{ {
var plot_area = this.chart.plotArea; var plot_area = this.chart.plotArea;
var default_brush; var default_brush;
if(this.chart.view3D && this.chart.view3D.rAngAx)
{
default_brush = CreateNoFillUniFill();
}
else
{
var tint = 0.20000; var tint = 0.20000;
if(this.style >=1 && this.style <=32) if(this.style >=1 && this.style <=32)
default_brush = CreateUnifillSolidFillSchemeColor(6, tint); default_brush = CreateUnifillSolidFillSchemeColor(6, tint);
...@@ -6742,7 +6748,7 @@ CChartSpace.prototype = ...@@ -6742,7 +6748,7 @@ CChartSpace.prototype =
default_brush = CreateUnifillSolidFillSchemeColor(this.style - 35, 0 + tint); default_brush = CreateUnifillSolidFillSchemeColor(this.style - 35, 0 + tint);
else else
default_brush = CreateUnifillSolidFillSchemeColor(8, 0.95000); default_brush = CreateUnifillSolidFillSchemeColor(8, 0.95000);
}
if(plot_area.spPr && plot_area.spPr.Fill) if(plot_area.spPr && plot_area.spPr.Fill)
{ {
default_brush.merge(plot_area.spPr.Fill); default_brush.merge(plot_area.spPr.Fill);
......
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