Merge branch 'master' of https://github.com/kennidenni/INF219

Kenneth Apeland · Kenneth Apeland · commit 651d66344850 · 2018-03-20T11:09:49.000+01:00
diff --git a/Heap/js/Controller.js b/Heap/js/Controller.js
@@ -38,6 +38,9 @@ var Controller = /** @class */ (function () {
     Controller.prototype.getAlgorithm = function () {
         return this.algorithm;
     };
+    Controller.prototype.lockScreen = function (b) {
+        viewer.screenLockThis(b);
+    };
     /**
      * Remove the maximum/minimum element
      */
diff --git a/Heap/js/Controller.ts b/Heap/js/Controller.ts
@@ -49,6 +49,10 @@ class Controller {
         return this.algorithm;
     }
 
+    lockScreen(b: boolean) {
+        viewer.screenLockThis(b);
+    }
+
     /**
      * Remove the maximum/minimum element
      */
diff --git a/Heap/js/HeapSort.js b/Heap/js/HeapSort.js
@@ -30,8 +30,11 @@ var HeapSort = /** @class */ (function (_super) {
     HeapSort.prototype.remove = function () {
         // Remove root element, set last element to root and start frontendevents
         this.currIndex--;
+        control.setSelectedIndex(0, true);
+        control.highlightNode(0, "orange");
         control.highlightSortElem(this.sortIndex, "orange");
         control.setValueAtSortIndex(this.sortIndex, this.array[0]);
+        control.setSelectedIndex(0, false);
         this.exch(0, this.currIndex);
         control.swapNode(this.currIndex, 0);
         control.removeElem(this.currIndex, false);
diff --git a/Heap/js/HeapSort.ts b/Heap/js/HeapSort.ts
@@ -23,9 +23,12 @@ class HeapSort extends MaxHeap {
 
     remove(): void {
         // Remove root element, set last element to root and start frontendevents
-        this.currIndex--;
+        this.currIndex--
+        control.setSelectedIndex(0, true);
+        control.highlightNode(0, "orange");
         control.highlightSortElem(this.sortIndex, "orange");
         control.setValueAtSortIndex(this.sortIndex, this.array[0]);
+        control.setSelectedIndex(0, false);
         this.exch(0, this.currIndex);
         control.swapNode(this.currIndex, 0);
         control.removeElem(this.currIndex, false);
diff --git a/Heap/js/MaxHeap.js b/Heap/js/MaxHeap.js
@@ -94,21 +94,25 @@ var MaxHeap = /** @class */ (function () {
     };
     MaxHeap.prototype.add = function (a) {
         // Add to array and start frontendevents
+        control.lockScreen(true);
         this.array.push(a);
         insertNewElem(this.array.length - 1, a); // Create element in frontendarray
         insertNewElemConnect(this.array.length - 1, Math.floor((this.array.length - 2) / 2));
         control.saveState(this.array); // Save the new state
         // Swim to te correct index and start frontendevents
         this.swim(this.array.length - 1);
+        control.lockScreen(false);
     };
     MaxHeap.prototype.remove = function () {
+        control.lockScreen(true);
         // Remove root element, set last element to root and start frontendevents
         this.exch(0, this.array.length - 1);
         control.swapNode(this.array.length - 1, 0);
         control.removeElem(this.array.length - 1, true);
         this.array.pop();
         control.saveState(this.array);
         this.sink(0, this.array.length - 1);
+        control.lockScreen(false);
     };
     MaxHeap.prototype.sink = function (index, length) {
         var left = index * 2 + 1;
diff --git a/Heap/js/MaxHeap.ts b/Heap/js/MaxHeap.ts
@@ -114,23 +114,27 @@ class MaxHeap implements IAlgorithm {
 
     add(a: number): void {
         // Add to array and start frontendevents
+        control.lockScreen(true)
         this.array.push(a);
         insertNewElem(this.array.length - 1, a); // Create element in frontendarray
         insertNewElemConnect(this.array.length - 1, Math.floor((this.array.length - 2) / 2));
         control.saveState(this.array); // Save the new state
 
         // Swim to te correct index and start frontendevents
         this.swim(this.array.length - 1);
+        control.lockScreen(false);
     }
 
     remove(): void {
+        control.lockScreen(true);
         // Remove root element, set last element to root and start frontendevents
         this.exch(0, this.array.length - 1);
         control.swapNode(this.array.length - 1, 0);
         control.removeElem(this.array.length - 1, true);
         this.array.pop();
         control.saveState(this.array);
         this.sink(0, this.array.length - 1);
+        control.lockScreen(false);
     }
 
     protected sink(index: number, length: number): void {
diff --git a/Heap/js/View.js b/Heap/js/View.js
@@ -149,6 +149,10 @@ var View = /** @class */ (function () {
     };
     View.prototype.resetAll = function () {
         this.paused = false;
+        manager.pause();
+        manager.nextEvents = new Array;
+        manager.previousEvents = new Array;
+        screenLock(false);
         var arr = [1, 2, 3, 4, 5, 6, 7, 8, 9];
         stepper = new StateController(control, this);
         this.resetArray(arr);
@@ -174,12 +178,22 @@ var View = /** @class */ (function () {
     };
     View.prototype.setSlow = function () {
         this.animSpeed = 250;
+        manager.delayTime = 900;
+        this.restartManager();
     };
     View.prototype.setMedium = function () {
-        this.animSpeed = 500;
+        this.animSpeed = 600;
+        manager.delayTime = 600;
+        this.restartManager();
     };
     View.prototype.setFast = function () {
-        this.animSpeed = 750;
+        this.animSpeed = 300;
+        manager.delayTime = 300;
+        this.restartManager();
+    };
+    View.prototype.restartManager = function () {
+        manager.pause();
+        manager.start();
     };
     View.prototype.switchAlgorithm = function (algo) {
         $("#sortArray").hide();
@@ -198,12 +212,14 @@ var View = /** @class */ (function () {
             case "BuildHeap": {
                 this.resetAll();
                 control.initController(new BuildHeap(10));
+                screenLock(true);
                 break;
             }
             case "HeapSort": {
                 this.resetAll();
                 $("#sortArray").show();
                 control.initController(new HeapSort(10));
+                screenLock(true);
                 break;
             }
             default: {
diff --git a/Heap/js/View.ts b/Heap/js/View.ts
@@ -187,6 +187,10 @@ class View implements IView {
 
     resetAll() {
         this.paused = false;
+        manager.pause();
+        manager.nextEvents = new Array;
+        manager.previousEvents = new Array;
+        screenLock(false);
         let arr: number[] = [1, 2, 3, 4, 5, 6, 7, 8, 9];
         stepper = new StateController(control, this);
         this.resetArray(arr);
@@ -215,14 +219,25 @@ class View implements IView {
 
     setSlow() {
         this.animSpeed = 250;
+        manager.delayTime = 900;
+        this.restartManager();
     }
 
     setMedium() {
-        this.animSpeed = 500;
+        this.animSpeed = 600;
+        manager.delayTime = 600;
+        this.restartManager();
     }
 
     setFast() {
-        this.animSpeed = 750;
+        this.animSpeed = 300;
+        manager.delayTime = 300;
+        this.restartManager();
+    }
+
+    restartManager() {
+        manager.pause();
+        manager.start();
     }
 
     switchAlgorithm(algo: string) {
@@ -242,12 +257,14 @@ class View implements IView {
             case "BuildHeap": {
                 this.resetAll();
                 control.initController(new BuildHeap(10));
+                screenLock(true);
                 break;
             }
             case "HeapSort": {
                 this.resetAll();
                 $("#sortArray").show();
                 control.initController(new HeapSort(10));
+                screenLock(true);
                 break;
             }
             default: {
diff --git a/Heap/js/drawHeap.js b/Heap/js/drawHeap.js
diff --git a/Heap/js/drawHeap.ts b/Heap/js/drawHeap.ts
diff --git a/Heap/js/methods.js b/Heap/js/methods.js
@@ -27,10 +27,20 @@ function setOnClickListener() {
             for (var i = 0; i < id.length; i++)
                 if (!isNaN(parseInt(id[i])))
                     idInt += id[i];
+            if (isHighlighted(parseInt(idInt))) {
+                deselectArrayElemSelections();
+                deselectNodeSelections();
+                return;
+            }
             selectElement(parseInt(idInt));
         });
     });
 }
+function isHighlighted(id) {
+    if ($("#arrayElem" + id).hasClass("selected"))
+        return true;
+    return false;
+}
 setOnClickListener();
 function setKeyListener() {
     this.addEventListener("keyup", function (e) {
@@ -79,6 +89,8 @@ function selectElement(index) {
             for (var i = 0; i < highlightChildren.length; i++) {
                 highlightNode(highlightChildren[i].id, "green");
             }
+            selectIndex(index * 2 + 1, true);
+            selectIndex(index * 2 + 2, true);
         }
     }
     var $method = $('input[name=method]:checked', '#method');
@@ -370,14 +382,12 @@ function setWrongMark(check, indexA, indexB) {
 function screenLock(lock) {
     locked = lock;
     if (lock) {
-        $("#algorithm input:radio , #method input:radio").each(function () {
-            $(this).attr({ disabled: "true" });
-        });
+        $("#addElem").attr({ "disabled": "true" });
+        $("#removeElem").attr({ "disabled": "true" });
     }
     else {
-        $("#algorithm input , #method input:radio").each(function () {
-            $(this).removeAttr('disabled');
-        });
+        $("#addElem").removeAttr("disabled");
+        $("#removeElem").removeAttr("disabled");
     }
 }
 function stepBack() {
@@ -423,7 +433,8 @@ function setUpAddButton() {
     $("#addElem").click(function () {
         var val = prompt("Which value do you want to add? Integer >= 0");
         while (isNaN(parseInt(val))) {
-            val = prompt("Which value do you want to add? Integer >= 0");
+            //val = prompt("Which value do you want to add? Integer >= 0");
+            return;
         }
         viewer.addNode(parseInt(val));
     });
diff --git a/Heap/js/methods.ts b/Heap/js/methods.ts
@@ -29,11 +29,22 @@ function setOnClickListener() {
             for (let i = 0; i < id.length; i++)
                 if (!isNaN(parseInt(id[i])))
                     idInt += id[i];
+            if (isHighlighted(parseInt(idInt))) {
+                deselectArrayElemSelections();
+                deselectNodeSelections();
+                return;
+            }
             selectElement(parseInt(idInt));
         });
     });
 }
 
+function isHighlighted(id: number): boolean {
+    if ($("#arrayElem" + id).hasClass("selected"))
+        return true;
+    return false;
+}
+
 setOnClickListener();
 
 function setKeyListener() {
@@ -90,12 +101,14 @@ function selectElement(index: number) {
     else {
         selectIndex(index, true);
         //Children to the highlighted node
-        let highlightChildren : GraphNode[] = allNodes[index].children;
+        let highlightChildren: GraphNode[] = allNodes[index].children;
         console.log(highlightChildren);
         if (highlightChildren.length > 0) {
             for (var i = 0; i < highlightChildren.length; i++) {
                 highlightNode(highlightChildren[i].id, "green");
             }
+            selectIndex(index * 2 + 1, true);
+            selectIndex(index * 2 + 2, true);
         }
     }
 
@@ -299,8 +312,8 @@ function selectIndex(index: number, select: boolean) {
 
 function deselectNodeIndex(index: number) {
     $("#node" + index).each(function () {
-            $(this).removeClass("selected");
-            $(this).removeClass("green");
+        $(this).removeClass("selected");
+        $(this).removeClass("green");
     });
 }
 
@@ -425,13 +438,12 @@ function setWrongMark(check: boolean, indexA: number, indexB: number) {
 function screenLock(lock: boolean) {
     locked = lock;
     if (lock) {
-        $("#algorithm input:radio , #method input:radio").each(function () {
-            $(this).attr({disabled: "true"})
-        });
+        $("#addElem").attr({"disabled": "true"});
+        $("#removeElem").attr({"disabled": "true"});
+
     } else {
-        $("#algorithm input , #method input:radio").each(function () {
-            $(this).removeAttr('disabled');
-        });
+        $("#addElem").removeAttr("disabled");
+        $("#removeElem").removeAttr("disabled");
     }
 }
 
@@ -485,7 +497,8 @@ function setUpAddButton() {
     $("#addElem").click(function () {
         let val = prompt("Which value do you want to add? Integer >= 0");
         while (isNaN(parseInt(val))) {
-            val = prompt("Which value do you want to add? Integer >= 0");
+            //val = prompt("Which value do you want to add? Integer >= 0");
+            return;
         }
         viewer.addNode(parseInt(val));
     });
