Changed ProofNode.appliedRule to enum

src/Proof/ProofHistory.ts

@@ -7,6 +7,7 @@
 
 import {ProofNode} from "./ProofNode";
 import {redrawProof} from "../SharedToolUtils/DrawUtils";
+import {ProofModeMove} from "./ProofModeMove";
 import {TreeContext} from "../TreeContext";
 
 /**
@@ -36,20 +37,43 @@ export function appendStep(newStep: ProofNode, step?: number): void {
 
     //Determines which type of step was taken to give the created button a corresponding icon.
     const icon = document.createElement("Text");
-    icon.className =
-        "fa fa-" +
-        {
-            "Single Move": "mouse-pointer",
-            "Multi Move": "arrows",
-            Resize: "arrows-alt",
-            "DC Insert": "dot-circle-o",
-            "DC Delete": "times-circle",
-            Insertion: "plus",
-            Erasure: "trash",
-            Iteration: "expand",
-            Deiteration: "compress",
-            Pasted: "files-o",
-        }[newStep.appliedRule];
+
+    let iconString = "";
+
+    switch (newStep.appliedRule) {
+        case ProofModeMove.DC_INSERT:
+            iconString = "dot-circle-o";
+            break;
+        case ProofModeMove.DC_DELETE:
+            iconString = "times-circle";
+            break;
+        case ProofModeMove.MOVE_SINGLE:
+            iconString = "mouse-pointer";
+            break;
+        case ProofModeMove.MOVE_MULTI:
+            iconString = "arrows";
+            break;
+        case ProofModeMove.ITERATION:
+            iconString = "expand";
+            break;
+        case ProofModeMove.DEITERATION:
+            iconString = "compress";
+            break;
+        case ProofModeMove.INSERTION:
+            iconString = "plus";
+            break;
+        case ProofModeMove.ERASURE:
+            iconString = "trash";
+            break;
+        case ProofModeMove.RESIZE:
+            iconString = "arrows-alt";
+            break;
+        case ProofModeMove.PASTE_GRAPH:
+            iconString = "files-o";
+            break;
+    }
+
+    icon.className = "fa fa-" + iconString;
 
     button.appendChild(icon);
     newDiv.appendChild(button);

src/Proof/ProofModeMove.ts

@@ -0,0 +1,19 @@
+/**
+ * @file Contains the enum for applied moves in Proof Mode.
+ *
+ * @author Ryan R
+ */
+
+export enum ProofModeMove {
+    CLEAR,
+    DC_INSERT,
+    DC_DELETE,
+    MOVE_SINGLE,
+    MOVE_MULTI,
+    ITERATION,
+    DEITERATION,
+    INSERTION,
+    ERASURE,
+    RESIZE,
+    PASTE_GRAPH,
+}

src/Proof/ProofNode.ts

@@ -5,6 +5,7 @@
  */
 
 import {AEGTree} from "../AEG/AEGTree";
+import {ProofModeMove} from "./ProofModeMove";
 import {TreeContext} from "../TreeContext";
 
 /**
@@ -18,9 +19,8 @@ export class ProofNode {
 
     /**
      * Inference rule applied in this ProofNode.
-     * @todo Make this an enum. -James
      */
-    public appliedRule: string;
+    public appliedRule: ProofModeMove;
 
     /**
      * Index of this ProofNode in treeContext.ts' proof array.
@@ -36,8 +36,8 @@ export class ProofNode {
      * @param rule Inference rule applied.
      * If not passed in, appliedRule will be set as an empty string.
      */
-    public constructor(tree?: AEGTree, rule?: string) {
-        this.appliedRule = rule ?? "";
+    public constructor(tree?: AEGTree, rule?: ProofModeMove) {
+        this.appliedRule = rule ?? ProofModeMove.CLEAR;
         this.tree = new AEGTree(tree?.sheet);
         this.index = TreeContext.proof.length;
     }

src/ProofTools/DeiterationTool.ts

@@ -13,6 +13,7 @@ import {highlightNode, redrawProof, redrawTree} from "../SharedToolUtils/DrawUti
 import {illegalColor} from "../Themes";
 import {offset} from "../SharedToolUtils/DragTool";
 import {Point} from "../AEG/Point";
+import {ProofModeMove} from "../Proof/ProofModeMove";
 import {ProofNode} from "../Proof/ProofNode";
 import {reInsertNode} from "../SharedToolUtils/EditModeUtils";
 import {TreeContext} from "../TreeContext";
@@ -81,7 +82,7 @@ export function deiterationMouseUp(event: MouseEvent): void {
             if (currentParent instanceof CutNode) {
                 currentParent.remove(currentPoint);
             }
-            TreeContext.pushToProof(new ProofNode(currentProofTree, "Deiteration"));
+            TreeContext.pushToProof(new ProofNode(currentProofTree, ProofModeMove.DEITERATION));
         }
     }
     legalNode = false;

src/ProofTools/DoubleCutDeletionTool.ts

@@ -13,6 +13,7 @@ import {getCurrentProofTree} from "./ProofToolUtils";
 import {illegalColor} from "../Themes";
 import {offset} from "../SharedToolUtils/DragTool";
 import {Point} from "../AEG/Point";
+import {ProofModeMove} from "../Proof/ProofModeMove";
 import {ProofNode} from "../Proof/ProofNode";
 import {readdChildren, reInsertNode} from "../SharedToolUtils/EditModeUtils";
 import {TreeContext} from "../TreeContext";
@@ -75,7 +76,7 @@ export function doubleCutDeletionMouseMove(event: MouseEvent): void {
  * @param event Incoming MouseEvent.
  */
 export function doubleCutDeletionMouseUp(event: MouseEvent): void {
-    const nextProof = new ProofNode(currentProofTree, "DC Delete");
+    const nextProof = new ProofNode(currentProofTree, ProofModeMove.DC_DELETE);
     currentPoint = new Point(event.x - offset.x, event.y - offset.y);
 
     if (legalNode && currentNode instanceof CutNode) {

src/ProofTools/DoubleCutInsertionTool.ts

@@ -21,6 +21,7 @@ import {getCurrentProofTree} from "./ProofToolUtils";
 import {illegalColor, legalColor} from "../Themes";
 import {offset} from "../SharedToolUtils/DragTool";
 import {Point} from "../AEG/Point";
+import {ProofModeMove} from "../Proof/ProofModeMove";
 import {ProofNode} from "../Proof/ProofNode";
 import {TreeContext} from "../TreeContext";
 
@@ -108,7 +109,7 @@ export function doubleCutInsertionMouseUp(event: MouseEvent): void {
     const largeCut: CutNode = new CutNode(createEllipse(startingPoint, currentPoint));
     const smallCut: CutNode = new CutNode(calcSmallEllipse(<Ellipse>largeCut.ellipse));
 
-    const nextProof = new ProofNode(currentProofTree, "DC Insert");
+    const nextProof = new ProofNode(currentProofTree, ProofModeMove.DC_INSERT);
 
     if (!wasOut && largeCut.ellipse !== null && smallCut.ellipse !== null) {
         const legal =

src/ProofTools/ErasureTool.ts

@@ -14,6 +14,7 @@ import {highlightNode, redrawProof, redrawTree} from "../SharedToolUtils/DrawUti
 import {illegalColor} from "../Themes";
 import {offset} from "../SharedToolUtils/DragTool";
 import {Point} from "../AEG/Point";
+import {ProofModeMove} from "../Proof/ProofModeMove";
 import {ProofNode} from "../Proof/ProofNode";
 import {reInsertNode} from "../SharedToolUtils/EditModeUtils";
 import {TreeContext} from "../TreeContext";
@@ -75,7 +76,7 @@ export function erasureMouseMove(event: MouseEvent): void {
  */
 export function erasureMouseUp(event: MouseEvent): void {
     if (legalNode) {
-        const nextProof = new ProofNode(currentProofTree, "Erasure");
+        const nextProof = new ProofNode(currentProofTree, ProofModeMove.ERASURE);
 
         currentPoint = new Point(event.x - offset.x, event.y - offset.y);
         const currentParent = nextProof.tree.getLowestParent(currentPoint);

src/ProofTools/InsertionTool.ts

@@ -18,6 +18,7 @@ import {getCurrentProofTree} from "./ProofToolUtils";
 import {illegalColor, legalColor} from "../Themes";
 import {offset} from "../SharedToolUtils/DragTool";
 import {Point} from "../AEG/Point";
+import {ProofModeMove} from "../Proof/ProofModeMove";
 import {ProofNode} from "../Proof/ProofNode";
 import {TreeContext} from "../TreeContext";
 
@@ -244,7 +245,7 @@ export function insertionMouseUp(event: MouseEvent): void {
                 ) as AtomNode;
                 currentTree.insert(tempAtom);
             }
-            TreeContext.pushToProof(new ProofNode(currentTree, "Insertion"));
+            TreeContext.pushToProof(new ProofNode(currentTree, ProofModeMove.INSERTION));
         }
     }
     redrawProof();

src/ProofTools/IterationTool.ts

@@ -23,6 +23,7 @@ import {getCurrentProofTree} from "./ProofToolUtils";
 import {illegalColor, legalColor} from "../Themes";
 import {offset} from "../SharedToolUtils/DragTool";
 import {Point} from "../AEG/Point";
+import {ProofModeMove} from "../Proof/ProofModeMove";
 import {ProofNode} from "../Proof/ProofNode";
 import {TreeContext} from "../TreeContext";
 
@@ -111,7 +112,7 @@ export function iterationMouseUp(event: MouseEvent): void {
                 const tempAtom: AtomNode = EditModeUtils.alterAtom(currentNode, moveDifference);
                 currentProofTree.insert(tempAtom);
             }
-            TreeContext.pushToProof(new ProofNode(currentProofTree, "Iteration"));
+            TreeContext.pushToProof(new ProofNode(currentProofTree, ProofModeMove.ITERATION));
         }
     }
     redrawProof();

src/ProofTools/PasteInProof.ts

@@ -8,6 +8,7 @@ import {AEGTree} from "../AEG/AEGTree";
 import {changeCursorStyle, redrawProof} from "../SharedToolUtils/DrawUtils";
 import {CutNode} from "../AEG/CutNode";
 import {getCurrentProofTree} from "./ProofToolUtils";
+import {ProofModeMove} from "../Proof/ProofModeMove";
 import {ProofNode} from "../Proof/ProofNode";
 import {TreeContext} from "../TreeContext";
 
@@ -53,7 +54,7 @@ export function pasteInProofMouseUp(): void {
     if (legalNode) {
         changeCursorStyle("cursor: default");
         currentTree.sheet = currentGraph;
-        TreeContext.pushToProof(new ProofNode(currentTree, "Pasted"));
+        TreeContext.pushToProof(new ProofNode(currentTree, ProofModeMove.PASTE_GRAPH));
     }
     legalNode = false;
     redrawProof();

src/ProofTools/ProofMoveMultiTool.ts

@@ -22,6 +22,7 @@ import {getCurrentProofTree, isMoveLegal} from "./ProofToolUtils";
 import {illegalColor, legalColor} from "../Themes";
 import {offset} from "../SharedToolUtils/DragTool";
 import {Point} from "../AEG/Point";
+import {ProofModeMove} from "../Proof/ProofModeMove";
 import {ProofNode} from "../Proof/ProofNode";
 import {TreeContext} from "../TreeContext";
 
@@ -111,7 +112,7 @@ export function proofMoveMultiMouseMove(event: MouseEvent): void {
 export function proofMoveMultiMouseUp(event: MouseEvent): void {
     if (legalNode) {
         changeCursorStyle("cursor: default");
-        const nextStep = new ProofNode(currentProofTree, "Multi Move");
+        const nextStep = new ProofNode(currentProofTree, ProofModeMove.MOVE_MULTI);
         const moveDifference: Point = new Point(
             event.x - startingPoint.x,
             event.y - startingPoint.y

src/ProofTools/ProofMoveSingleTool.ts

@@ -28,6 +28,7 @@ import {getCurrentProofTree, isMoveLegal} from "./ProofToolUtils";
 import {illegalColor, legalColor} from "../Themes";
 import {offset} from "../SharedToolUtils/DragTool";
 import {Point} from "../AEG/Point";
+import {ProofModeMove} from "../Proof/ProofModeMove";
 import {ProofNode} from "../Proof/ProofNode";
 import {TreeContext} from "../TreeContext";
 
@@ -120,7 +121,7 @@ export function proofMoveSingleMouseMove(event: MouseEvent): void {
 export function proofMoveSingleMouseUp(event: MouseEvent): void {
     if (legalNode) {
         changeCursorStyle("cursor: default");
-        const nextStep = new ProofNode(currentProofTree, "Single Move");
+        const nextStep = new ProofNode(currentProofTree, ProofModeMove.MOVE_SINGLE);
         const moveDifference: Point = new Point(
             event.x - startingPoint.x,
             event.y - startingPoint.y

src/ProofTools/ProofResizeTool.ts

@@ -27,6 +27,7 @@ import {getCurrentProofTree, proofCanInsert} from "./ProofToolUtils";
 import {illegalColor, legalColor} from "../Themes";
 import {offset} from "../SharedToolUtils/DragTool";
 import {Point} from "../AEG/Point";
+import {ProofModeMove} from "../Proof/ProofModeMove";
 import {ProofNode} from "../Proof/ProofNode";
 import {TreeContext} from "../TreeContext";
 
@@ -122,7 +123,7 @@ export function proofResizeMouseUp(event: MouseEvent): void {
             if (tempCut.ellipse !== null) {
                 if (isValid(tempCut)) {
                     currentProofTree.insert(tempCut);
-                    TreeContext.pushToProof(new ProofNode(currentProofTree, "Resize"));
+                    TreeContext.pushToProof(new ProofNode(currentProofTree, ProofModeMove.RESIZE));
                 }
             }
         }

src/TreeContext.ts

@@ -5,9 +5,10 @@
  */
 
 import {AEGTree} from "./AEG/AEGTree";
-import {DrawModeStack} from "./History/DrawModeStack";
-import {DrawModeNode} from "./History/DrawModeNode";
 import {appendStep, deleteButtons} from "./Proof/ProofHistory";
+import {DrawModeNode} from "./History/DrawModeNode";
+import {DrawModeStack} from "./History/DrawModeStack";
+import {ProofModeMove} from "./Proof/ProofModeMove";
 import {ProofNode} from "./Proof/ProofNode";
 
 /**
@@ -91,7 +92,7 @@ export class TreeContext {
      * @param newStep Incoming ProofNode.
      */
     public static pushToProof(newStep: ProofNode): void {
-        if (newStep.appliedRule === "Pasted") {
+        if (newStep.appliedRule === ProofModeMove.PASTE_GRAPH) {
             this.proof.pop();
             document.getElementById("Row: 1")?.remove();
             newStep.index = 0;