diff --git a/gui/NodeShape.js b/gui/NodeShape.js
index f2b9b8f..7ab6153 100755
--- a/gui/NodeShape.js
+++ b/gui/NodeShape.js
@@ -238,7 +238,7 @@ FPGAShape = draw2d.shape.layout.FlexGridLayout.extend({
orientation = this.getOrientation();
let prop = this.ORIENTATION_PROPERTIES[orientation];
let channel = new ChannelShape({
- text: "ch" + i,
+ text: "Channel" + i,
stroke: 0,
radius: 0,
bgColor: null,
@@ -257,7 +257,7 @@ FPGAShape = draw2d.shape.layout.FlexGridLayout.extend({
});
let channel2 = new ChannelShape({
- text: "ch" + i,
+ text: "Channel" + i,
stroke: 1,
radius: 0,
bgColor: null,
@@ -421,7 +421,7 @@ NodeShape = draw2d.shape.layout.FlexGridLayout.extend({
let prop = this.ORIENTATION_PROPERTIES[orientation];
let fpga = new FPGAShape({
"orientation": this.orientation,
- "name": string_acl,
+ "name": "FPGA" + string_acl.substring(3),
"channelsCount": channelsCount
});
@@ -557,7 +557,7 @@ NodeShape = draw2d.shape.layout.FlexGridLayout.extend({
},
getName: function () {
- return this.nodeLabel.getText();
+ return "n" + this.nodeLabel.getText().substring(4);
},
getLabel: function () {
diff --git a/gui/SelectionMenuPolicy.js b/gui/SelectionMenuPolicy.js
index d26ff2f..aa666de 100755
--- a/gui/SelectionMenuPolicy.js
+++ b/gui/SelectionMenuPolicy.js
@@ -104,7 +104,7 @@ var SelectionMenuPolicy = draw2d.policy.figure.SelectionPolicy.extend({
}
var nodeLabel = node.getLabel();
- var nodeNum = parseInt(nodeLabel.getText().substring(1));
+ var nodeNum = parseInt(nodeLabel.getText().substring(4));
// Update all nodes that have greater num than the node to delete.
if (num_to_delete < nodeNum) {
// n..
diff --git a/gui/Toolbar.js b/gui/Toolbar.js
index 3854a01..4a27bde 100755
--- a/gui/Toolbar.js
+++ b/gui/Toolbar.js
@@ -319,7 +319,7 @@ example.Toolbar = Class.extend({
} else {
pos_x = 20;
- pos_y += 300;
+ pos_y += 370;
}
}
diff --git a/gui/Util.js b/gui/Util.js
index f1c649c..93a406c 100644
--- a/gui/Util.js
+++ b/gui/Util.js
@@ -21,7 +21,9 @@ function generate_fpgalink_output(channel) {
var parent_fpga = channel.getFPGA();
var parent_node = parent_fpga.getNode();
- fpgalink = parent_node.getName() + ":" + parent_fpga.getName() + ":" + channel.getText();
+ var channelName = "ch" + channel.getText().substring(7)
+
+ fpgalink = parent_node.getName() + ":" + parent_fpga.getName() + ":" + channelName;
}
return fpgalink;
diff --git a/gui/View.js b/gui/View.js
index 119be5d..a6baef5 100755
--- a/gui/View.js
+++ b/gui/View.js
@@ -26,7 +26,7 @@ example.View = draw2d.Canvas.extend({
},
getNodeNameNew: function () {
- var newname = "n";
+ var newname = "Node";
// var numnodes = this.getFigures().getSize();
var numnodes = get_number_of_fpga_nodes(this.getFigures());
diff --git a/tests/test_topologies.html b/tests/test_topologies.html
index e4c8526..5f1b60f 100644
--- a/tests/test_topologies.html
+++ b/tests/test_topologies.html
@@ -21,16 +21,16 @@
| pair |
--fpgalink="pair" |
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 10
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 10
|
Pairwise connect the 2 FPGAs within each node
|
@@ -39,7 +39,7 @@
clique |
--fpgalink="clique" |
- 2
+ 2
|
All-to-all connection for 2 nodes, 4 FPGAs
|
@@ -48,16 +48,16 @@
ring |
--fpgalink="ringO" |
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 10
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 10
|
Ring with two links per direction, acl0 down, acl1 up
|
@@ -66,16 +66,16 @@
|
--fpgalink="ringN" |
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 10
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 10
|
Ring with two links per direction, acl0 down, acl1 down
|
@@ -84,16 +84,16 @@
|
--fpgalink="ringZ" |
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 10
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 10
|
Ring with two links per direction, acl0 and acl1 neighbors
|
@@ -102,16 +102,16 @@
torus |
--fpgalink="torus2" |
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 10
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 10
|
Torus with 2 FPGAs per row
|
@@ -120,15 +120,15 @@
|
--fpgalink="torus3" |
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 10
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 10
|
Torus with 3 FPGAs per row
|
@@ -137,15 +137,15 @@
|
--fpgalink="torus4" |
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 10
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 10
|
Torus with 4 FPGAs per row
|
@@ -154,14 +154,14 @@
|
--fpgalink="torus5" |
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 10
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 10
|
Torus with 5 FPGAs per row
|
@@ -170,16 +170,16 @@
|
--fpgalink="torus6" |
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 10
- 11
- 12
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 10
+ 11
+ 12
|
Torus with 6 FPGAs per row
|