Выбор значения CROSS_BETWEEN_MID_CAT параметра сrossBetween для оси значений...

Выбор значения CROSS_BETWEEN_MID_CAT параметра сrossBetween для оси значений AreaChart в случае, если он не задан явно. Исправлены баги при набивке кэша диаграммы.

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

Common/Drawings/CommonController.js

@@ -2662,15 +2662,31 @@ DrawingObjectsController.prototype =
                 return c_oAscGridLinesSettings.minor;
             return c_oAscGridLinesSettings.majorMinor;
         };
+
+        var chart_type = plot_area.charts[0];
+        var chart_type_object_type = chart_type.getObjectType();
+
         if(hor_axis)
             ret.putHorAxisProps(hor_axis.getMenuProps());
         ret.putHorGridLines(calc_grid_lines(vert_axis));
 
         if(vert_axis)
+        {
             ret.putVertAxisProps(vert_axis.getMenuProps());
+            if(chart_type.getObjectType() === historyitem_type_AreaChart && !isRealNumber(vert_axis.crossBetween))
+            {
+                if(ret.horAxisProps)
+                {
+                    ret.horAxisProps.putLabelsPosition(c_oAscLabelsPosition.byDivisions);
+                }
+            }
+        }
         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)
@@ -2759,8 +2775,6 @@ DrawingObjectsController.prototype =
             ret.putLegendPos(c_oAscChartLegendShowSettings.none);
         }
 
-        var chart_type = plot_area.charts[0];
-        var chart_type_object_type = chart_type.getObjectType();
 
         var calc_chart_type;
         if(chart_type_object_type === historyitem_type_PieChart)

Common/Drawings/Format/ChartFormat.js

@@ -4074,7 +4074,7 @@ CCatAx.prototype =
         }
         else
         {
-            ret.putLabelsPosition(CROSS_BETWEEN_BETWEEN);
+            ret.putLabelsPosition(c_oAscLabelsPosition.betweenDivisions);
         }
         if(isRealNumber(this.tickLblPos) && isRealNumber(REV_MENU_SETTINGS_LABELS_POS[this.tickLblPos]))
             ret.putTickLabelsPos(REV_MENU_SETTINGS_LABELS_POS[this.tickLblPos]);

Common/SerializeChart.js

@@ -10446,10 +10446,10 @@ BinaryChartReader.prototype.ReadCT_PlotArea = function (type, length, val, oIdTo
         if (null != oNewVal.axId)
             oIdToAxisMap[oNewVal.axId] = oNewVal;
         val.addAxis(oNewVal);
-        if(!isRealNumber(oNewVal.crossBetween))
-        {
-            oNewVal.setCrossBetween(CROSS_BETWEEN_BETWEEN);
-        }
+        //if(!isRealNumber(oNewVal.crossBetween))
+        //{
+        //    oNewVal.setCrossBetween(CROSS_BETWEEN_BETWEEN);
+        //}
     }
     else if (c_oserct_plotareaDTABLE === type) {
         var oNewVal = new CDTable();
@@ -10773,7 +10773,19 @@ BinaryChartReader.prototype.ReadCT_Chart = function (type, length, val) {
         for(var nChartIndex = 0; nChartIndex < aChartWithAxis.length; ++nChartIndex)
         {
             var oCurChartWithAxis = aChartWithAxis[nChartIndex];
-            oCurChartWithAxis.chart.addAxId(oIdToAxisMap[oCurChartWithAxis.axisId]);
+            var axis = oIdToAxisMap[oCurChartWithAxis.axisId];
+            oCurChartWithAxis.chart.addAxId(axis);
+            if(axis && axis.getObjectType() === historyitem_type_ValAx && !isRealNumber(axis.crossBetween))
+            {
+                if(oCurChartWithAxis.chart.getObjectType() === historyitem_type_AreaChart)
+                {
+                    axis.setCrossBetween(CROSS_BETWEEN_MID_CAT);
+                }
+                else
+                {
+                    axis.setCrossBetween(CROSS_BETWEEN_BETWEEN);
+                }
+            }
         }
         val.setPlotArea(oNewVal);
     }