Working API

Yomguithereal · Yomguithereal · commit e477669b7098 · 2014-05-21T11:07:30.000+02:00
diff --git a/examples/transferables.html b/examples/transferables.html
@@ -127,7 +127,7 @@
       });
 
       // Start the ForceAtlas2 algorithm:
-      s.testFA2Supervisor();
+      s.startForceAtlas2();
     </script>
   </body>
 </html>
diff --git a/plugins/sigma.layout.forceAtlas2/supervisor.js b/plugins/sigma.layout.forceAtlas2/supervisor.js
@@ -34,6 +34,9 @@
     this.graph = this.sigInst.graph;
     this.ppn = 10;
     this.ppe = 3;
+
+    // State
+    this.started = false;
     this.running = false;
 
     // Web worker or classic DOM events?
@@ -62,17 +65,15 @@
       _this.applyLayoutChanges();
 
       // Send data back to worker and loop
-      _this.sendByteArrayToWorker();
+      if (_this.running)
+        _this.sendByteArrayToWorker();
 
       // Rendering graph
       _this.sigInst.refresh();
     });
 
     // Filling byteArrays
     this.graphToByteArrays();
-
-    // Sending to worker
-    this.sendByteArrayToWorker('start');
   }
 
   Supervisor.prototype.makeBlob = function(workerFn) {
@@ -171,30 +172,72 @@
       window.postMessage(content, '*')
   };
 
+  Supervisor.prototype.start = function() {
+    if (this.running)
+      return;
+
+    this.running = true;
+
+    if (!this.started) {
+
+      // Sending init message to worker
+      this.sendByteArrayToWorker('start');
+      this.started = true;
+    }
+    else {
+      this.sendByteArrayToWorker();
+    }
+  };
+
+  Supervisor.prototype.stop = function() {
+    if (!this.running)
+      return;
+
+    this.running = false;
+  };
+
+  // TODO: kill polyfill when worker is not true worker
+  Supervisor.prototype.killWorker = function() {
+    this.worker.terminate();
+  };
 
   /**
    * Interface
    * ----------
    */
-  var supervisor;
+  var supervisor = null;
 
   sigma.prototype.startForceAtlas2 = function() {
 
     // Create supervisor if undefined
+    if (!supervisor)
+      supervisor = new Supervisor(this);
+
     // Start algorithm
+    supervisor.start();
+
+    return this;
   };
+
   sigma.prototype.stopForceAtlas2 = function() {
 
     // Pause algorithm
+    supervisor.stop();
+
+    return this;
   };
+
   sigma.prototype.killForceAtlas2 = function() {
 
-    // Stop and kill worker
+    // Stop Algorithm
+    supervisor.stop();
+
+    // Kill Worker
+    supervisor.killWorker();
+
     // Kill supervisor
-  };
+    supervisor = null;
 
-  sigma.prototype.testFA2Supervisor = function() {
-    supervisor = new Supervisor(this);
     return this;
   };
 }).call(this);
