Skip to content

Commit 97e02d3

Browse files
author
Ryan Reilly
committed
These too
1 parent 85b5243 commit 97e02d3

26 files changed

+69
-75
lines changed

‎src/AEG-IO.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ import {AtomNode} from "./AEG/AtomNode";
99
import {CutNode} from "./AEG/CutNode";
1010
import {Ellipse} from "./AEG/Ellipse";
1111
import {Point} from "./AEG/Point";
12-
import {ProofModeMove} from "./ProofHistory/ProofModeMove";
13-
import {ProofModeNode} from "./ProofHistory/ProofModeNode";
12+
import {ProofModeMove, ProofModeNode} from "./ProofHistory/ProofModeNode";
1413

1514
/**
1615
* Describes The Sheet of Assertion in JSON files.

‎src/DrawHistory/DrawModeNode.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,25 @@
11
/**
22
* @file Contains the DrawModeNode class, which defines a step taken in Draw Mode.
3+
* Also contains the DrawModeMove enum.
34
*
45
* @author Ryan R
56
*/
67

78
import {AEGTree} from "../AEG/AEGTree";
8-
import {DrawModeMove} from "./DrawModeMove";
9+
10+
export enum DrawModeMove {
11+
CLEAR,
12+
DRAW_ATOM,
13+
DRAW_CUT,
14+
MOVE_SINGLE,
15+
MOVE_MULTI,
16+
COPY_SINGLE,
17+
COPY_MULTI,
18+
DELETE_SINGLE,
19+
DELETE_MULTI,
20+
RESIZE,
21+
COPY_GRAPH,
22+
}
923

1024
export class DrawModeNode {
1125
public tree: AEGTree;

‎src/DrawTools/AtomTool.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import {AtomNode} from "../AEG/AtomNode";
1313
import {changeCursorStyle} from "../SharedToolUtils/DrawUtils";
1414
import {drawAtom} from "../SharedToolUtils/DrawUtils";
15-
import {DrawModeMove} from "../DrawHistory/DrawModeMove";
15+
import {DrawModeMove} from "../DrawHistory/DrawModeNode";
1616
import {illegalColor, legalColor} from "../Themes";
1717
import {offset} from "../SharedToolUtils/DragTool";
1818
import {Point} from "../AEG/Point";

‎src/DrawTools/CopyFromDraw.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {AtomNode} from "../AEG/AtomNode";
1010
import {changeCursorStyle} from "../SharedToolUtils/DrawUtils";
1111
import {cleanCanvas, highlightNode, redrawTree} from "../SharedToolUtils/DrawUtils";
1212
import {CutNode} from "../AEG/CutNode";
13-
import {DrawModeMove} from "../DrawHistory/DrawModeMove";
13+
import {DrawModeMove} from "../DrawHistory/DrawModeNode";
1414
import {legalColor} from "../Themes";
1515
import {offset} from "../SharedToolUtils/DragTool";
1616
import {Point} from "../AEG/Point";

‎src/DrawTools/CopyMultiTool.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {AtomNode} from "../AEG/AtomNode";
1313
import {changeCursorStyle, determineAndChangeCursorStyle} from "../SharedToolUtils/DrawUtils";
1414
import {CutNode} from "../AEG/CutNode";
1515
import {drawAtom, redrawTree} from "../SharedToolUtils/DrawUtils";
16-
import {DrawModeMove} from "../DrawHistory/DrawModeMove";
16+
import {DrawModeMove} from "../DrawHistory/DrawModeNode";
1717
import {illegalColor, legalColor} from "../Themes";
1818
import {offset} from "../SharedToolUtils/DragTool";
1919
import {Point} from "../AEG/Point";

‎src/DrawTools/CopySingleTool.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {AtomNode} from "../AEG/AtomNode";
1313
import {changeCursorStyle, determineAndChangeCursorStyle} from "../SharedToolUtils/DrawUtils";
1414
import {CutNode} from "../AEG/CutNode";
1515
import {drawAtom, drawCut, redrawTree} from "../SharedToolUtils/DrawUtils";
16-
import {DrawModeMove} from "../DrawHistory/DrawModeMove";
16+
import {DrawModeMove} from "../DrawHistory/DrawModeNode";
1717
import {illegalColor, legalColor} from "../Themes";
1818
import {offset} from "../SharedToolUtils/DragTool";
1919
import {Point} from "../AEG/Point";

‎src/DrawTools/CutTool.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {changeCursorStyle, determineAndChangeCursorStyle} from "../SharedToolUti
1414
import {createEllipse, ellipseLargeEnough} from "../SharedToolUtils/EditModeUtils";
1515
import {CutNode} from "../AEG/CutNode";
1616
import {drawCut, drawGuidelines, redrawTree} from "../SharedToolUtils/DrawUtils";
17-
import {DrawModeMove} from "../DrawHistory/DrawModeMove";
17+
import {DrawModeMove} from "../DrawHistory/DrawModeNode";
1818
import {Ellipse} from "../AEG/Ellipse";
1919
import {illegalColor, legalColor} from "../Themes";
2020
import {offset} from "../SharedToolUtils/DragTool";

‎src/DrawTools/DeleteMultiTool.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
import {AtomNode} from "../AEG/AtomNode";
1212
import {CutNode} from "../AEG/CutNode";
13-
import {DrawModeMove} from "../DrawHistory/DrawModeMove";
13+
import {DrawModeMove} from "../DrawHistory/DrawModeNode";
1414
import {highlightNode, redrawTree} from "../SharedToolUtils/DrawUtils";
1515
import {illegalColor} from "../Themes";
1616
import {offset} from "../SharedToolUtils/DragTool";

‎src/DrawTools/DeleteSingleTool.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import {AtomNode} from "../AEG/AtomNode";
1212
import {CutNode} from "../AEG/CutNode";
1313
import {drawAtom, drawCut, redrawTree} from "../SharedToolUtils/DrawUtils";
14-
import {DrawModeMove} from "../DrawHistory/DrawModeMove";
14+
import {DrawModeMove} from "../DrawHistory/DrawModeNode";
1515
import {illegalColor} from "../Themes";
1616
import {offset} from "../SharedToolUtils/DragTool";
1717
import {Point} from "../AEG/Point";

‎src/DrawTools/DrawClearTool.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import {AEGTree} from "../AEG/AEGTree";
88
import {cleanCanvas, highlightNode, redrawTree} from "../SharedToolUtils/DrawUtils";
9-
import {DrawModeMove} from "../DrawHistory/DrawModeMove";
9+
import {DrawModeMove} from "../DrawHistory/DrawModeNode";
1010
import {illegalColor} from "../Themes";
1111
import {TreeContext} from "../TreeContext";
1212

‎src/DrawTools/DrawMoveMultiTool.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {AtomNode} from "../AEG/AtomNode";
1313
import {changeCursorStyle, determineAndChangeCursorStyle} from "../SharedToolUtils/DrawUtils";
1414
import {CutNode} from "../AEG/CutNode";
1515
import {drawAtom, highlightNode, redrawTree} from "../SharedToolUtils/DrawUtils";
16-
import {DrawModeMove} from "../DrawHistory/DrawModeMove";
16+
import {DrawModeMove} from "../DrawHistory/DrawModeNode";
1717
import {illegalColor, legalColor} from "../Themes";
1818
import {offset} from "../SharedToolUtils/DragTool";
1919
import {Point} from "../AEG/Point";

‎src/DrawTools/DrawMoveSingleTool.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {AtomNode} from "../AEG/AtomNode";
1313
import {changeCursorStyle, determineAndChangeCursorStyle} from "../SharedToolUtils/DrawUtils";
1414
import {CutNode} from "../AEG/CutNode";
1515
import {drawAtom, drawCut, redrawTree} from "../SharedToolUtils/DrawUtils";
16-
import {DrawModeMove} from "../DrawHistory/DrawModeMove";
16+
import {DrawModeMove} from "../DrawHistory/DrawModeNode";
1717
import {illegalColor, legalColor} from "../Themes";
1818
import {offset} from "../SharedToolUtils/DragTool";
1919
import {Point} from "../AEG/Point";

‎src/DrawTools/DrawResizeTool.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {AtomNode} from "../AEG/AtomNode";
1414
import {changeCursorStyle, determineAndChangeCursorStyle} from "../SharedToolUtils/DrawUtils";
1515
import {CutNode} from "../AEG/CutNode";
1616
import {determineDirection, drawCut, redrawTree} from "../SharedToolUtils/DrawUtils";
17-
import {DrawModeMove} from "../DrawHistory/DrawModeMove";
17+
import {DrawModeMove} from "../DrawHistory/DrawModeNode";
1818
import {ellipseLargeEnough, resizeCut} from "../SharedToolUtils/EditModeUtils";
1919
import {illegalColor, legalColor} from "../Themes";
2020
import {offset} from "../SharedToolUtils/DragTool";

‎src/ProofHistory/ProofHistory.ts

Lines changed: 16 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,24 @@
55
* @author Dawn Moore
66
*/
77

8-
import {ProofModeMove} from "./ProofModeMove";
9-
import {ProofModeNode} from "./ProofModeNode";
8+
import {ProofModeMove, ProofModeNode} from "./ProofModeNode";
109
import {redrawProof} from "../SharedToolUtils/DrawUtils";
1110
import {TreeContext} from "../TreeContext";
1211

12+
const proofMoveToIconStringDict: {[key in ProofModeMove]: string} = {
13+
[ProofModeMove.CLEAR]: "",
14+
[ProofModeMove.DC_INSERT]: "dot-circle-o",
15+
[ProofModeMove.DC_DELETE]: "times-circle",
16+
[ProofModeMove.MOVE_SINGLE]: "mouse-pointer",
17+
[ProofModeMove.MOVE_MULTI]: "arrows",
18+
[ProofModeMove.ITERATION]: "expand",
19+
[ProofModeMove.DEITERATION]: "compress",
20+
[ProofModeMove.INSERTION]: "plus",
21+
[ProofModeMove.ERASURE]: "trash",
22+
[ProofModeMove.RESIZE]: "arrows-alt",
23+
[ProofModeMove.PASTE_GRAPH]: "files-o",
24+
};
25+
1326
/**
1427
* Creates a button representing the incoming ProofNode as a step in the proof history
1528
* and allows the user to return to that step.
@@ -38,40 +51,7 @@ export function appendStep(newStep: ProofModeNode, step?: number): void {
3851
//Determines which type of step was taken to give the created button a corresponding icon.
3952
const icon = document.createElement("Text");
4053

41-
let iconString = "";
42-
43-
switch (newStep.appliedRule) {
44-
case ProofModeMove.DC_INSERT:
45-
iconString = "dot-circle-o";
46-
break;
47-
case ProofModeMove.DC_DELETE:
48-
iconString = "times-circle";
49-
break;
50-
case ProofModeMove.MOVE_SINGLE:
51-
iconString = "mouse-pointer";
52-
break;
53-
case ProofModeMove.MOVE_MULTI:
54-
iconString = "arrows";
55-
break;
56-
case ProofModeMove.ITERATION:
57-
iconString = "expand";
58-
break;
59-
case ProofModeMove.DEITERATION:
60-
iconString = "compress";
61-
break;
62-
case ProofModeMove.INSERTION:
63-
iconString = "plus";
64-
break;
65-
case ProofModeMove.ERASURE:
66-
iconString = "trash";
67-
break;
68-
case ProofModeMove.RESIZE:
69-
iconString = "arrows-alt";
70-
break;
71-
case ProofModeMove.PASTE_GRAPH:
72-
iconString = "files-o";
73-
break;
74-
}
54+
const iconString = proofMoveToIconStringDict[newStep.appliedRule];
7555

7656
icon.className = "fa fa-" + iconString;
7757

‎src/ProofHistory/ProofModeNode.ts

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,22 @@
55
*/
66

77
import {AEGTree} from "../AEG/AEGTree";
8-
import {ProofModeMove} from "./ProofModeMove";
98
import {TreeContext} from "../TreeContext";
109

10+
export enum ProofModeMove {
11+
CLEAR,
12+
DC_INSERT,
13+
DC_DELETE,
14+
MOVE_SINGLE,
15+
MOVE_MULTI,
16+
ITERATION,
17+
DEITERATION,
18+
INSERTION,
19+
ERASURE,
20+
RESIZE,
21+
PASTE_GRAPH,
22+
}
23+
1124
/**
1225
* Defines a single step in a proof.
1326
*/

‎src/ProofTools/DeiterationTool.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ import {highlightNode, redrawProof, redrawTree} from "../SharedToolUtils/DrawUti
1313
import {illegalColor} from "../Themes";
1414
import {offset} from "../SharedToolUtils/DragTool";
1515
import {Point} from "../AEG/Point";
16-
import {ProofModeMove} from "../ProofHistory/ProofModeMove";
17-
import {ProofModeNode} from "../ProofHistory/ProofModeNode";
16+
import {ProofModeMove, ProofModeNode} from "../ProofHistory/ProofModeNode";
1817
import {reInsertNode} from "../SharedToolUtils/EditModeUtils";
1918
import {TreeContext} from "../TreeContext";
2019

‎src/ProofTools/DoubleCutDeletionTool.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ import {getCurrentProofTree} from "./ProofToolUtils";
1313
import {illegalColor} from "../Themes";
1414
import {offset} from "../SharedToolUtils/DragTool";
1515
import {Point} from "../AEG/Point";
16-
import {ProofModeMove} from "../ProofHistory/ProofModeMove";
17-
import {ProofModeNode} from "../ProofHistory/ProofModeNode";
16+
import {ProofModeMove, ProofModeNode} from "../ProofHistory/ProofModeNode";
1817
import {readdChildren, reInsertNode} from "../SharedToolUtils/EditModeUtils";
1918
import {TreeContext} from "../TreeContext";
2019

‎src/ProofTools/DoubleCutInsertionTool.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ import {getCurrentProofTree} from "./ProofToolUtils";
2121
import {illegalColor, legalColor} from "../Themes";
2222
import {offset} from "../SharedToolUtils/DragTool";
2323
import {Point} from "../AEG/Point";
24-
import {ProofModeMove} from "../ProofHistory/ProofModeMove";
25-
import {ProofModeNode} from "../ProofHistory/ProofModeNode";
24+
import {ProofModeMove, ProofModeNode} from "../ProofHistory/ProofModeNode";
2625
import {TreeContext} from "../TreeContext";
2726

2827
//Checkbox next to "Show Guidelines:" in Proof Mode's Double Cut Insertion tool.

‎src/ProofTools/ErasureTool.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ import {highlightNode, redrawProof, redrawTree} from "../SharedToolUtils/DrawUti
1414
import {illegalColor} from "../Themes";
1515
import {offset} from "../SharedToolUtils/DragTool";
1616
import {Point} from "../AEG/Point";
17-
import {ProofModeMove} from "../ProofHistory/ProofModeMove";
18-
import {ProofModeNode} from "../ProofHistory/ProofModeNode";
17+
import {ProofModeMove, ProofModeNode} from "../ProofHistory/ProofModeNode";
1918
import {reInsertNode} from "../SharedToolUtils/EditModeUtils";
2019
import {TreeContext} from "../TreeContext";
2120

‎src/ProofTools/InsertionTool.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ import {getCurrentProofTree} from "./ProofToolUtils";
1818
import {illegalColor, legalColor} from "../Themes";
1919
import {offset} from "../SharedToolUtils/DragTool";
2020
import {Point} from "../AEG/Point";
21-
import {ProofModeMove} from "../ProofHistory/ProofModeMove";
22-
import {ProofModeNode} from "../ProofHistory/ProofModeNode";
21+
import {ProofModeMove, ProofModeNode} from "../ProofHistory/ProofModeNode";
2322
import {TreeContext} from "../TreeContext";
2423

2524
//Node in question.

‎src/ProofTools/IterationTool.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ import {getCurrentProofTree} from "./ProofToolUtils";
2323
import {illegalColor, legalColor} from "../Themes";
2424
import {offset} from "../SharedToolUtils/DragTool";
2525
import {Point} from "../AEG/Point";
26-
import {ProofModeMove} from "../ProofHistory/ProofModeMove";
27-
import {ProofModeNode} from "../ProofHistory/ProofModeNode";
26+
import {ProofModeMove, ProofModeNode} from "../ProofHistory/ProofModeNode";
2827
import {TreeContext} from "../TreeContext";
2928

3029
//First Point the user clicks.

‎src/ProofTools/PasteInProof.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ import {AEGTree} from "../AEG/AEGTree";
88
import {changeCursorStyle, redrawProof} from "../SharedToolUtils/DrawUtils";
99
import {CutNode} from "../AEG/CutNode";
1010
import {getCurrentProofTree} from "./ProofToolUtils";
11-
import {ProofModeMove} from "../ProofHistory/ProofModeMove";
12-
import {ProofModeNode} from "../ProofHistory/ProofModeNode";
11+
import {ProofModeMove, ProofModeNode} from "../ProofHistory/ProofModeNode";
1312
import {TreeContext} from "../TreeContext";
1413

1514
//AEG in question.

‎src/ProofTools/ProofMoveMultiTool.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ import {getCurrentProofTree, isMoveLegal} from "./ProofToolUtils";
2222
import {illegalColor, legalColor} from "../Themes";
2323
import {offset} from "../SharedToolUtils/DragTool";
2424
import {Point} from "../AEG/Point";
25-
import {ProofModeMove} from "../ProofHistory/ProofModeMove";
26-
import {ProofModeNode} from "../ProofHistory/ProofModeNode";
25+
import {ProofModeMove, ProofModeNode} from "../ProofHistory/ProofModeNode";
2726
import {TreeContext} from "../TreeContext";
2827

2928
//First Point the user clicks.

‎src/ProofTools/ProofMoveSingleTool.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ import {getCurrentProofTree, isMoveLegal} from "./ProofToolUtils";
2828
import {illegalColor, legalColor} from "../Themes";
2929
import {offset} from "../SharedToolUtils/DragTool";
3030
import {Point} from "../AEG/Point";
31-
import {ProofModeMove} from "../ProofHistory/ProofModeMove";
32-
import {ProofModeNode} from "../ProofHistory/ProofModeNode";
31+
import {ProofModeMove, ProofModeNode} from "../ProofHistory/ProofModeNode";
3332
import {TreeContext} from "../TreeContext";
3433

3534
//First Point the user clicks.

‎src/ProofTools/ProofResizeTool.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ import {getCurrentProofTree, proofCanInsert} from "./ProofToolUtils";
2727
import {illegalColor, legalColor} from "../Themes";
2828
import {offset} from "../SharedToolUtils/DragTool";
2929
import {Point} from "../AEG/Point";
30-
import {ProofModeMove} from "../ProofHistory/ProofModeMove";
31-
import {ProofModeNode} from "../ProofHistory/ProofModeNode";
30+
import {ProofModeMove, ProofModeNode} from "../ProofHistory/ProofModeNode";
3231
import {TreeContext} from "../TreeContext";
3332

3433
//First Point the user clicks.

‎src/TreeContext.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ import {
1111
deleteMostRecentButton,
1212
stepBack,
1313
} from "./ProofHistory/ProofHistory";
14-
import {DrawModeMove} from "./DrawHistory/DrawModeMove";
15-
import {DrawModeNode} from "./DrawHistory/DrawModeNode";
16-
import {ProofModeMove} from "./ProofHistory/ProofModeMove";
17-
import {ProofModeNode} from "./ProofHistory/ProofModeNode";
14+
import {DrawModeMove, DrawModeNode} from "./DrawHistory/DrawModeNode";
15+
import {ProofModeMove, ProofModeNode} from "./ProofHistory/ProofModeNode";
1816
import {redrawProof, redrawTree} from "./SharedToolUtils/DrawUtils";
1917

2018
/**

0 commit comments

Comments
 (0)