перешел на метод _isSwitchCurrent3DChart для определения 3-d диаграммы

common/Drawings/CommonController.js

@@ -3582,11 +3582,11 @@ DrawingObjectsController.prototype =
 
         if(chart_type.getObjectType() === AscDFH.historyitem_type_LineChart )
         {
-            if(!AscFormat.isRealBool(chartSettings.showMarker) || chart.view3D)
+            if(!AscFormat.isRealBool(chartSettings.showMarker) || AscFormat.CChartsDrawer.prototype._isSwitchCurrent3DChart(chartSpace))
             {
                 chartSettings.showMarker = false;
             }
-            if(!AscFormat.isRealBool(chartSettings.bLine) || chart.view3D)
+            if(!AscFormat.isRealBool(chartSettings.bLine) || AscFormat.CChartsDrawer.prototype._isSwitchCurrent3DChart(chartSpace))
             {
                 chartSettings.bLine = true;
             }
@@ -3861,10 +3861,6 @@ DrawingObjectsController.prototype =
         }
         ret.putVertGridLines(calc_grid_lines(hor_axis));
 
-
-
-
-
         ret.putHorAxisLabel(hor_axis && hor_axis.title ? c_oAscChartHorAxisLabelShowSettings.noOverlay : c_oAscChartTitleShowSettings.none);
         var _label;
         if(vert_axis && vert_axis.title)
@@ -3932,7 +3928,7 @@ DrawingObjectsController.prototype =
         var calc_chart_type;
         if(chart_type_object_type === AscDFH.historyitem_type_PieChart)
         {
-            if(!chart.view3D)
+            if(!AscFormat.CChartsDrawer.prototype._isSwitchCurrent3DChart(chart_space))
             {
                 calc_chart_type = c_oAscChartTypeSettings.pie;
             }
@@ -3948,7 +3944,7 @@ DrawingObjectsController.prototype =
         else if(chart_type_object_type === AscDFH.historyitem_type_BarChart)
         {
             var b_hbar = chart_type.barDir === BAR_DIR_BAR;
-            var bView3d = chart.view3D && chart_type.b3D;
+            var bView3d = AscFormat.CChartsDrawer.prototype._isSwitchCurrent3DChart(chart_space);
             if(b_hbar)
             {
                 switch(chart_type.grouping)
@@ -4025,7 +4021,7 @@ DrawingObjectsController.prototype =
                 }
                 default        :
                 {
-                    if(!chart.view3D)
+                    if(!AscFormat.CChartsDrawer.prototype._isSwitchCurrent3DChart(chart_space))
                     {
                         calc_chart_type = c_oAscChartTypeSettings.lineNormal;
                     }

common/Drawings/Format/ChartSpace.js

@@ -6007,7 +6007,7 @@ CChartSpace.prototype =
                         case AscDFH.historyitem_type_ScatterSer:
                         case AscDFH.historyitem_type_SurfaceSeries:
                         {
-                            if(this.chart.view3D)
+                            if(AscFormat.CChartsDrawer.prototype._isSwitchCurrent3DChart(this))
                             {
                                 union_marker.marker = AscFormat.CreateMarkerGeometryByType(AscFormat.SYMBOL_SQUARE, null);
                                 union_marker.marker.pen = ser.compiledSeriesPen;
@@ -6030,7 +6030,7 @@ CChartSpace.prototype =
                                 union_marker.lineMarker = AscFormat.CreateMarkerGeometryByType(AscFormat.SYMBOL_DASH, null);
                                 union_marker.lineMarker.pen = ser.compiledSeriesPen.createDuplicate(); //Копируем, так как потом возможно придется изменять толщину линии;
                             }
-                            if(!b_scatter_no_line && !this.chart.view3D)
+                            if(!b_scatter_no_line && !AscFormat.CChartsDrawer.prototype._isSwitchCurrent3DChart(this))
                                 b_line_series = true;
                             break;
                         }
@@ -6084,7 +6084,7 @@ CChartSpace.prototype =
 
                     calc_entry.calcMarkerUnion = new AscFormat.CUnionMarker();
                     union_marker = calc_entry.calcMarkerUnion;
-                    if(ser.getObjectType() === AscDFH.historyitem_type_LineSeries && !this.chart.view3D || ser.getObjectType() === AscDFH.historyitem_type_ScatterSer)
+                    if(ser.getObjectType() === AscDFH.historyitem_type_LineSeries && !AscFormat.CChartsDrawer.prototype._isSwitchCurrent3DChart(this) || ser.getObjectType() === AscDFH.historyitem_type_ScatterSer)
                     {
                         if(pt.compiledMarker)
                         {
@@ -6097,7 +6097,7 @@ CChartSpace.prototype =
                             union_marker.lineMarker = AscFormat.CreateMarkerGeometryByType(AscFormat.SYMBOL_DASH, null);
                             union_marker.lineMarker.pen = pt.pen;
                         }
-                        if(!b_scatter_no_line && !this.chart.view3D)
+                        if(!b_scatter_no_line && !AscFormat.CChartsDrawer.prototype._isSwitchCurrent3DChart(this))
                             b_line_series = true;
                     }
                     else
@@ -7260,7 +7260,7 @@ CChartSpace.prototype =
         {
             var plot_area = this.chart.plotArea;
             var default_brush;
-            if(this.chart.view3D)
+            if(AscFormat.CChartsDrawer.prototype._isSwitchCurrent3DChart(this))
             {
                 default_brush = CreateNoFillUniFill();
             }
@@ -7662,7 +7662,7 @@ CChartSpace.prototype =
                     case AscDFH.historyitem_type_RadarChart:
                     {
                         var base_line_fills = getArrayFillsFromBase(style.line4, getMaxIdx(series));
-                        if(!this.chart.view3D)
+                        if(!AscFormat.CChartsDrawer.prototype._isSwitchCurrent3DChart(this))
                         {
                             for(var i = 0; i < series.length; ++i)
                             {