allow naming the tracer

64json · 64json · commit 44bade458beb · 2016-05-25T15:12:15.000-05:00
diff --git a/js/module/array1d.js b/js/module/array1d.js
@@ -1,5 +1,5 @@
-function Array1DTracer(module) {
-    return Array2DTracer.call(this);
+function Array1DTracer() {
+    return Array2DTracer.apply(this, arguments);
 }
 
 Array1DTracer.prototype = $.extend(true, Object.create(Array2DTracer.prototype), {
diff --git a/js/module/array2d.js b/js/module/array2d.js
@@ -1,5 +1,5 @@
-function Array2DTracer(module) {
-    if (Tracer.call(this)) {
+function Array2DTracer() {
+    if (Tracer.apply(this, arguments)) {
         Array2DTracer.prototype.init.call(this);
         return true;
     }
diff --git a/js/module/directed_graph.js b/js/module/directed_graph.js
@@ -1,5 +1,5 @@
-function DirectedGraphTracer(module) {
-    if (Tracer.call(this)) {
+function DirectedGraphTracer() {
+    if (Tracer.apply(this, arguments)) {
         DirectedGraphTracer.prototype.init.call(this);
         return true;
     }
diff --git a/js/module/log_tracer.js b/js/module/log_tracer.js
@@ -1,5 +1,5 @@
-function LogTracer(module) {
-    if (Tracer.call(this)) {
+function LogTracer() {
+    if (Tracer.apply(this, arguments)) {
         LogTracer.prototype.init.call(this);
         return true;
     }
diff --git a/js/module/tracer.js b/js/module/tracer.js
@@ -1,19 +1,13 @@
-function Tracer() {
+function Tracer(name) {
     this.module = this.constructor;
     this.capsule = tm.allocate(this);
     $.extend(this, this.capsule);
-    if (this.new) {
-        Tracer.prototype.init.call(this);
-        return true;
-    }
-    return false;
+    this.setName(name);
+    return this.new;
 }
 
 Tracer.prototype = {
     constructor: Tracer,
-    init: function () {
-        this.$container.append($('<span class="name">').text(this.name));
-    },
     _setData: function () {
         var args = Array.prototype.slice.call(arguments);
         tm.pushStep(this.capsule, {type: 'setData', args: toJSON(args)});
@@ -37,6 +31,16 @@ Tracer.prototype = {
                 break;
         }
     },
+    setName: function (name) {
+        var $name;
+        if (this.new) {
+            $name = $('<span class="name">');
+            this.$container.append($name);
+        } else {
+            $name = this.$container.find('span.name');
+        }
+        $name.text(name || this.defaultName);
+    },
     setData: function () {
         var data = toJSON(arguments);
         if (!this.new && this.lastData == data) return true;
diff --git a/js/module/tracer_manager.js b/js/module/tracer_manager.js
@@ -15,7 +15,7 @@ TracerManager.prototype = {
             module: tracer.module,
             tracer: tracer,
             allocated: true,
-            name: null,
+            defaultName: null,
             $container: $container,
             new: true
         };
@@ -41,7 +41,7 @@ TracerManager.prototype = {
             count++;
             selectedCapsule = this.add(newTracer);
         }
-        selectedCapsule.name = newTracer.constructor.name + count;
+        selectedCapsule.defaultName = newTracer.constructor.name + ' ' + count;
         return selectedCapsule;
     },
     deallocateAll: function () {
diff --git a/js/module/undirected_graph.js b/js/module/undirected_graph.js
@@ -1,5 +1,5 @@
-function UndirectedGraphTracer(module) {
-    if (DirectedGraphTracer.call(this)) {
+function UndirectedGraphTracer() {
+    if (DirectedGraphTracer.apply(this, arguments)) {
         UndirectedGraphTracer.prototype.init.call(this);
         return true;
     }
diff --git a/js/module/weighted_directed_graph.js b/js/module/weighted_directed_graph.js
@@ -1,5 +1,5 @@
-function WeightedDirectedGraphTracer(module) {
-    if (DirectedGraphTracer.call(this)) {
+function WeightedDirectedGraphTracer() {
+    if (DirectedGraphTracer.apply(this, arguments)) {
         WeightedDirectedGraphTracer.prototype.init.call(this);
         return true;
     }
diff --git a/js/module/weighted_undirected_graph.js b/js/module/weighted_undirected_graph.js
@@ -1,5 +1,5 @@
-function WeightedUndirectedGraphTracer(module) {
-    if (WeightedDirectedGraphTracer.call(this)) {
+function WeightedUndirectedGraphTracer() {
+    if (WeightedDirectedGraphTracer.apply(this, arguments)) {
         WeightedUndirectedGraphTracer.prototype.init.call(this);
         return true;
     }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-function Array1DTracer(module) {`
`2`		`- return Array2DTracer.call(this);`
	`1`	`+function Array1DTracer() {`
	`2`	`+ return Array2DTracer.apply(this, arguments);`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`Array1DTracer.prototype = $.extend(true, Object.create(Array2DTracer.prototype), {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-function Array2DTracer(module) {`
`2`		`- if (Tracer.call(this)) {`
	`1`	`+function Array2DTracer() {`
	`2`	`+ if (Tracer.apply(this, arguments)) {`
`3`	`3`	`Array2DTracer.prototype.init.call(this);`
`4`	`4`	`return true;`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-function DirectedGraphTracer(module) {`
`2`		`- if (Tracer.call(this)) {`
	`1`	`+function DirectedGraphTracer() {`
	`2`	`+ if (Tracer.apply(this, arguments)) {`
`3`	`3`	`DirectedGraphTracer.prototype.init.call(this);`
`4`	`4`	`return true;`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-function LogTracer(module) {`
`2`		`- if (Tracer.call(this)) {`
	`1`	`+function LogTracer() {`
	`2`	`+ if (Tracer.apply(this, arguments)) {`
`3`	`3`	`LogTracer.prototype.init.call(this);`
`4`	`4`	`return true;`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-function UndirectedGraphTracer(module) {`
`2`		`- if (DirectedGraphTracer.call(this)) {`
	`1`	`+function UndirectedGraphTracer() {`
	`2`	`+ if (DirectedGraphTracer.apply(this, arguments)) {`
`3`	`3`	`UndirectedGraphTracer.prototype.init.call(this);`
`4`	`4`	`return true;`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-function WeightedDirectedGraphTracer(module) {`
`2`		`- if (DirectedGraphTracer.call(this)) {`
	`1`	`+function WeightedDirectedGraphTracer() {`
	`2`	`+ if (DirectedGraphTracer.apply(this, arguments)) {`
`3`	`3`	`WeightedDirectedGraphTracer.prototype.init.call(this);`
`4`	`4`	`return true;`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-function WeightedUndirectedGraphTracer(module) {`
`2`		`- if (WeightedDirectedGraphTracer.call(this)) {`
	`1`	`+function WeightedUndirectedGraphTracer() {`
	`2`	`+ if (WeightedDirectedGraphTracer.apply(this, arguments)) {`
`3`	`3`	`WeightedUndirectedGraphTracer.prototype.init.call(this);`
`4`	`4`	`return true;`
`5`	`5`	`}`