rectangles, temporary fix (for ease), working on markers

ivp08001 · Dec 14, 2015 · e38a4be · e38a4be
1 parent 2458e79
commit e38a4be
Showing 1 changed file with 34 additions and 12 deletions.
diff --git a/VQI_PathwayEditor.js b/VQI_PathwayEditor.js
@@ -400,7 +400,8 @@ var VQI_PathwayEditor = function (parent) {
                 pid: id
             }, function (data) {
                 removeHeroUnit();
-                var obj = JSON.parse(data);
+				fixed_data = data.replace("-.", "-0.");
+                var obj = JSON.parse(fixed_data);
                 setElements(obj);
             });
         }
@@ -1005,14 +1006,17 @@ var VQI_PathwayEditor = function (parent) {
             var cy = $('#' + parent + '-cy').cytoscape('get');
             var nodePath = [];
             for (var n = 0; n < selectedPaths.length; n++) {
+				var j = 0;
+				var markerHit = false;
                 nodePath.push([])
-                for (var j = 0; j < selectedPaths[n].length; j++) {
+                while (j < selectedPaths[n].length && markerHit == false) {
                     if (j < selectedPaths[n].length - 1) {
                         var sourceNodeId = cy.elements("edge[id = \"" + selectedPaths[n][j] + "\"]").data('source');
                         var sourceNodeName = cy.elements("node[id = \"" + sourceNodeId + "\"]").data('name');
                         var sourceNodeCnv = cy.elements("node[id = \"" + sourceNodeId + "\"]").data('cnv');
                         var sourceNodeRna = cy.elements("node[id = \"" + sourceNodeId + "\"]").data('rna');
                         var sourceNodeMut = cy.elements("node[id = \"" + sourceNodeId + "\"]").data('mut');
+						var sourceNodeType = cy.elements("node[id = \"" + sourceNodeId + "\"]").data('Type');
                         if (cy.elements("node[id = \"" + sourceNodeId + "\"]").isParent()) {
                             nodePath[n].push([]);
                             for (var k = 0; k < cy.elements("node[id = \"" + sourceNodeId + "\"]").children().length; k++) {
@@ -1022,10 +1026,11 @@ var VQI_PathwayEditor = function (parent) {
                                 var sourceNodeMut = cy.elements("node[id = \"" + sourceNodeId + "\"]").children()[k]._private.data.mut
                                 nodePath[n][j].push({"name": sourceNodeName, "cnv": sourceNodeCnv, "rna": sourceNodeRna, "mut": sourceNodeMut});
                             }
-                        } else {
+                        } else if(sourceNodeType != "diamond"){
                             nodePath[n].push([{"name": sourceNodeName, "cnv": sourceNodeCnv, "rna": sourceNodeRna, "mut": sourceNodeMut}]);
-
-                        }
+                        } else {
+							markerHit = true;
+						}
                     } else {
                         var sourceNodeId = cy.elements("edge[id = \"" + selectedPaths[n][j] + "\"]").data('source');
                         var targetNodeId = cy.elements("edge[id = \"" + selectedPaths[n][j] + "\"]").data('target');
@@ -1034,11 +1039,13 @@ var VQI_PathwayEditor = function (parent) {
                         var sourceNodeCnv = cy.elements("node[id = \"" + sourceNodeId + "\"]").data('cnv');
                         var sourceNodeRna = cy.elements("node[id = \"" + sourceNodeId + "\"]").data('rna');
                         var sourceNodeMut = cy.elements("node[id = \"" + sourceNodeId + "\"]").data('mut');
+						var sourceNodeType = cy.elements("node[id = \"" + sourceNodeId + "\"]").data('Type');
 
                         var targetNodeName = cy.elements("node[id = \"" + targetNodeId + "\"]").data('name');
-                        var targetNodeCnv = cy.elements("node[id = \"" + sourceNodeId + "\"]").data('cnv');
-                        var targetNodeRna = cy.elements("node[id = \"" + sourceNodeId + "\"]").data('rna');
-                        var targetNodeMut = cy.elements("node[id = \"" + sourceNodeId + "\"]").data('mut');
+                        var targetNodeCnv = cy.elements("node[id = \"" + targetNodeId + "\"]").data('cnv');
+                        var targetNodeRna = cy.elements("node[id = \"" + targetNodeId + "\"]").data('rna');
+                        var targetNodeMut = cy.elements("node[id = \"" + targetNodeId + "\"]").data('mut');
+						var targetNodeType = cy.elements("node[id = \"" + targetNodeId + "\"]").data('Type');
 
                         if (cy.elements("node[id = \"" + sourceNodeId + "\"]").isParent()) {
                             nodePath[n].push([]);
@@ -1049,9 +1056,11 @@ var VQI_PathwayEditor = function (parent) {
                                 var sourceNodeMut = cy.elements("node[id = \"" + sourceNodeId + "\"]").children()[k]._private.data.mut
                                 nodePath[n][j].push({"name": sourceNodeName, "cnv": sourceNodeCnv, "rna": sourceNodeRna, "mut": sourceNodeMut});
                             }
-                        } else {
+                        } else if(sourceNodeType != "diamond") {
                             nodePath[n].push([{"name": sourceNodeName, "cnv": sourceNodeCnv, "rna": sourceNodeRna, "mut": sourceNodeMut}]);
-                        }
+                        } else {
+							markerHit = true;
+						}
                         if (cy.elements("node[id = \"" + targetNodeId + "\"]").isParent()) {
                             nodePath[n].push([]);
                             for (var k = 0; k < cy.elements("node[id = \"" + targetNodeId + "\"]").children().length; k++) {
@@ -1061,10 +1070,13 @@ var VQI_PathwayEditor = function (parent) {
                                 var targetNodeMut = cy.elements("node[id = \"" + targetNodeId + "\"]").children()[k]._private.data.mut
                                 nodePath[n][j].push({"name": targetNodeName, "cnv": targetNodeCnv, "rna": targetNodeRna, "mut": targetNodeMut});
                             }
-                        } else {
+                        } else if(targetNodeType != "diamond") {
                             nodePath[n].push([{"name": targetNodeName, "cnv": targetNodeCnv, "rna": targetNodeRna, "mut": targetNodeMut}]);
-                        }
+                        } else {
+							markerHit = true;
+						}
                     }
+					j++;
                 }
             }
             return nodePath;
@@ -1598,6 +1610,16 @@ var VQI_PathwayEditor = function (parent) {
                     'border-color': 'black',
                     'border-style': 'solid',
                     'border-width': 1
+                }).selector('node[Type="rectangle"]').css({
+                    'shape': 'rectangle',
+                    'width': 'data(Width)',
+                    'height': 'data(Height)',
+                    'color': 'black',
+                    'text-valign': 'center',
+                    'background-color': 'white',
+                    'border-color': 'black',
+                    'border-style': 'solid',
+                    'border-width': 1
                 }).selector('node[Type="label"]').css({
                     'shape': 'rectangle',
                     'width': 'data(Width)',