в настройки диаграмм добавлены два флага - showHorAxis, showVerAxis

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

Common/Drawings/CommonController.js

@@ -2696,6 +2696,9 @@ DrawingObjectsController.prototype =
                 }
             }
             hor_axis.setMenuProps(chartSettings.getHorAxisProps());
+            if(isRealBool(chartSettings.getShowHorAxis())){
+                hor_axis.setDelete(!chartSettings.getShowHorAxis());
+            }
         }
 
         //vertAxis
@@ -2769,7 +2772,10 @@ DrawingObjectsController.prototype =
                     }
                 }
             }
-            vert_axis.setMenuProps(chartSettings.getVertAxisProps())
+            vert_axis.setMenuProps(chartSettings.getVertAxisProps());
+            if(isRealBool(chartSettings.getShowVerAxis())){
+                vert_axis.setDelete(!chartSettings.getShowVerAxis());
+            }
         }
 
         //gridLines
@@ -3215,11 +3221,15 @@ DrawingObjectsController.prototype =
         var chart_type_object_type = chart_type.getObjectType();
 
         if(hor_axis)
+        {
+            ret.putShowHorAxis(!hor_axis.bDelete);
             ret.putHorAxisProps(hor_axis.getMenuProps());
+        }
         ret.putHorGridLines(calc_grid_lines(vert_axis));
 
         if(vert_axis)
         {
+            ret.putShowVerAxis(!vert_axis.bDelete);
             ret.putVertAxisProps(vert_axis.getMenuProps());
             if(chart_type.getObjectType() === historyitem_type_AreaChart && !isRealNumber(vert_axis.crossBetween))
             {

Common/apiCommon.js

@@ -179,6 +179,8 @@
             this.showMarker = null;
             this.bLine = null;
             this.smooth = null;
+            this.showHorAxis = null;
+            this.showVerAxis = null;
         }
         asc_ChartSettings.prototype =
         {
@@ -543,6 +545,20 @@
                         break;
                     }
                 }
+            },
+
+            putShowHorAxis: function(v){
+                this.showHorAxis = v;
+            },
+            getShowHorAxis: function(){
+                return this.showHorAxis;
+            },
+
+            putShowVerAxis: function(v){
+                this.showVerAxis = v;
+            },
+            getShowVerAxis: function(){
+                return this.showVerAxis;
             }
         };
 
@@ -594,6 +610,11 @@
         prot["putSmooth"]   = prot.putSmooth;
         prot["getSmooth"]   = prot.getSmooth;
         prot["changeType"]   = prot.changeType;
+        prot["putShowHorAxis"]   = prot.putShowHorAxis;
+        prot["getShowHorAxis"]   = prot.getShowHorAxis;
+
+        prot["putShowVerAxis"]   = prot.putShowVerAxis;
+        prot["getShowVerAxis"]   = prot.getShowVerAxis;
 
         window["asc_ChartSettings"] = asc_ChartSettings;