Commit 057bf2b4 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov

правки для конвертации 3d chart в 2d

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55951 954022d7-b5bf-4e40-9824-e11837661b57
parent c61df231
......@@ -10141,6 +10141,12 @@ BinaryChartReader.prototype.ReadCT_PlotArea = function (type, length, val, oIdTo
res = this.bcr.Read1(length, function (t, l) {
return oThis.ReadCT_Bar3DChart(t, l, oNewVal, aChartWithAxis);
});
//3d->2d
if (BAR_GROUPING_STANDARD == oNewVal.grouping)
oNewVal.setGrouping(BAR_GROUPING_CLUSTERED);
else if(BAR_GROUPING_CLUSTERED != oNewVal.grouping){
oNewVal.setOverlap(100);
}
val.addChart(oNewVal);
}
else if (c_oserct_plotareaBARCHART === type) {
......@@ -10169,6 +10175,17 @@ BinaryChartReader.prototype.ReadCT_PlotArea = function (type, length, val, oIdTo
res = this.bcr.Read1(length, function (t, l) {
return oThis.ReadCT_Line3DChart(t, l, oNewVal, aChartWithAxis);
});
//3d->2d
oNewVal.setMarker(true);
oNewVal.setSmooth(false);
for (var i = 0, length = oNewVal.series.length; i < length; ++i) {
var seria = oNewVal.series[i];
if (null == seria.marker) {
var marker = new CMarker();
marker.setSymbol(SYMBOL_NONE);
seria.setMarker(marker);
}
}
val.addChart(oNewVal);
}
else if (c_oserct_plotareaLINECHART === type) {
......@@ -10190,6 +10207,8 @@ BinaryChartReader.prototype.ReadCT_PlotArea = function (type, length, val, oIdTo
res = this.bcr.Read1(length, function (t, l) {
return oThis.ReadCT_Pie3DChart(t, l, oNewVal, aChartWithAxis);
});
//3d->2d
oNewVal.setFirstSliceAng(0);
val.addChart(oNewVal);
}
else if (c_oserct_plotareaPIECHART === type) {
......
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