Changed so the larger file loads in the background hwile the user selects the...

Changed so the larger file loads in the background hwile the user selects the new file. Need to upadte to be an ajax call to really make the most.

gnvweb/eneg/src/main/resources/public/js/vis/genome.js

@@ -41,12 +41,9 @@ var network_tooltip = d3.select("body").append("div")
         .style("opacity", 0);
 
 
-
-
-var run_networks_in_bed = function(data) {
 d3.tsv("../../../data/vis/" + genome_attr.data.genes, function (data) {
 
-    for (var i = 0; i < data.length / 10; i++) {
+    for (var i = 0; i < data.length/2; i++) {
         var d = data[i];
         if (d.start < genome_attr.min) {
             genome_attr.min = d.start;
@@ -57,8 +54,12 @@ d3.tsv("../../../data/vis/" + genome_attr.data.genes, function (data) {
         d.y = 1;
         genome_attr.data.genome_data.push(d);
     }
+    });
+
+var run_networks_in_bed = function(data) {
+
      d3.json("../../../data/vis/" + genome_attr.data.networks, function (network_data) {
-         for (var i = 0; i < network_data.length / 10; i++) {
+         for (var i = 0; i < network_data.length/2; i++) {
              var d = network_data[i];
              if (d.start < genome_attr.min) {
                  genome_attr.min = d.start;
@@ -72,9 +73,6 @@ d3.tsv("../../../data/vis/" + genome_attr.data.genes, function (data) {
          init_genome_vis();
 
      });
-});
-
-
 
 }
 

gnvweb/eneg/src/main/resources/public/js/vis/network.js

@@ -583,15 +583,20 @@ var draw_strand = function (nodes) {
 var draw_dna_len = function (nodes) {
     var line_data = [];
     dna_attr.rect.node_points = new Array();
+    var inner_rad = dna_attr.semi_circle.inner_radius;
+
     for (var n = 0; n < nodes.length - 1; n++) {
         var node1 = nodes[n];
         var node2 = nodes[n + 1];
         var mid_radius = dna_attr.semi_circle.outer_radius
         var size =  mid_radius + (((nodes[n + 1].start - nodes[n].start) / data.max_dist) * dna_attr.dna_strand.external_dist);
         line_data = calc_loop_interpolation_points(node1.end_angle, node2.start_angle,
-                dna_attr.semi_circle.inner_radius, mid_radius, size, line_data, n);
-
+                inner_rad, mid_radius, size, line_data, n);
     }
+
+    var last_node_angle = nodes[nodes.length - 1].end_angle;
+    dna_attr.rect.node_points.push({x: inner_rad * Math.cos(last_node_angle), y: inner_rad * Math.sin(last_node_angle), id: nodes.length - 1});
+
     draw_line(line_data, dna_attr.dna_strand.dist_stroke_colour);
     
 }
@@ -618,22 +623,15 @@ var calc_loop_interpolation_points = function (angle1, angle2, inner_rad, mid_ra
 
     if (node_num == 0) {
         line_data.push(inner_pt_1);
-        //draw_interaction_rect(inner_pt_1, node_num)
-    } else {
-        dna_attr.rect.node_points.push({x: inner_rad * Math.cos(angle1), y: inner_rad * Math.sin(angle1), id: node_num});
     }
+     dna_attr.rect.node_points.push({x: inner_rad * Math.cos(angle1), y: inner_rad * Math.sin(angle1), id: node_num});
 
-//    if (outer_rad < 1.1 * mid_rad) {
-//        line_data.push(top_loop_center);
-//    } else {
-        //line_data.push(small_pt_1);
         line_data.push(mid_pt_1);
         line_data.push(top_loop_curve1);
         line_data.push(top_loop_center);
         line_data.push(top_loop_curve2);
         line_data.push(mid_pt_2);
-        //line_data.push(small_pt_2);
-   // }
+
    // Draw a rect at each "interaction point"
     line_data.push(inner_pt_2);
     return line_data;