Не выставлялись настройки из меню

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

Common/Drawings/CommonController.js

@@ -1297,9 +1297,9 @@ DrawingObjectsController.prototype =
 
             var hor_axis = plot_area.getHorizontalAxis();
             var hor_axis_label_setting = chartSettings.getHorAxisLabel();
-            if(hor_axis_label_setting !== null)
-            {  //TODO: запрашивать у chart_type
-                if(hor_axis)
+            if(hor_axis)
+            {
+                if(hor_axis_label_setting !== null)
                 {
                     switch (hor_axis_label_setting)
                     {
@@ -1319,8 +1319,8 @@ DrawingObjectsController.prototype =
                             break;
                         }
                     }
-                    hor_axis.setMenuProps(chartSettings.getHorAxisProps());
                 }
+                hor_axis.setMenuProps(chartSettings.getHorAxisProps());
             }
 
 
@@ -1328,9 +1328,9 @@ DrawingObjectsController.prototype =
             //vertAxis
             var vert_axis = plot_area.getVerticalAxis(); //TODO: запрашивать у chart_type
             var vert_axis_labels_settings = chartSettings.getVertAxisLabel();
-            if(vert_axis_labels_settings !== null)
+            if(vert_axis)
             {
-                if(vert_axis)
+                if(vert_axis_labels_settings !== null)
                 {
                     switch (vert_axis_labels_settings)
                     {
@@ -1370,8 +1370,8 @@ DrawingObjectsController.prototype =
                             }
                         }
                     }
-                    vert_axis.setMenuProps(chartSettings.getVertAxisProps())
                 }
+                vert_axis.setMenuProps(chartSettings.getVertAxisProps())
             }
             //legend
             var legend_pos_settings =  chartSettings.getLegendPos();

Common/Drawings/Format/ChartFormat.js

@@ -2344,8 +2344,8 @@ CCatAx.prototype =
     setMenuProps: function(props)
     {
         if(!(isRealObject(props)
-            && typeof props.getType === "function"
-            &&(props.getType() === c_oAscAxisType.cat || props.getType() === c_oAscAxisType.date)))
+            && typeof props.getAxisType === "function"
+            &&(props.getAxisType() === c_oAscAxisType.cat || props.getAxisType() === c_oAscAxisType.date)))
             return;
 
 
@@ -3095,7 +3095,7 @@ CValAx.prototype =
 
     setMenuProps: function(props)
     {
-        if(!(isRealObject(props) && typeof props.getType === "function" && props.getType() === c_oAscAxisType.val))
+        if(!(isRealObject(props) && typeof props.getAxisType === "function" && props.getAxisType() === c_oAscAxisType.val))
             return;
         if(!this.scaling)
             this.setScaling(new CScaling());
@@ -3133,7 +3133,7 @@ CValAx.prototype =
             scaling.setOrientation(props.invertValOrder ? ORIENTATION_MAX_MIN : ORIENTATION_MIN_MAX);
 
 
-        if(isRealBool(vert_axis_props.logScale) && isRealNumber(props.logBase) && props.logBase > 0)
+        if(isRealBool(props.logScale) && isRealNumber(props.logBase) && props.logBase > 0)
             scaling.setLogBase(props.logBase);
 
         if(isRealNumber(props.units))