Применение настроек для оси категорий и оси значений.

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

Common/Drawings/CommonController.js

@@ -1833,23 +1833,24 @@ DrawingObjectsController.prototype =
                     {
                         if(vert_axis_props.crossesRule === c_oAscCrossesRule.auto)
                         {
-                            val_ax.crossAx.setCrossesAt(null)
+                            val_ax.crossAx.setCrossesAt(null);
                             val_ax.crossAx.setCrosses(CROSSES_AUTO_ZERO);
                         }
                         else if(vert_axis_props.crossesRule === c_oAscCrossesRule.value)
                         {
                             if(isRealNumber(vert_axis_props.crosses))
                             {
-                                val_ax.crossAx.setCrossesAt(vert_axis_props.crosses)
+                                val_ax.crossAx.setCrossesAt(vert_axis_props.crosses);
                                 val_ax.crossAx.setCrosses(null);
                             }
                         }
                         else if(vert_axis_props.crossesRule === c_oAscCrossesRule.maxValue)
                         {
-                            val_ax.crossAx.setCrossesAt(null)
+                            val_ax.crossAx.setCrossesAt(null);
                             val_ax.crossAx.setCrosses(CROSSES_MAX);
                         }
                     }
+                }
 
                 var hor_axis_props = chartSettings.getHorAxisProps();
                 if(hor_axis_props)
@@ -1914,27 +1915,26 @@ DrawingObjectsController.prototype =
                     {
                         if(crossesRule === c_oAscCrossesRule.auto)
                         {
-                                cat_ax.crossAx.setCrossesAt(null)
+                            cat_ax.crossAx.setCrossesAt(null);
                             cat_ax.crossAx.setCrosses(CROSSES_AUTO_ZERO);
                         }
                         else if(crossesRule === c_oAscCrossesRule.value)
                         {
                             if(isRealNumber(crosses))
                             {
-                                    cat_ax.crossAx.setCrossesAt(crosses)
+                                cat_ax.crossAx.setCrossesAt(crosses);
                                 cat_ax.crossAx.setCrosses(null);
                             }
                         }
                         else if(crossesRule === c_oAscCrossesRule.maxValue)
                         {
-                                cat_ax.crossAx.setCrossesAt(null)
+                            cat_ax.crossAx.setCrossesAt(null);
                             cat_ax.crossAx.setCrosses(CROSSES_MAX);
                         }
                     }
 
                     if(isRealNumber(labelsPosition) && isRealObject(cat_ax.crossAx))
-                            cat_ax.crossAx(labelsPosition === c_oAscLabelsPosition.byDivisions ? CROSS_BETWEEN_MID_CAT : CROSS_BETWEEN_BETWEEN)
-                    }
+                        cat_ax.crossAx.setCrossBetween(labelsPosition === c_oAscLabelsPosition.byDivisions ? CROSS_BETWEEN_MID_CAT : CROSS_BETWEEN_BETWEEN);
                 }
             }
 

Common/Drawings/Format/ChartSpace.js

@@ -2987,7 +2987,6 @@ function CreateStockChart(asc_chart)
     return chart_space;
 }
 
-
 function CreateDefaultAxises(valFormatCode)
 {
     var cat_ax = new CCatAx();

Common/Drawings/Format/TextBody.js

@@ -1009,6 +1009,14 @@ CTextBody.prototype =
 		this.parent && this.parent.Refresh_RecalcData2(pageIndex);
 	},
 
+    getContentOneStringSizes: function()
+    {
+        //TODO: потом переделать
+        this.content.Reset(0, 0, 20000, 20000);//выставляем большую ширину чтобы текст расчитался в одну строку.
+        this.content.Recalculate_Page(0, true);
+        return {w: this.content.Content[0].Lines[0].Ranges[0].W+0.1, h: this.content.Get_SummaryHeight()+0.1};
+    },
+	
     getRectWidth: function(maxWidth)
     {
         var body_pr = this.getBodyPr();

Excel/SpreadsheetTestMenu.html

@@ -2556,9 +2556,9 @@ Format
         <label>max value</label><input type="radio" name="crossesCat" value="maxValue" id="crossesMaxAxCatInput">
         <br>
         <label>Axis Position</label><br>
-        <label>by divisions:</label><input type="radio" id="checkBoxByDivisionsInput" checked="checked">
+        <label>by divisions:</label><input type="radio" id="checkBoxByDivisionsInput"  name="axis_pos_cat">
         <br>
-        <label>between divisions:</label><input type="radio" id="checkBoxBetweenDivisionsInput">
+        <label>between divisions:</label><input type="radio" id="checkBoxBetweenDivisionsInput" checked="checked" name="axis_pos_cat">
         <div style="width: inherit; height: 1px; background: rgb(127,157,185)"></div>
         <button id="valApplyCatAxisProps">
             Apply Props

Excel/menu/menu.js

@@ -3132,7 +3132,7 @@
             else if($("#crossesCatAxValInput").attr("checked"))
             {
                 axis_settings.putCrossesRule(c_oAscCrossesRule.value);
-                axis_settings.putCrosses($("#crossesCatInput").attr("value"));
+                axis_settings.putCrosses(parseFloat($("#crossesCatInput").attr("value")));
             }
             else
             {