changing format of controls/handles + adding color enums

1 files changed, 21 insertions, 17 deletions

diff --git a/src/client/views/InkStrokeProperties.ts b/src/client/views/InkStrokeProperties.ts
index 1a3585f3e..de8cf80bd 100644
--- a/src/client/views/InkStrokeProperties.ts
+++ b/src/client/views/InkStrokeProperties.ts
@@ -35,7 +35,7 @@ export class InkStrokeProperties {
      * @param func The inputted function.
      * @param requireCurrPoint Indicates whether the current selected point is needed.
      */
-     applyFunction = (func: (doc: Doc, ink: InkData, ptsXscale: number, ptsYscale: number) => { X: number, Y: number }[] | undefined, requireCurrPoint: boolean = false) => {
+    applyFunction = (func: (doc: Doc, ink: InkData, ptsXscale: number, ptsYscale: number) => { X: number, Y: number }[] | undefined, requireCurrPoint: boolean = false) => {
         var appliedFunc = false;
         this.selectedInk?.forEach(action(inkView => {
             if (this.selectedInk?.length === 1 && (!requireCurrPoint || this._currentPoint !== -1)) {
@@ -91,16 +91,16 @@ export class InkStrokeProperties {
                     });
                 }
             }
-            if (end === 0) end = points.length-1;
+            if (end === 0) end = points.length - 1;
             // Index of new control point with regards to the ink data.
             const newIndex = Math.floor(counter / 2) * 4 + 2;
             // Creating new ink data with the new control point and handle points inputted.
             for (let i = 0; i < ink.length; i++) {
-                if (i === newIndex) { 
-                    const [handleA, handleB] = this.getNewHandlePoints(points.slice(start, index+1), points.slice(index, end), newControl);
+                if (i === newIndex) {
+                    const [handleA, handleB] = this.getNewHandlePoints(points.slice(start, index + 1), points.slice(index, end), newControl);
                     newPoints.push(handleA, newControl, newControl, handleB);
                     // Adjusting the magnitude of the left handle line of the right neighboring control point.
-                    const [rightControl, rightHandle]  = [points[end], ink[i]];
+                    const [rightControl, rightHandle] = [points[end], ink[i]];
                     const scaledVector = this.getScaledHandlePoint(false, start, end, index, rightControl, rightHandle);
                     rightHandle && newPoints.push({ X: rightControl.X - scaledVector.X, Y: rightControl.Y - scaledVector.Y });
                 } else if (i === newIndex - 1) {
@@ -111,14 +111,14 @@ export class InkStrokeProperties {
                 } else {
                     ink[i] && newPoints.push({ X: ink[i].X, Y: ink[i].Y });
                 }
-                
+
             }
             let brokenIndices = Cast(doc.brokenInkIndices, listSpec("number"));
             // Updating the indices of the control points whose handle tangency has been broken.
             if (brokenIndices) {
-                brokenIndices = new List(brokenIndices.map((control) => { 
+                brokenIndices = new List(brokenIndices.map((control) => {
                     if (control >= newIndex) {
-                        return control + 4; 
+                        return control + 4;
                     } else {
                         return control;
                     }
@@ -158,7 +158,7 @@ export class InkStrokeProperties {
     getNewHandlePoints = (C: PointData[], D: PointData[], newControl: PointData) => {
         const [m, n] = [C.length, D.length];
         let handleSizeA = Math.sqrt((Math.pow(newControl.X - C[0].X, 2)) + (Math.pow(newControl.Y - C[0].Y, 2)));
-        let handleSizeB = Math.sqrt((Math.pow(D[n-1].X - newControl.X, 2)) + (Math.pow(D[n-1].Y - newControl.Y, 2)));
+        let handleSizeB = Math.sqrt((Math.pow(D[n - 1].X - newControl.X, 2)) + (Math.pow(D[n - 1].Y - newControl.Y, 2)));
         // Scaling adjustments to improve the ratio between the magnitudes of the two handle lines.
         // (Ensures that the new point added doesn't augment the inital shape of the curve much).
         if (handleSizeA < 75 && handleSizeB < 75) {
@@ -173,7 +173,7 @@ export class InkStrokeProperties {
             handleSizeB *= 2;
         }
         // Finding the last leg of the derivative curve of C.
-        const dC = { X: (handleSizeA / n) * (C[m-1].X - C[m-2].X), Y: (handleSizeA / n) * (C[m-1].Y - C[m-2].Y) };
+        const dC = { X: (handleSizeA / n) * (C[m - 1].X - C[m - 2].X), Y: (handleSizeA / n) * (C[m - 1].Y - C[m - 2].Y) };
         // Finding the first leg of the derivative curve of D. 
         const dD = { X: (handleSizeB / m) * (D[1].X - D[0].X), Y: (handleSizeB / m) * (D[1].Y - D[0].Y) };
         const handleA = { X: newControl.X - dC.X, Y: newControl.Y - dC.Y };
@@ -259,13 +259,17 @@ export class InkStrokeProperties {
 
     snapHandleTangent = (controlIndex: number, handleIndexA: number, handleIndexB: number) => {
         this.applyFunction((doc: Doc, ink: InkData) => {
-            // doc.brokenIndices.splice(this._brokenIndices.indexOf(controlIndex), 1);
-            const [controlPoint, handleA, handleB] = [ink[controlIndex], ink[handleIndexA], ink[handleIndexB]];
-            const oppositeHandleA = this.rotatePoint(handleA, controlPoint, Math.PI);
-            const angleDifference = this.angleChange(handleB, oppositeHandleA, controlPoint);
-            const newHandleB = this.rotatePoint(handleB, controlPoint, angleDifference);
-            ink[handleIndexB] = newHandleB;
-            return ink;
+            const brokenIndices = Cast(doc.brokenInkIndices, listSpec("number"));
+            if (brokenIndices) {
+                brokenIndices.splice(brokenIndices.indexOf(controlIndex), 1);
+                doc.brokenInkIndices = brokenIndices;
+                const [controlPoint, handleA, handleB] = [ink[controlIndex], ink[handleIndexA], ink[handleIndexB]];
+                const oppositeHandleA = this.rotatePoint(handleA, controlPoint, Math.PI);
+                const angleDifference = this.angleChange(handleB, oppositeHandleA, controlPoint);
+                const newHandleB = this.rotatePoint(handleB, controlPoint, angleDifference);
+                ink[handleIndexB] = newHandleB;
+                return ink;
+            }
         });
     }