Линии сетки

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

Common/Drawings/CommonController.js

@@ -1442,10 +1442,8 @@ DrawingObjectsController.prototype =
                 }
             };
 
-            setAxisGridLines(plot_area.getHorizontalAxis(), chartSettings.getHorGridLines());
-            setAxisGridLines(plot_area.getVerticalAxis(), chartSettings.getVertGridLines());
-
-
+            setAxisGridLines(plot_area.getVerticalAxis(), chartSettings.getHorGridLines());
+            setAxisGridLines(plot_area.getHorizontalAxis(), chartSettings.getVertGridLines());
 
             var chart_type = plot_area.chart;
             //Data Labels

Common/Drawings/Format/ChartFormat.js

@@ -10963,6 +10963,20 @@ CPlotArea.prototype =
         return this.valAx;  //TODO
     },
 
+    getAxisByTypes: function()
+    {
+       //var  ret = {valAx:[], catAx: [], dateAx: []};
+       //for(var i = 0; i < this.axis.length; ++i)
+       //{
+       //    var axis = this.axis[i];
+       //
+       //    switch(this.axi)
+       //}
+       //this.valAx = null;
+       //this.catAx = null;
+       //this.dateAx = null;
+    },
+
     Undo: function(data)
     {
         switch (data.Type)

Common/apiCommon.js

@@ -325,8 +325,8 @@
         prot["getDataLabelsPos"] = prot.getDataLabelsPos;
         prot["getHorAx"]         = prot.getHorAx;
         prot["getVertAx"]        = prot.getVertAx;
-        prot["getHorGridLines"]         = prot.getVertGridLines;
-        prot["putHorGridLines"]        = prot.putVertGridLines;
+        prot["getHorGridLines"]         = prot.getHorGridLines;
+        prot["putHorGridLines"]        = prot.putHorGridLines;
         prot["getVertGridLines"]         = prot.getVertGridLines;
         prot["putVertGridLines"]        = prot.putVertGridLines;
 

Excel/model/DrawingObjects/Format/ChartSpacePrototype.js

@@ -424,6 +424,7 @@ function CreateUniFillSolidFillWidthTintOrShade(unifill, effectVal)
     var unicolor = ret.fill.color;
     if(effectVal !== 0)
     {
+        effectVal*=100000.0;
         unicolor.setMods(new CColorModifiers());
         var mod = new CColorMod();
         if(effectVal > 0)
@@ -515,8 +516,8 @@ function getArrayFillsFromBase(arrBaseFills, needFillsCount)
     {
         for (var j = 0; j < count_base; j++)
         {
-            var percent = (-70 + 140 * ( (i + 1) / (need_create + 1) )) * 1000;
-            var color = CreateUniFillSolidFillWidthTintOrShade(arrBaseFills[j], 100000 - percent);
+            var percent = (-70 + 140 * ( (i + 1) / (need_create + 1) )) /100;
+            var color = CreateUniFillSolidFillWidthTintOrShade(arrBaseFills[j], 1 - percent);
             ret.push( color );
         }
     }
@@ -537,6 +538,10 @@ CChartSpace.prototype.recalculateGridLines = function()
                 {
                     var compiled_grid_lines = new CLn();
                     compiled_grid_lines.merge(subtleLine);
+                    if(compiled_grid_lines.Fill && compiled_grid_lines.Fill.fill && compiled_grid_lines.Fill.fill.color && compiled_grid_lines.Fill.fill.color.Mods)
+                    {
+                        compiled_grid_lines.Fill.fill.color.Mods.Mods.length = 0;
+                    }
                     if(!compiled_grid_lines.Fill)
                     {
                         compiled_grid_lines.setFill(new CUniFill());
@@ -2224,7 +2229,9 @@ CChartSpace.prototype.recalculateAxis = function()
         }
         else if(chart_type === historyitem_type_BarChart && chart_object.barDir === BAR_DIR_BAR)
         {
-
+            //var cat_ax, val_ax;
+            //var axis_arr = plot_area.axis;
+            //for(i = 0; i < axis_arr.length; ++a)
         }
     }
 };