добавлены дополнительные параметры осей для передачи в меню.

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

Common/Drawings/Format/ChartFormat.js

@@ -67,6 +67,25 @@ function removeAllSeriesFromChart(chart)
 }
 
 
+function getMinMaxFromArrPoints(aPoints)
+{
+    if(Array.isArray(aPoints) && aPoints.length > 0)
+    {
+        if(isRealObject(aPoints[0]) && isRealNumber(aPoints[0].val) && isRealObject(aPoints[aPoints.length - 1]) && isRealNumber(aPoints[aPoints.length - 1].val))
+        {
+            if(aPoints[0].val - aPoints[aPoints.length - 1].val <= 0)
+            {
+                return {min: aPoints[0].val, max: aPoints[aPoints.length - 1].val};
+            }
+            else
+            {
+                return {min: aPoints[aPoints.length - 1].val, max: aPoints[0].val};
+            }
+        }
+    }
+    return {min: null, max: null};
+}
+
 
 var SCALE_INSET_COEFF = 1.016;//Возможно придется уточнять
 var NEW_WORKSHEET_DRAWING_DOCUMENT = null;
@@ -4275,6 +4294,11 @@ CCatAx.prototype =
 
         if(crossAx)
         {
+            if(isRealNumber(this.maxCatVal))
+            {
+                ret.putCrossMaxVal(this.maxCatVal);
+            }
+            ret.putCrossMinVal(1);
             if(isRealNumber(crossAx.crossesAt))
             {
                 ret.putCrossesRule(c_oAscCrossesRule.value);
@@ -4283,20 +4307,23 @@ CCatAx.prototype =
             else if(crossAx.crosses === CROSSES_MAX)
             {
                 ret.putCrossesRule(c_oAscCrossesRule.maxValue);
+                if(isRealNumber(this.maxCatVal))
+                {
+                    ret.putCrosses(this.maxCatVal);
+                }
             }
             else if(crossAx.crosses === CROSSES_MIN)
             {
                 ret.putCrossesRule(c_oAscCrossesRule.minValue);
+                ret.putCrosses(1);
             }
             else
             {
                 ret.putCrossesRule(c_oAscCrossesRule.auto);
+                ret.putCrosses(1);
             }
         }
 
-
-
-
         if(isRealNumber(this.lblOffset))
             ret.putLabelsAxisDistance(this.lblOffset);
         else
@@ -8603,6 +8630,15 @@ CValAx.prototype =
             ret.putLogScale(false);
         }
 
+        var oMinMaxOnAxis;
+        if(this.axPos === AX_POS_L || this.axPos === AX_POS_R)
+        {
+            oMinMaxOnAxis = getMinMaxFromArrPoints(this.yPoints);
+        }
+        else
+        {
+            oMinMaxOnAxis = getMinMaxFromArrPoints(this.xPoints);
+        }
         //настроки максимального значения по оси
         if(scaling && isRealNumber(scaling.max))
         {
@@ -8612,6 +8648,7 @@ CValAx.prototype =
         else
         {
             ret.putMaxValRule(c_oAscValAxisRule.auto);
+            ret.putMaxVal(oMinMaxOnAxis.max);
         }
 
         //настройки минимального значения по оси
@@ -8623,6 +8660,7 @@ CValAx.prototype =
         else
         {
             ret.putMinValRule(c_oAscValAxisRule.auto);
+            ret.putMaxVal(oMinMaxOnAxis.min);
         }
 
         //настройка ориентации оси
@@ -8671,11 +8709,7 @@ CValAx.prototype =
         else
             ret.putTickLabelsPos(c_oAscTickLabelsPos.TICK_LABEL_POSITION_NEXT_TO);
 
-
-
-
         var crossAx = this.crossAx;
-
         if(crossAx)
         {
             //настройки пересечения с другой осью
@@ -8687,18 +8721,33 @@ CValAx.prototype =
             else if(crossAx.crosses === CROSSES_MAX)
             {
                 ret.putCrossesRule(c_oAscCrossesRule.maxValue);
+                ret.putCrosses(oMinMaxOnAxis.max);
             }
             else if(crossAx.crosses === CROSSES_MIN)
             {
                 ret.putCrossesRule(c_oAscCrossesRule.minValue);
+                ret.putCrosses(oMinMaxOnAxis.min);
             }
             else
             {
                 ret.putCrossesRule(c_oAscCrossesRule.auto);
+                if(isRealNumber(oMinMaxOnAxis.min) && isRealNumber(oMinMaxOnAxis.max))
+                {
+                    if(0 >= oMinMaxOnAxis.min && 0 <= oMinMaxOnAxis.max)
+                    {
+                        ret.putCrosses(0);
+                    }
+                    else if(oMinMaxOnAxis.min > 0)
+                    {
+                        ret.putCrosses(oMinMaxOnAxis.min);
+                    }
+                    else
+                    {
+                        ret.putCrosses(oMinMaxOnAxis.max);
+                    }
+                }
             }
         }
-
-
         return ret;
     },
 

Common/Drawings/Format/ChartSpace.js

@@ -3529,6 +3529,8 @@ CChartSpace.prototype =
                     else
                         crosses = 1;
 
+                    cat_ax.maxCatVal = string_pts.length;
+
                     var cat_ax_orientation = cat_ax.scaling && isRealNumber(cat_ax.scaling.orientation) ?  cat_ax.scaling.orientation : ORIENTATION_MIN_MAX;
                     var point_width = rect.w/string_pts.length;
                     var labels_pos = val_ax.tickLblPos;
@@ -3693,7 +3695,6 @@ CChartSpace.prototype =
                                     {
                                         for(i = 0; i < string_pts.length; ++i)
                                             arr_cat_labels_points[i] = start_point_right - point_interval*i;
-
                                     }
                                     else
                                     {
@@ -3708,7 +3709,6 @@ CChartSpace.prototype =
                                     {
                                         for(i = 0; i < string_pts.length; ++i)
                                             arr_cat_labels_points[i] = rect.x + rect.w - point_interval*i;
-
                                     }
                                     else
                                     {
@@ -3752,7 +3752,6 @@ CChartSpace.prototype =
                                 for(i = 0; i < string_pts.length; ++i)
                                     arr_cat_labels_points[i] = rect.x + rect.w - point_interval/2 - point_interval*i;
                             }
-
                             val_ax.posX = rect.x + rect.w - point_interval*(crosses-1);
                         }
                         else
@@ -4616,6 +4615,9 @@ CChartSpace.prototype =
                     else
                         crosses = 1;
 
+
+                    cat_ax.maxCatVal = string_pts.length;
+
                     var cat_ax_orientation = cat_ax.scaling && isRealNumber(cat_ax.scaling.orientation) ?  cat_ax.scaling.orientation : ORIENTATION_MIN_MAX;
                     var labels_pos = val_ax.tickLblPos;
                     var cross_between = isRealNumber(val_ax.crossBetween) ? val_ax.crossBetween : CROSS_BETWEEN_BETWEEN;

Common/apiCommon.js

@@ -869,6 +869,8 @@
         this.crosses                   = null;
         this.labelsPosition            = null;
         this.axisType                  = c_oAscAxisType.cat;
+        this.crossMinVal               = null;
+        this.crossMaxVal               = null;
     }
 
     asc_CatAxisSettings.prototype =
@@ -977,6 +979,28 @@
             return this.labelsPosition;
         },
 
+        getCrossMinVal: function()
+        {
+            return this.crossMinVal;
+        },
+
+        getCrossMaxVal: function()
+        {
+            return this.crossMaxVal;
+        },
+
+
+
+        putCrossMinVal: function(val)
+        {
+            this.crossMinVal = val;
+        },
+
+        putCrossMaxVal: function(val)
+        {
+            this.crossMaxVal = val;
+        },
+
         setDefault: function()
         {
             this.putIntervalBetweenLabelsRule(c_oAscBetweenLabelsRule.auto);
@@ -1003,6 +1027,8 @@
     prot["putCrosses"] = prot.putCrosses;
     prot["putAxisType"] = prot.putAxisType;
     prot["putLabelsPosition"] = prot.putLabelsPosition;
+    prot["putCrossMaxVal"] = prot.putCrossMaxVal;
+    prot["putCrossMinVal"] = prot.putCrossMinVal;
 
 
     prot["getIntervalBetweenTick"] = prot.getIntervalBetweenTick;
@@ -1017,6 +1043,8 @@
     prot["getCrosses"]     = prot.getCrosses                   ;
     prot["getAxisType"]     = prot.getAxisType                   ;
     prot["getLabelsPosition"] = prot.getLabelsPosition;
+    prot["getCrossMaxVal"] = prot.getCrossMaxVal;
+    prot["getCrossMinVal"] = prot.getCrossMinVal;
     prot["setDefault"] = prot.setDefault;