fix bug 33358

common/Charts/3DTransformation.js

@@ -45,6 +45,15 @@ var ORIENTATION_MIN_MAX = AscFormat.ORIENTATION_MIN_MAX;
 var globalBasePercent = 100;
 var global3DPersperctive = 30; // ToDo а нужна ли она в ChartsDrawer ?
 
+var c_oChartFloorPosition =
+{
+	None: 0,
+	Left: 1,
+	Right: 2,
+	Bottom: 3,
+	Top: 4
+};
+
 /** @constructor */
 function Processor3D(width, height, left, right, bottom, top, chartSpace, chartsDrawer) {
 	this.widthCanvas = width;
@@ -342,7 +351,54 @@ Processor3D.prototype.calculateZPositionCatAxis = function()
 	return result;
 };
 
-
+Processor3D.prototype.calculateFloorPosition = function()
+{
+	var res;
+	
+	if(this.view3D.rAngAx)
+	{
+		if(this.chartsDrawer.calcProp.type === AscFormat.c_oChartTypes.HBar)
+		{	
+			var absOy = Math.abs(this.angleOy);
+			res = c_oChartFloorPosition.Left;
+			if(absOy > Math.PI)
+			{
+				res = c_oChartFloorPosition.Right;
+			}
+		}
+		else
+		{
+			res = c_oChartFloorPosition.Bottom;
+			if(this.angleOx > 0)
+			{
+				res = c_oChartFloorPosition.None;
+			}
+		}
+		
+	}
+	else
+	{
+		if(this.chartsDrawer.calcProp.type === AscFormat.c_oChartTypes.HBar)
+		{	
+			var absOy = Math.abs(this.angleOy);
+			res = c_oChartFloorPosition.Left;
+			if(absOy > Math.PI)
+			{
+				res = c_oChartFloorPosition.Right;
+			}
+		}
+		else
+		{
+			res = c_oChartFloorPosition.Bottom;
+			if(this.angleOx > 0)
+			{
+				res = c_oChartFloorPosition.None;
+			}
+		}
+	}
+	
+	return res;
+};
 
 //***functions for complete transformation point***
 Processor3D.prototype.convertAndTurnPoint = function(x, y, z, isNScale, isNRotate, isNProject)
@@ -2393,4 +2449,5 @@ Point3D.prototype =
 	window['AscFormat'] = window['AscFormat'] || {};
 	window['AscFormat'].Processor3D = Processor3D;
 	window['AscFormat'].Point3D = Point3D;
+	window['AscCommon'].c_oChartFloorPosition = c_oChartFloorPosition;
 })(window);

common/Charts/ChartsDrawer.js

@@ -11703,40 +11703,55 @@ floor3DChart.prototype =
 			maxPositionOy = yPoints[0].pos < yPoints[yPoints.length - 1].pos ? yPoints[0].pos * this.chartProp.pxToMM : yPoints[yPoints.length - 1].pos * this.chartProp.pxToMM;
 		}
 		
+		var pxToMm = this.chartProp.pxToMM;
+		var poisition = this.cChartDrawer.processor3D.calculateFloorPosition();
 		var perspectiveDepth = this.cChartDrawer.processor3D.depthPerspective;
-		var convertResult, x1n, y1n, x2n, y2n, x3n, y3n, x4n, y4n;
-		if(this.chartProp.type == c_oChartTypes.HBar)
+		var point1, point2, point3, point4;
+		
+		switch(poisition)
 		{
-			convertResult = this.cChartDrawer._convertAndTurnPoint(this.chartProp.chartGutter._left, nullPositionOy, 0);
-			x1n = convertResult.x / this.chartProp.pxToMM;
-			y1n = convertResult.y / this.chartProp.pxToMM;
-			convertResult = this.cChartDrawer._convertAndTurnPoint(this.chartProp.chartGutter._left, maxPositionOy, 0);
-			x2n = convertResult.x / this.chartProp.pxToMM;
-			y2n = convertResult.y / this.chartProp.pxToMM;
-			convertResult = this.cChartDrawer._convertAndTurnPoint(this.chartProp.chartGutter._left, maxPositionOy, perspectiveDepth);
-			x3n = convertResult.x / this.chartProp.pxToMM;
-			y3n = convertResult.y / this.chartProp.pxToMM;
-			convertResult = this.cChartDrawer._convertAndTurnPoint(this.chartProp.chartGutter._left, nullPositionOy, perspectiveDepth);
-			x4n = convertResult.x / this.chartProp.pxToMM;
-			y4n = convertResult.y / this.chartProp.pxToMM;
+			case AscCommon.c_oChartFloorPosition.Left:
+			{
+				point1 = this.cChartDrawer._convertAndTurnPoint(this.chartProp.chartGutter._left, nullPositionOy, 0);
+				point2 = this.cChartDrawer._convertAndTurnPoint(this.chartProp.chartGutter._left, maxPositionOy, 0);
+				point3 = this.cChartDrawer._convertAndTurnPoint(this.chartProp.chartGutter._left, maxPositionOy, perspectiveDepth);
+				point4 = this.cChartDrawer._convertAndTurnPoint(this.chartProp.chartGutter._left, nullPositionOy, perspectiveDepth);
+
+				break;
+			}
+			case AscCommon.c_oChartFloorPosition.Right:
+			{
+				point1 = this.cChartDrawer._convertAndTurnPoint(this.chartProp.widthCanvas - this.chartProp.chartGutter._right, nullPositionOy, 0);
+				point2 = this.cChartDrawer._convertAndTurnPoint(this.chartProp.widthCanvas - this.chartProp.chartGutter._right, maxPositionOy, 0);
+				point3 = this.cChartDrawer._convertAndTurnPoint(this.chartProp.widthCanvas - this.chartProp.chartGutter._right, maxPositionOy, perspectiveDepth);
+				point4 = this.cChartDrawer._convertAndTurnPoint(this.chartProp.widthCanvas - this.chartProp.chartGutter._right, nullPositionOy, perspectiveDepth);
+				
+				break;
+			}
+			case AscCommon.c_oChartFloorPosition.Bottom:
+			{
+				point1 = this.cChartDrawer._convertAndTurnPoint(this.chartProp.chartGutter._left, nullPositionOy, 0);
+				point2 = this.cChartDrawer._convertAndTurnPoint(this.chartProp.chartGutter._left, nullPositionOy, perspectiveDepth);
+				point3 = this.cChartDrawer._convertAndTurnPoint(this.chartProp.widthCanvas - this.chartProp.chartGutter._right, nullPositionOy, perspectiveDepth);
+				point4 = this.cChartDrawer._convertAndTurnPoint(this.chartProp.widthCanvas - this.chartProp.chartGutter._right, nullPositionOy, 0);
+			
+				break;
+			}
+			case AscCommon.c_oChartFloorPosition.Top:
+			{
+				point1 = this.cChartDrawer._convertAndTurnPoint(this.chartProp.chartGutter._left, maxPositionOy, 0);
+				point2 = this.cChartDrawer._convertAndTurnPoint(this.chartProp.chartGutter._left, maxPositionOy, perspectiveDepth);
+				point3 = this.cChartDrawer._convertAndTurnPoint(this.chartProp.widthCanvas - this.chartProp.chartGutter._right, maxPositionOy, perspectiveDepth);
+				point4 = this.cChartDrawer._convertAndTurnPoint(this.chartProp.widthCanvas - this.chartProp.chartGutter._right, maxPositionOy, 0);
+				
+				break;
+			}
 		}
-		else
+		
+		if(point1)
 		{
-			convertResult = this.cChartDrawer._convertAndTurnPoint(this.chartProp.chartGutter._left, nullPositionOy, 0);
-			x1n = convertResult.x / this.chartProp.pxToMM;
-			y1n = convertResult.y / this.chartProp.pxToMM;
-			convertResult = this.cChartDrawer._convertAndTurnPoint(this.chartProp.chartGutter._left, nullPositionOy, perspectiveDepth);
-			x2n = convertResult.x / this.chartProp.pxToMM;
-			y2n = convertResult.y / this.chartProp.pxToMM;
-			convertResult = this.cChartDrawer._convertAndTurnPoint(this.chartProp.widthCanvas - this.chartProp.chartGutter._right, nullPositionOy, perspectiveDepth);
-			x3n = convertResult.x / this.chartProp.pxToMM;
-			y3n = convertResult.y / this.chartProp.pxToMM;
-			convertResult = this.cChartDrawer._convertAndTurnPoint(this.chartProp.widthCanvas - this.chartProp.chartGutter._right, nullPositionOy, 0);
-			x4n = convertResult.x / this.chartProp.pxToMM;
-			y4n = convertResult.y / this.chartProp.pxToMM;
+			this.paths.chartFloor = this.cChartDrawer.calculatePolygon([{x: point1.x / pxToMm, y: point1.y / pxToMm}, {x: point2.x / pxToMm, y: point2.y / pxToMm}, {x: point3.x / pxToMm, y: point3.y / pxToMm}, {x: point4.x / pxToMm, y: point4.y / pxToMm}]);
 		}
-		
-		this.paths.chartFloor = this.cChartDrawer.calculatePolygon([{x: x1n, y: y1n}, {x: x2n, y: y2n}, {x: x3n, y: y3n}, {x: x4n, y: y4n}]);
 	},
 		
 	_draw: function()