добавил в экспорт asc_getFromChart и asc_setFromChart у asc_CShapeProperty....

добавил в экспорт asc_getFromChart и asc_setFromChart у asc_CShapeProperty. поправлены некоторые баги при построениии preview диаграмм.

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

Common/Charts/DrawingObjects.js

@@ -1929,6 +1929,8 @@ prot["asc_getCanFill"] = prot.asc_getCanFill;
 prot["asc_putCanFill"] = prot.asc_putCanFill;
 prot["asc_getCanChangeArrows"] = prot.asc_getCanChangeArrows;
 prot["asc_setCanChangeArrows"] = prot.asc_setCanChangeArrows;
+prot["asc_getFromChart"] = prot.asc_getFromChart;
+prot["asc_setFromChart"] = prot.asc_setFromChart;
 //}
 
 //-----------------------------------------------------------------------------------

Common/Charts/charts.js

@@ -722,13 +722,31 @@ function ChartPreviewManager() {
             DrawingObjectsController.prototype.applyPropsToChartSpace(settings, chart_space);
             chart_space.setBDeleted(false);
             chart_space.updateLinks();
-            if(chart_space.chart.plotArea.valAx)
+            if(!(asc_chart.type.toLowerCase() === "scatter" || asc_chart.type.toLowerCase() === "stock"))
             {
-                chart_space.chart.plotArea.valAx.setDelete(true);
+                if(chart_space.chart.plotArea.valAx)
+                {
+                    chart_space.chart.plotArea.valAx.setDelete(true);
+                }
+                if(chart_space.chart.plotArea.catAx)
+                {
+                    chart_space.chart.plotArea.catAx.setDelete(true);
+                }
             }
-            if(chart_space.chart.plotArea.catAx)
+            else
             {
-                chart_space.chart.plotArea.catAx.setDelete(true);
+                if(chart_space.chart.plotArea.valAx)
+                {
+                    chart_space.chart.plotArea.valAx.setTickLblPos(TICK_LABEL_POSITION_NONE);
+                    chart_space.chart.plotArea.valAx.setMajorTickMark(TICK_MARK_NONE);
+                    chart_space.chart.plotArea.valAx.setMinorTickMark(TICK_MARK_NONE);
+                }
+                if(chart_space.chart.plotArea.catAx)
+                {
+                    chart_space.chart.plotArea.catAx.setTickLblPos(TICK_LABEL_POSITION_NONE);
+                    chart_space.chart.plotArea.catAx.setMajorTickMark(TICK_MARK_NONE);
+                    chart_space.chart.plotArea.catAx.setMinorTickMark(TICK_MARK_NONE);
+                }
             }
             if(!chart_space.spPr)
             {

Common/Drawings/CommonController.js

@@ -2216,7 +2216,7 @@ DrawingObjectsController.prototype =
         }
         else if(chart_type_object_type === historyitem_type_LineChart)
         {
-            if(!chart_type.marker)
+          //  if(!chart_type.marker)
             {
                 switch(chart_type.grouping)
                 {
@@ -2237,7 +2237,7 @@ DrawingObjectsController.prototype =
                     }
                 }
             }
-            else
+          /*  else
             {
                 switch(chart_type.grouping)
                 {
@@ -2257,7 +2257,7 @@ DrawingObjectsController.prototype =
                         break;
                     }
                 }
-            }
+            }  */
         }
         else if(chart_type_object_type === historyitem_type_AreaChart)
         {
@@ -2282,7 +2282,9 @@ DrawingObjectsController.prototype =
         }
         else if(chart_type_object_type === historyitem_type_ScatterChart)
         {
-            switch (chart_type.scatterStyle)
+
+            calc_chart_type = c_oAscChartTypeSettings.scatter;
+            /*switch (chart_type.scatterStyle)
             {
                 case SCATTER_STYLE_LINE:
                 {
@@ -2319,7 +2321,7 @@ DrawingObjectsController.prototype =
                     calc_chart_type = c_oAscChartTypeSettings.scatterMarker;
                     break;
                 }
-            }
+            }  */
         }
         else
         {

Common/Drawings/Format/ChartFormat.js

@@ -16024,6 +16024,18 @@ CScatterChart.prototype =
     Refresh_RecalcData: function()
     {},
 
+
+    Write_ToBinary2: function(w)
+    {
+        w.WriteLong(this.getObjectType());
+        w.WriteString2(this.Get_Id());
+    },
+
+    Read_FromBinary2: function(r)
+    {
+        this.Id = r.GetString2();
+    },
+
     removeSeries: function(idx)
     {
         if(this.series[idx])

Common/Drawings/Format/Geometry.js

@@ -1036,6 +1036,12 @@ Geometry.prototype=
             this.pathLst[i].draw(shape_drawer);
     },
 
+    drawSmart: function(shape_drawer)
+    {
+        for (var i=0, n=this.pathLst.length; i<n;++i)
+            this.pathLst[i].drawSmart(shape_drawer);
+    },
+
     check_bounds: function(checker)
     {
         for(var i=0, n=this.pathLst.length; i<n;++i)