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

Common/Charts/ChartsDrawer.js

@@ -102,7 +102,10 @@ CChartsDrawer.prototype =
 		
 		//делаем полный пресчёт
 		this.areaChart.reCalculate(this.calcProp, null, this);
+		
+		if(this.calcProp.type != "Pie" && this.calcProp.type != "DoughnutChart")
 			this.gridChart.reCalculate(this.calcProp, this, chartSpace);
+		
 		this.allAreaChart.reCalculate(this.calcProp);
 		
 		if(this.calcProp.type != "Pie" && this.calcProp.type != "DoughnutChart")
@@ -130,9 +133,9 @@ CChartsDrawer.prototype =
 		{
 			this.catAxisChart.draw(this.calcProp, cShapeDrawer, chartSpace);
 			this.valAxisChart.draw(this.calcProp, cShapeDrawer, chartSpace);
+			this.gridChart.draw(this.calcProp, cShapeDrawer, chartSpace);
 		}
 		
-		this.gridChart.draw(this.calcProp, cShapeDrawer, chartSpace);
 		this.chart.draw(this, cShapeDrawer, chartSpace);
 	},