rbbt-rest 1.8.47 → 1.8.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9194e343c60191741360a2a664c79d5ae8b57afd
-  data.tar.gz: a8cb16d87452d75c3b336c38ab0c03763fcb9c95
+  metadata.gz: 135792dc2caf7288c96e3b01d7c046d5d622bf01
+  data.tar.gz: 96bf1404866d5b384910f5bdcda226202587f964
 SHA512:
-  metadata.gz: 29e5b7f56aae683bd10d6456ffa16995a20e283f78278acb888f0bd5246a79f3d25c8f55f8a23b6d10ce5da654b88404147d0b9d3d9f39c6cc6fc2bf8be3bd28
-  data.tar.gz: 758207cbd5a1b8ea41c5dfbab3a117a40f7312cf286af44ba3741a50f42e9bf62cd2e103cce45759f9a790b90c770dd2b998f320ba909359cd4b300d4ce6adee
+  metadata.gz: 82daaae736361ca7de6c43ee00ee2c110297ff19b94939ecda4e80427eb12e90302d4d75ccb8875e36557bb7671d1524966ba4e5872a0d76b7e6140fd65dd355
+  data.tar.gz: 85d2d75d60a48d4cdb7fe298f267dc5888f41d5aba50204349217ac2cc3ea49eddbd9239609d1683390e3bf6959f71f4f7447574496ddc2168105cad4cb1cba9

data/share/views/layout/header.haml

@@ -50,7 +50,7 @@
 
 -# VISUALIZATION JS
 - record_js '/plugins/color-js/color.js'
-- record_js '/plugins/d3js/js/d3js.min.js'
+- record_js '/plugins/d3js/js/d3.v3.min.js'
 - record_js '/plugins/nvd3/js/nv.d3.js'
 - record_js '/plugins/svg-pan-zoom/js/svg-pan-zoom.js'
 - record_js '/plugins/cola/js/cola.js'

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

@@ -94,6 +94,13 @@ rbbt.plots.aes.get_properties = function(list, rules, type, namespace){
       }
     }
 
+    if (rule.subset){
+      var deferred = m.deferred()
+      var inclusion = list.codes.map(function(code){ if (rule.subset.indexOf(code) < 0){ return "false"} else { return "true" } })
+      deferred.resolve(inclusion)
+      promise = deferred.promise
+    }
+
     if (rule.value){
       var property = rule.property
       var deferred = m.deferred()

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

@@ -138,6 +138,12 @@ rbbt.plots.graph.view_cytoscape = function(graph_model, elem, style, layout, ext
     var dataset = rbbt.plots.graph.build_cytoscape(updated_model)
 
     require_js(['/js/cytoscape/js/src/AC_OETags.js', '/js/cytoscape/js/src/cytoscapeweb.js', '/js/cytoscape'], function(){
+      var win = elem.find('.window')
+      if (win.length == 0){
+        win = $('<div>').addClass('window').css('height', '500px')
+        elem.append(win)
+      }
+      if (undefined === win.attr('id')) win.attr('id', 'cytoscape_' + Math.ceil(Math.random() * 100000))
       var tool = $(elem).cytoscape_tool({
         knowledge_base: 'user',
         namespace: 'Hsa/feb2014',
@@ -196,6 +202,17 @@ rbbt.plots.graph.view_cytoscape = function(graph_model, elem, style, layout, ext
   })
 }
 
+rbbt.plots.graph.update_cytoscape = function(graph_model, elem){
+  rbbt.plots.graph.update(graph_model).then(function(updated_model){
+    var dataset = rbbt.plots.graph.build_cytoscape(updated_model)
+    $(elem).cytoscape_tool({
+      entities: dataset.nodes,
+      network: dataset
+    })
+    $(elem).cytoscape_tool('update_network')
+  })
+}
+
 rbbt.plots.graph.view_d3js_graph = function(graph_model, elem, node_obj){
   rbbt.plots.graph.update(graph_model).then(function(updated_model){
     console.log(updated_model)