rbbt-rest 1.7.3 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83b8b9094b9af4834099ecf4ccd86eef7b611a8e
-  data.tar.gz: 3b66884ff196078ceb9e743cc3904b60baa74794
+  metadata.gz: 3e32a4a45d5c65372bcff90ae63db4b250730ca8
+  data.tar.gz: 1c873c7eb56e5e967a68c3386f16b02697c7e242
 SHA512:
-  metadata.gz: a97a9160d62382ae1e786a2f63e261da90b484d16367eeb7322721611e7d4d9c76c6555fad0ec959a8c64e5ae4ae95b2ef82673d3252f388c75c8c14585e7cad
-  data.tar.gz: 698cd1bae789d6f3ebb4126889961e02c319f66f3721045fef3af97c1a25e00c9cad03ce789278ffa9c5408c1eefb4036468e2f6c5228e1da7ac024076186d0d
+  metadata.gz: 8f62834e429bbdd1c810ea528430bf7e8944ab36ade62a955b3c1fbe2283d73190533d871a6cded7dc91388f79706add90200a6d23ef6970596d5356e67da6da
+  data.tar.gz: f470da72a984ee094dc899c8f9943117b008661702985c379ec2fec11e6ccf964d0b6d9a5f37af555172fc7d4f3c8b41c1b3f6a8da1aafdd90129ab245215409

data/share/views/public/js/rbbt.plots.js

@@ -277,6 +277,83 @@ rbbt.plots.d3js_graph = function(graph, object){
 }
 
 //{{{{ GROUP GRAPH
+
+
+rbbt.plots.make_groups = function(graph, nodes, rbbt_groups){
+  var groups = []
+  var group_indices = {}
+  var node_indices = {}
+  var index 
+  var used_nodes = []
+  var links = graph.links
+
+  index = 0
+  forArray(nodes, function(node){
+    node_indices[node.id] = index
+    index = index + 1
+  })
+
+  index = 0
+  forHash(rbbt_groups, function(term, info){
+    var children = info.items
+    group_indices[term] = index
+    index = index + 1
+  })
+
+  var new_links = []
+  forHash(rbbt_groups, function(term, info){
+    var children = info.items
+    var index = group_indices[term]
+    var leaves = new Array
+    var subgroups = new Array
+    forArray(children, function(subterm){
+      if (undefined === group_indices[subterm]){
+        var node_index = node_indices[subterm]
+        if (used_nodes[node_index]){
+          var new_index = nodes.length
+          var node = nodes[node_index]
+          nodes[new_index] = $.extend({},node)
+          leaves.push(new_index)
+          forArray(used_nodes[node_index], function(prev_index){
+            new_links.push({source: prev_index, target: new_index, type: 'move'})
+          })
+          used_nodes[new_index] = used_nodes[node_index]
+          used_nodes[new_index].push(new_index)
+        }else{
+          leaves.push(node_index)
+          used_nodes[node_index] = [node_index]
+        }
+      }else{
+        subgroups.push(group_indices[subterm])
+      }
+      forArray(links, function(l){
+        var orig_source=l.source
+        var orig_target=l.target
+        var sources = used_nodes[orig_source]
+        var targets = used_nodes[orig_target]
+        forArray(sources, function(source){
+            forArray(targets, function(target){
+                if (leaves.indexOf(source) > 0 && leaves.indexOf(target) > 0){
+                    var new_link = merge_hash({},l)
+                    new_link.source = source
+                    new_link.target = target
+                    new_links.push(new_link)
+                }
+            })
+        })
+      })
+    })
+    group_info = {leaves: leaves, groups: subgroups, name: info.name, id: info.id}
+    groups[index] = group_info
+  })
+
+  graph.groups = groups
+  graph.links = new_links
+
+  return graph
+}
+
+
 rbbt.plots.d3js_group_graph = function(graph, object){
   var xsize = 300, ysize = 200, pad = 20
   var width = 1200
@@ -329,6 +406,12 @@ rbbt.plots.d3js_group_graph = function(graph, object){
     }
   })
 
+  force.on('end', function() {
+      d3cola.prepareEdgeRouting(margin / 3);
+      link.attr("d", function (d) { return lineFunction(d3cola.routeEdge(d)); });
+      if (isIE()) link.each(function (d) { this.parentNode.insertBefore(this, this) });
+  })
+
   var group = svg.selectAll(".group")
       .data(graph.groups)
     .enter().append("rect")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.4
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake