параметры для 3dBarChart

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60965 954022d7-b5bf-4e40-9824-e11837661b57

Common/Drawings/Format/ChartFormat.js

@@ -718,7 +718,6 @@ CDLbl.prototype =
     {
         ExecuteNoHistory(function()
             {
-
                 this.compiledStyles = this.getStyles();
             },
             this, []);
@@ -2303,6 +2302,9 @@ function CBarChart()
     this.varyColors  = null;
 
     this.parent = null;
+    this.b3D = null;
+    this.gapDepth = null;
+    this.shape = null;
 
     this.Id = g_oIdCounter.Get_NewId();
     g_oTableId.Add(this, this.Id);
@@ -2315,6 +2317,24 @@ CBarChart.prototype =
         return this.Id;
     },
 
+    set3D: function(pr)
+    {
+        History.Add(this, {Type: historyitem_BarChart_Set3D, oldPr: this.b3D, newPr: pr});
+        this.b3D = pr;
+    },
+
+    setGapDepth: function(pr)
+    {
+        History.Add(this, {Type: historyitem_BarChart_SetGapDepth, oldPr: this.gapDepth, newPr: pr});
+        this.gapDepth = pr;
+    },
+
+    setShape: function(pr)
+    {
+        History.Add(this, {Type: historyitem_BarChart_SetShape, oldPr: this.shape, newPr: pr});
+        this.shape = pr;
+    },
+
     getSeriesConstructor: function()
     {
         return new CBarSeries();
@@ -2422,6 +2442,9 @@ CBarChart.prototype =
                 break;
             }
             case historyitem_BarChart_SetBarDir:
+            case historyitem_BarChart_Set3D:
+            case historyitem_BarChart_SetGapDepth:
+            case historyitem_BarChart_SetShape:
             {
                 if(this.parent && this.parent.parent && this.parent.parent.parent)
                 {
@@ -2598,6 +2621,21 @@ CBarChart.prototype =
     {
         switch(data.Type)
         {
+            case historyitem_BarChart_SetShape:
+            {
+                this.shape = data.oldPr;
+                break;
+            }
+            case historyitem_BarChart_Set3D:
+            {
+                this.b3D = data.oldPr;
+                break;
+            }
+            case historyitem_BarChart_SetGapDepth:
+            {
+                this.gapDepth = data.oldPr;
+                break;
+            }
             case historyitem_CommonChartFormat_SetParent:
             {
                 this.parent = data.oldPr;
@@ -2690,6 +2728,21 @@ CBarChart.prototype =
     {
         switch(data.Type)
         {
+            case historyitem_BarChart_SetShape:
+            {
+                this.shape = data.newPr;
+                break;
+            }
+            case historyitem_BarChart_Set3D:
+            {
+                this.b3D = data.newPr;
+                break;
+            }
+            case historyitem_BarChart_SetGapDepth:
+            {
+                this.gapDepth = data.newPr;
+                break;
+            }
             case historyitem_CommonChartFormat_SetParent:
             {
                 this.parent = data.newPr;
@@ -2770,11 +2823,22 @@ CBarChart.prototype =
 
         switch(data.Type)
         {
+            case historyitem_BarChart_Set3D:
+            {
+                writeBool(w, data.newPr);
+                break;
+            }
             case historyitem_CommonChartFormat_SetParent:
             {
                 writeObject(w, data.newPr);
                 break;
             }
+
+            case historyitem_BarChart_SetShape:
+            {
+                writeLong(w, data.newPr);
+                break;
+            }
             case historyitem_CommonChart_RemoveSeries:
             {
                 writeLong(w, data.oldPr);
@@ -2788,6 +2852,7 @@ CBarChart.prototype =
             }
             case historyitem_BarChart_SetBarDir:
             case historyitem_BarChart_SetGapWidth:
+            case historyitem_BarChart_SetGapDepth:
             case historyitem_BarChart_SetGrouping:
             case historyitem_BarChart_SetOverlap:
             {
@@ -2813,11 +2878,21 @@ CBarChart.prototype =
         var type = r.GetLong();
         switch (type)
         {
+            case historyitem_BarChart_Set3D:
+            {
+                this.b3D = readBool(r);
+                break;
+            }
             case historyitem_CommonChartFormat_SetParent:
             {
                 this.parent = readObject(r);
                 break;
             }
+            case historyitem_BarChart_SetShape:
+            {
+                this.shape = readLong(r);
+                break;
+            }
             case historyitem_CommonChart_RemoveSeries:
             {
                 var pos = readLong(r);
@@ -2854,6 +2929,11 @@ CBarChart.prototype =
                 this.gapWidth = readLong(r);
                 break;
             }
+            case historyitem_BarChart_SetGapDepth:
+            {
+                this.gapDepth = readLong(r);
+                break;
+            }
             case historyitem_BarChart_SetGrouping:
             {
                 this.grouping = readLong(r);

Common/Drawings/Format/Constants.js

@@ -210,6 +210,9 @@ var historyitem_BarChart_SetOverlap     = 2216;
 var historyitem_BarChart_AddSer         = 2217;
 var historyitem_BarChart_SetSerLines    = 2218;
 var historyitem_BarChart_SetVaryColors  = 2219;
+var historyitem_BarChart_Set3D          = 2220;
+var historyitem_BarChart_SetGapDepth    = 2221;
+var historyitem_BarChart_SetShape       = 2222;
 var historyitem_BubbleChart_AddAxId            = 2220;
 var historyitem_BubbleChart_SetBubble3D        = 2221;
 var historyitem_BubbleChart_SetBubbleScale     = 2222;

Common/SerializeChart.js

@@ -8906,14 +8906,16 @@ BinaryChartReader.prototype.ReadCT_Bar3DChart = function (type, length, val, aCh
         res = this.bcr.Read1(length, function (t, l) {
             return oThis.ReadCT_GapAmount(t, l, oNewVal);
         });
-        //val.m_gapDepth = oNewVal;
+        if(null != oNewVal.m_val)
+            val.setGapDepth(oNewVal.m_val);
     }
     else if (c_oserct_bar3dchartSHAPE === type) {
         var oNewVal = { m_val: null };
         res = this.bcr.Read1(length, function (t, l) {
             return oThis.ReadCT_Shape(t, l, oNewVal);
         });
-        //val.m_shape = oNewVal;
+        if(null != oNewVal.m_val)
+            val.setShape(oNewVal.m_val);
     }
     else if (c_oserct_bar3dchartAXID === type) {
         var oNewVal = { m_val: null };
@@ -10290,6 +10292,7 @@ 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);
         });
+        oNewVal.set3D(true);
         //3d->2d
         if (BAR_GROUPING_STANDARD == oNewVal.grouping)
             oNewVal.setGrouping(BAR_GROUPING_CLUSTERED);