Merge pull request #9 from Huzifa1/master

Added meaningful names to the shapes

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 () {

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..

gui/Toolbar.js

@@ -319,7 +319,7 @@ example.Toolbar = Class.extend({
 			} else {
 				pos_x = 20;
 
-				pos_y += 300;
+				pos_y += 370;
 			}
 
 		}

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;

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());