[ve] Add cord transform. transformEllipticalArcParams return anti-clo…

…ckwise angles now
ONLYOFFICE · Oct 11, 2023 · 998a387 · 998a387
1 parent 6adb46d
commit 998a387
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 31 deletions.
diff --git a/common/Drawings/ArcTo.js b/common/Drawings/ArcTo.js
@@ -79,7 +79,6 @@
         var fSrtAngle = (2 * Math.PI) - fStartAngle;
         // by this moment we have endAngle( = fEndAngle) and startAngle( = fSrtAngle) clockwise
 
-        // why inverted: fSweepAngle = -fSweepAngle? maybe should be opposite bClockDirection value?
         if( fSweepAngle > 0 )
             bClockDirection = true;
 
@@ -95,6 +94,8 @@
 
     function AngToEllPrm(fAngle, fXRad, fYRad)
     {
+        // to ellipse parametric equation angle parameter - t
+        // https://www.mathopenref.com/coordparamellipse.html
         return Math.atan2( Math.sin( fAngle ) / fYRad,  Math.cos( fAngle ) / fXRad );
     }
 

diff --git a/draw/model/VisioDocument.js b/draw/model/VisioDocument.js
@@ -305,6 +305,8 @@
 		//so without mirror we get page up side down
 		//global_MatrixTransformer.Reflect(graphics.m_oCoordTransform, false, true);
 		//global_MatrixTransformer.TranslateAppend(graphics.m_oCoordTransform, 0, h_px);
+		graphics.m_oCoordTransform.ty = h_px;
+		graphics.m_oCoordTransform.sy = - graphics.m_oCoordTransform.sy;
 
 		let shapes = this.convertToShapes(logic_w_mm, logic_h_mm);
 		shapes.forEach(function(shape) {

diff --git a/tests/draw/api/get-geometry-from-class-api.js b/tests/draw/api/get-geometry-from-class-api.js
@@ -218,6 +218,13 @@
 		return textValueCorrectUnits;
 	}
 
+	/**
+	 * accepts angles in anti-clockwise system
+	 * @param {number} startAngle
+	 * @param {number} endAngle
+	 * @param {number} ctrlAngle
+	 * @returns {number} sweep - positive sweep means anti-clockwise
+	 */
 	function computeSweep(startAngle, endAngle, ctrlAngle) {
 		let sweep;
 
@@ -229,15 +236,19 @@
 
 		if (startAngle < endAngle) {
 			if (startAngle < ctrlAngle && ctrlAngle < endAngle) {
-				sweep = startAngle - endAngle;
+				// positive sweep - anti-clockwise
+				sweep = endAngle - startAngle;
 			} else {
-				sweep = 360 + (startAngle - endAngle);
+				// negative sweep - clockwise
+				sweep = (endAngle - startAngle) - 360;
 			}
 		} else {
 			if (endAngle < ctrlAngle && ctrlAngle < startAngle) {
-				sweep = startAngle - endAngle;
+				// negative sweep - clockwise
+				sweep = endAngle - startAngle;
 			} else {
-				sweep = - (360 - (startAngle - endAngle));
+				// positive sweep - anti-clockwise
+				sweep = 360 - (startAngle - endAngle);
 			}
 		}
 
@@ -272,14 +283,14 @@
 		// it is not necessary, but I try to avoid imprecise calculations
 		// with points:
 		// 		convert
-		// 			719999.9999999999 			to 720000
-		// 			719999.5555 						to 719999.5555
+		// 				719999.9999999999 			to 720000
+		// 				719999.5555 						to 719999.5555
 		// with angles (see below):
 		// 		convert
-		// 			-90.00000000000006 			to -90
-		// 			6.176024640130164e-15 	to 0
+		// 				-90.00000000000006 			to -90
+		// 				6.176024640130164e-15 	to 0
 		// 		but lost precision on convert
-		// 			54.61614630046808 			to 54.6161
+		// 				54.61614630046808 			to 54.6161
 		// can be enhanced by if add: if rounded angle is 0 so round otherwise dont
 
 		// lets save only 4 digits after point coordinates to avoid imprecise calculations to perform correct compares later
@@ -330,32 +341,35 @@
 
 		let sweep = computeSweep(startAngle, endAngle, ctrlAngle);
 
-		let wR = rx;
-		let hR = ry;
-
-		// ellipseRotation is AntiClockwise so 30 deg go up in Visio
-		// but in ECMA it should be another angle
-		// because in ECMA angles are clockwise ang 30 deg go down.
-		let ellipseRotationInDeg = 360 - c * radToDeg;
-		ellipseRotationInDeg = Math.round(ellipseRotationInDeg * 1e4) / 1e4;
-
-		ellipseRotationInDeg = ellipseRotationInDeg === 360 ? 0 : ellipseRotationInDeg;
-
-		// convert from anticlockwise angle system to clockwise see comment above
-		let stAngDeg = 360 - startAngle;
+		let ellipseRotationAngle = c * radToDeg;
+		ellipseRotationAngle = Math.round(ellipseRotationAngle * 1e4) / 1e4;
+		ellipseRotationAngle = ellipseRotationAngle === -0 ? 0 : ellipseRotationAngle;
+		ellipseRotationAngle = ellipseRotationAngle === 360 ? 0 : ellipseRotationAngle;
 
 		// TODO check results consider sweep sign is important: clockwise or anti-clockwise
 
-		let mirrorVertically = false;
-		if (mirrorVertically) {
-			stAngDeg = 360 - stAngDeg;
-			sweep = -sweep;
-			ellipseRotationInDeg = - ellipseRotationInDeg;
-		}
+		// let mirrorVertically = false;
+		// if (mirrorVertically) {
+		// 	startAngle = 360 - startAngle;
+		// 	sweep = -sweep;
+		// 	ellipseRotationAngle = - ellipseRotationAngle;
+		// }
 
+		// WARNING these are not ECMA params exactly, stAng and swAng angles are anti-clockwise!
+		// about ECMA cord system:
+		// c is AntiClockwise so 30 deg go up in Visio
+		// but in ECMA it should be another angle
+		// because in ECMA angles are clockwise ang 30 deg go down.
+		// convert from anticlockwise angle system to clockwise
+		// angleEcma = 360 - angleVisio;
+		// using visio angles here but still multiply to degToC
+		// then cord system trasformed in sdkjs/draw/model/VisioDocument.js CVisioDocument.prototype.draw
 		let swAng = sweep * degToC;
-		let stAng = stAngDeg * degToC;
-		let ellipseRotationInC = ellipseRotationInDeg * degToC;
+		let stAng = startAngle * degToC;
+		let ellipseRotationInC = ellipseRotationAngle * degToC;
+
+		let wR = rx;
+		let hR = ry;
 
 		return {wR : wR, hR : hR, stAng : stAng, swAng : swAng, ellipseRotation : ellipseRotationInC};
 	}