rbbt-rest 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59c0ed2d456a49f6418d29a6264603d9975f739d
-  data.tar.gz: 3886dd197d5d6b6ea33f471c3edca6397fc682ae
+  metadata.gz: 83b8b9094b9af4834099ecf4ccd86eef7b611a8e
+  data.tar.gz: 3b66884ff196078ceb9e743cc3904b60baa74794
 SHA512:
-  metadata.gz: 58719858ad8424352f9ba49bded0b74e8d466e1d382aba478366e02e646a2fd807e43b2617ac5a4f3d8c4518c0f96841242d82a2d11b45b9d18bc424fe7b058b
-  data.tar.gz: 40ba3da4b639c982216228cf61f5286543ceb7d5aa335617154ccc3a9b3b6be145b67f5fcace57971cf866a51c9ecd6d3653082f4f7e9a018a21bebfb4fb539a
+  metadata.gz: a97a9160d62382ae1e786a2f63e261da90b484d16367eeb7322721611e7d4d9c76c6555fad0ec959a8c64e5ae4ae95b2ef82673d3252f388c75c8c14585e7cad
+  data.tar.gz: 698cd1bae789d6f3ebb4126889961e02c319f66f3721045fef3af97c1a25e00c9cad03ce789278ffa9c5408c1eefb4036468e2f6c5228e1da7ac024076186d0d

data/lib/rbbt/rest/common/resources.rb

@@ -45,7 +45,7 @@ module RbbtRESTHelpers
             path = locate_javascript(file.split("/")[2..-1] * "/")
           end
 
-          Open.read(path)
+          "//FILE: #{ File.basename(path) }\n" +  Open.read(path)
         } * "\n"
 
         FileUtils.mkdir_p File.dirname(filename) unless File.exists? File.dirname(filename)

data/lib/rbbt/rest/knowledge_base.rb

@@ -305,6 +305,7 @@ module Sinatra
           target = kb.target(database)
           source_type = kb.source_type(database)
           target_type = kb.target_type(database)
+          fields = kb.fields(database)
           source_entity_options = kb.entity_options_for source_type
           target_entity_options = kb.entity_options_for target_type
 
@@ -315,6 +316,7 @@ module Sinatra
             :target_type => target_type,
             :source_entity_options => source_entity_options,
             :target_entity_options => target_entity_options,
+            :fields => fields,
           }
 
           halt 200, info.to_json

data/share/views/compass/app.sass

@@ -394,10 +394,11 @@ body
 .flex-wrap
   flex-wrap: wrap
 
-.action_parameters
-  transform: translateX(-0.9em)
-  width: calc(100% + 2 * 0.9em)
-  margin-bottom: 1.8em !important
+.ui.segment
+  .action_parameters
+    transform: translateX(-0.9em)
+    width: calc(100% + 2 * 0.9em)
+    margin-bottom: 1.8em !important
 
 
 #top_menu

data/share/views/layout/header.haml

@@ -30,14 +30,22 @@
   requirejs.config({baseUrl: '/js-find'})
 
 
+
+-# JQUERY JS
 - %w(jquery-2.1.1 jquery.cookie jquery.form).each do |jquery_file|
   - record_js File.join('/plugins/jquery/js/', jquery_file)
 
 - record_js '/plugins/jquery-ui/js/jquery-ui-1.8.14.custom.min.js'
 - record_js '/plugins/jquery.tablesorter/jquery.tablesorter.min.js'
 - record_js '/plugins/jquery.scrollTo/jquery.scrollTo'
+
+-# SEMANTIC UI JS
 - record_js '/plugins/semantic-ui/dist/semantic.min.js'
+
+-# OTHER
 - record_js '/plugins/FileSaver/js/FileSaver.js'
+
+-# VISUALIZATION JS
 - record_js '/plugins/color-js/color.js'
 - record_js '/plugins/d3js/js/d3js.min.js'
 - record_js '/plugins/nvd3/js/nv.d3.js'
@@ -45,6 +53,8 @@
 - record_js '/plugins/cola/js/cola.js'
 - record_js '/plugins/mithril-node-render/js/index.js'
 
+
+
 - %w(helpers _md5 _ajax_replace _ellipsis).each do |file|
   - record_js "/js-find/#{ file }"
 
@@ -52,7 +62,10 @@
 - %w(dom_update fragment actions table list map reveal).each do |file|
   - record_js "/js-find/rbbt/#{ file }"
 
-- %w(rbbt rbbt.basic rbbt.exception rbbt.job rbbt.page rbbt.entity rbbt.entity_list rbbt.entity_map rbbt.views rbbt.favourites rbbt.knowledge_base rbbt.aesthetics rbbt.plots rbbt.modal).each do |file|
+- %w(rbbt rbbt.basic rbbt.exception rbbt.job rbbt.page rbbt.entity rbbt.entity_list rbbt.entity_map rbbt.views rbbt.favourites rbbt.modal).each do |file|
+  - record_js "/js-find/#{ file }"
+
+- %w(rbbt.knowledge_base rbbt.aesthetics rbbt.plots).each do |file|
   - record_js "/js-find/#{ file }"
 
 - record_js "/js-find/app"

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

@@ -2,16 +2,6 @@ rbbt.aesthetics = {LS_key: "rbbt.aesthetics"}
 
 var aes_module = rbbt.aesthetics 
 
-aes_module.load = function(){
-  this.aesthetics = rbbt.LS.load(this.LS_key)
-  if (undefined === this.aesthetics)
-    this.aesthetics = []
-}.bind(aes_module)
-
-aes_module.store = function(){
- rbbt.LS.store(this.LS_key, this.aesthetics)
-}.bind(aes_module)
-
 aes_module.map_aesthetic = function(aes, mapper, map_obj){
   switch(mapper){
     case false:
@@ -28,6 +18,100 @@ aes_module.map_aesthetic = function(aes, mapper, map_obj){
   }
 }
 
+aes_module.get_list_property = function(list, rule, result) {
+  promise = list.property(rule.property, rule.args)
+
+  if (undefined === rule.extract){
+    return promise.then(result, rbbt.exception.report)
+  }else{
+    var extract = rule.extract
+    return promise.then(function(v){return v.map(extract)}).then(result, rbbt.exception.report)
+  }
+}
+
+aes_module.get_list_workflow_job = function(list, rule, result) {
+  promise = rbbt.job(rule.workflow, rule.task, rule.args,true)
+
+  if (undefined === rule.extract){
+    return promise.then(result, rbbt.exception.report)
+  }else{
+    var extract = rule.extract
+    return m.sync([list.get(), promise]).then(function(res){
+      list_info = res[0]
+      data = res[1]
+      return list_info.entities.map(function(e){ return extract.call(null, data, e) })
+    }).then(result, rbbt.exception.report)
+  }
+}
+
+aes_module.get_list_knowledge_base = function(list, rule, result) {
+  var db_code
+  var promise
+  if (rule.parents){
+    var db_code = [rule.parents, rule.knowledge_base].join("@")
+    promise = rbbt.knowledge_base.list_parents(db_code, list)
+  }
+
+  if (rule.children){
+    var db_code = [rule.children, rule.knowledge_base].join("@")
+    promise = rbbt.knowledge_base.list_children(db_code, list)
+  }
+
+  if (rule.field){
+    promise = m.sync([promise,rbbt.knowledge_base.database_info(db_code)]).then(function(res){
+      var data = res[0]
+      var db_info = res[1]
+      var fields = db_info.fields
+      var field_pos = fields.indexOf(rule.field)
+
+      if (field_pos < 0){
+        var msg = "Field not found: " + rule.field + ". Options: " + fields.join(", ")
+        throw new Error(msg)
+      }
+
+      var matches = {}
+      forHash(data, function(key, values){
+        var source = values[0]
+        var target = values[1]
+        if (matches[source] === undefined) matches[source] = {}
+        matches[source][target] = values[field_pos+2]
+      })
+      return matches
+    })
+
+  }else{
+    promise = promise.then(function(data){
+      var matches = {}
+      forHash(data, function(key, values){
+        var source = values[0]
+        var target = values[1]
+        if (matches[source] === undefined) matches[source] = {}
+        matches[source][target] = values.slice(2) 
+      })
+      return matches
+    })
+  }
+
+  if (undefined === rule.extract){
+    return m.sync([list.get(), promise]).then(function(res){
+      var list_info = res[0]
+      var data = res[1]
+      return list_info.entities.map(function(e){ return data[e] })
+    }).then(result, function(r){rbbt.exception.report(r[1])})
+  }
+  else{
+    var extract = rule.extract
+    return m.sync([list.get(), promise]).then(function(res){
+      var list_info = res[0]
+      var data = res[1]
+      return list_info.entities.map(function(e){ 
+        return extract.call(null, data, e)
+      })
+    }).then(result, function(r){rbbt.exception.report(r[1])})
+  }
+  
+}
+
 aes_module.get_list_aesthetics = function(list, rules) {
   var result = {}
   var promises = []
@@ -35,73 +119,29 @@ aes_module.get_list_aesthetics = function(list, rules) {
   var mappers = {}
 
   if (undefined === rules) rules = this.aesthetics
+
   forArray(rules, function(rule){
     var aes = rule.aes
     result[aes] = m.prop()
     mappers[aes] = rule.mapper
 
-    var args = rule.args
-    var extract = rule.extract
-
     var promise
 
     if (rule.property){
-      promise = list.property(rule.property, args)
-
-      if (undefined === extract){
-        promises.push(promise.then(result[aes], rbbt.exception.report))
-      }else{
-        promises.push(promise.then(function(v){return v.map(extract)}).then(result[aes], rbbt.exception.report))
-      }
+      promises.push(aes_module.get_list_property(list, rule, result[aes]))
     }
 
     if (rule.workflow){
-      promise = rbbt.job(rule.workflow, rule.task, args,true)
-      if (undefined === extract){
-        promises.push(promise.then(result[aes], rbbt.exception.report))
-      }else{
-        promises.push(m.sync([list.get(), promise]).then(function(res){
-          list_info = res[0]
-          data = res[1]
-          return list_info.entities.map(function(e){ return extract.call(null, data, e) })
-        }).then(result[aes], rbbt.exception.report))
-      }
+      promises.push(aes_module.get_list_workflow_job(list, rule, result[aes]))
     }
 
     if (rule.knowledge_base){
-      if (rule.parents)
-        promise = rbbt.knowledge_base.list_parents([rule.parents, rule.knowledge_base].join("@"), list)
-      if (rule.children)
-        promise = rbbt.knowledge_base.list_children([rule.children, rule.knowledge_base].join("@"), list)
-      
-      promise = promise.then(function(data){
-        var matches = {}
-        forHash(data, function(key, values){
-          var source = values[0]
-          var target = values[1]
-          if (matches[source] === undefined) matches[source] = {}
-          matches[source][target] = values.slice(2) 
-        })
-        return matches
-      })
-
-      if (undefined === extract){
-        promises.push(m.sync([list.get(), promise]).then(function(res){
-          list_info = res[0]
-          data = res[1]
-          return list_info.entities.map(function(e){ return data[e] })
-        }).then(result[aes]))
-      }else{
-        promises.push(m.sync([list.get(), promise]).then(function(res){
-          list_info = res[0]
-          data = res[1]
-          return list_info.entities.map(function(e){ return extract.call(null, data, e) })
-        }).then(result[aes]))
-      }
+      promises.push(aes_module.get_list_knowledge_base(list, rule, result[aes]))
     }
   })
 
   var mapped_result = {}
+
   m.sync(promises).then(function(){
     forHash(result, function(aes, values){
       var mapper = mappers[aes]
@@ -113,55 +153,40 @@ aes_module.get_list_aesthetics = function(list, rules) {
   return deferred.promise
 }
 
+//{{{ HELPERS
+aes_module.column_aes = function(aes, column){
+  var column_aes = {label: column}
+  forHash(aes, function(key, values){
+    var m
+    if (m = key.match(/^column-(.*)/)){
+      var clean_key = m[1]
+      if (undefined === values)
+        column_aes[clean_key] = undefined
+      else
+        column_aes[clean_key] = values[column]
+    }
+  })
+  return column_aes
+}
+
+//{{{ STORE, LOAD, ADD and APPLY
+
+aes_module.store = function(){
+  rbbt.LS.store(this.LS_key, this.aesthetics)
+}.bind(aes_module)
+
+aes_module.load = function(){
+  this.aesthetics = rbbt.LS.load(this.LS_key)
+  if (undefined === this.aesthetics)
+    this.aesthetics = []
+}.bind(aes_module)
+
 aes_module.add = function(rule){
   aes_module.aesthetics.push(rule)
   aes_module.aesthetics = unique(aes_module.aesthetics)
   aes_module.store()
 }
 
-aes_module.apply = function(){
-}
-
-//aes_module.add = function(selector, aes, value){
-//  var mod = this
-//  if (typeof selector == 'function'){ 
-//    return selector.then(function(_selector){
-//      mod.aesthetics.push({selector: _selector, aes: aes, value: value})
-//    })
-//  }else{
-//    this.aesthetics.push({selector: selector, aes: aes, value: value})
-//  }
-//}
-//
-//aes_module.clear_aesthetic = function(aes){
-//  var data_key = 'data-aes-' + aesthetic.aes
-//
-//  $('[' + data_key + ']').attr(data_key, 'none')
-//}
-//
-//aes_module.apply_aesthetic = function(aesthetic){
-//
-// if (typeof aesthetic.selector == "string"){
-//  targets = $(aesthetic.selector)
-// }else{
-//  var items = aesthetic.selector
-//  if (typeof items[0] == 'object') items = $.map(items, function(i){return i.id})
-//  targets = $('.entity').filter(function(index){ 
-//   var id = $(this).attr('data-entity-id')
-//   return items.indexOf(id) >= 0
-//  })
-// }
-//
-// var data_key = 'data-aes-' + aesthetic.aes
-// targets.attr(data_key, aesthetic.value)
-//}
-//
-//aes_module.apply = function(aesthetic){
-// if (undefined === aesthetic)
-//  aes_module.aesthetics.map(aes_module.apply_aesthetic)
-// else
-//  aes_module.apply_aesthetic(aesthetic)
-//}
-//
+aes_module.apply = function(){ }
 
 aes_module.load()

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

@@ -14,9 +14,9 @@ var EntityList = function(data){
  }
 
  this.get = function(){ 
-  var url = this.url()
-  url = add_parameter(url, '_format', 'json')
   if (undefined === this.entities && ! this.loading){
+    var url = this.url()
+    url = add_parameter(url, '_format', 'json')
     list = this
     this.loading = m.request({url: url, method: 'GET'}).then(this.entities).then(function(x){ list.loading = undefined; return x})
     return this.loading
@@ -68,14 +68,13 @@ var EntityList = function(data){
    var db_key = [database, knowledgebase].join("@")
    return rbbt.knowledge_base.list_subset(db_key, this)
  }
-
-
 }
 
+//{{{ FAVOURITES
 var FavouriteLists = function(by_type){
- for (type in by_type){
-  this[type] = by_type[type]
- }
+  for (type in by_type){
+    this[type] = by_type[type]
+  }
 }
 
 FavouriteLists.get = function(){

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

@@ -5,9 +5,10 @@ rbbt.exception.null = function(variable, text){
 }
 
 rbbt.exception.report = function(err){
+  console.log(err)
   console.log("Error: " + err)
   var stack = err.stack
-  console.log(stack)
+  if(undefined === stack) stack = "No stack trace"
   if (rbbt.modal){
     stack = "<ul><li>" + stack.replace(/\n/g, '</li><li>') + '<li/></ul>'
     stack = stack.replace(/<li><li\/>/g,'').replace(/<li>(.*?)@(.*?):(\d+:\d+)<\/li>/g, '<li>$2<span style="font-weight:bold">$3</span><br/><em>$1</em></li>')

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

@@ -1,17 +1,23 @@
 var KB = rbbt.knowledge_base = {}
 
-KB.children = function(database, entity){
- var id = undefined
- if (typeof entity == 'string'){ id = entity}else{id = entity.id}
- var url = '/kb/user/' + database + '/children/' + id
- url = add_parameter(url, '_format', 'json')
- return m.request({url: url, method: "GET", type: Entity})
-}
+//KB.children = function(database, entity){
+// var id = undefined
+// if (typeof entity == 'string'){ id = entity}else{id = entity.id}
+// var url = '/knowledge_base/user/' + database + '/children/' + id
+// url = add_parameter(url, '_format', 'json')
+// return m.request({url: url, method: "GET", type: Entity})
+//}
+//
+//KB.parents = function(database, entity){
+// var url = '/knowledge_base/user/' + database + '/parents/' + entity.id
+// url = add_parameter(url, '_format', 'json')
+// return m.request({url: url, method: "GET", type: Entity})
+//}
 
-KB.parents = function(database, entity){
- var url = '/kb/user/' + database + '/parents/' + entity.id
+KB.database_info = function(database){
+ var url = '/knowledge_base/user/' + database + '/info'
  url = add_parameter(url, '_format', 'json')
- return m.request({url: url, method: "GET", type: Entity})
+ return m.request({url: url, method: "GET"})
 }
 
 KB.list_parents = function(database, list){

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

@@ -1,7 +1,20 @@
 rbbt.page = {};
 
+rbbt.page.path = function(){
+  return window.location.pathname;
+}
+
+rbbt.page.path_parts = function(path){
+  if (undefined === path) path = rbbt.page.path() 
+
+  var parts = path.split("/")
+  if (parts[0] == "") parts.shift()
+
+  return parts
+}
+
 rbbt.page.type = function(path){
-  if (undefined === path){ path = window.location.pathname; }
+  if (undefined === path) path = rbbt.page.path() 
 
   if (path.match(/^\/entity\//)){ return "entity"; }
   if (path.match(/^\/entity_action\//)){ return "entity_action"; }
@@ -25,11 +38,22 @@ rbbt.page.entity = function(){
 
 rbbt.page.list = function(){
  var card = $('.entity_list_card')
- if (card.length == 0) return false
- 
- var list = card.attr('data-list')
- var type = card.attr('data-list-type')
- return new EntityList({id: list, type: type})
+
+ if (card.length > 0){ 
+   var list = card.attr('data-list')
+   var type = card.attr('data-list-type')
+   return new EntityList({id: list, type: type})
+ }
+
+ if (rbbt.page.type() == 'entity_list_action'){
+   var parts = rbbt.page.path_parts()
+   var type = parts[1]
+   var list = parts[3]
+   console.log(list)
+   return new EntityList({id: list, type: type})
+ } 
+
+ return false
 }
 
 rbbt.page.map = function(){
@@ -58,85 +82,3 @@ rbbt.page.map_link = function(type, column, id){
   return a
 }
 
-//{{{ OLD
-//function rbbt.page_entity(path){
-//  if (undefined === path){ path = window.location.pathname; }
-//
-//  switch(page_type(path)){
-//    case "entity":
-//    return restore_element(path.split('?')[0].split("/")[3]);
-//    default:
-//    return undefined
-//  }
-//}
-//
-//function rbbt.page_entity_list(path){
-//  if (undefined === path){ path = window.location.pathname; }
-//
-//  switch(page_type(path)){
-//    case "entity_list":
-//    return restore_element(path.split('?')[0].split("/")[3]);
-//    default:
-//    return undefined
-//  }
-//}
-//
-//function rbbt.page_entity_map(path){
-//  if (undefined === path){ path = window.location.pathname; }
-//
-//  switch(page_type(path)){
-//    case "entity_map":
-//    return restore_element(path.split('?')[0].split("/")[4]);
-//    default:
-//    return undefined
-//  }
-//}
-//
-//function rbbt.page_entity_map_column(path){
-//  if (undefined === path){ path = window.location.pathname; }
-//
-//  switch(page_type(path)){
-//    case "entity_map":
-//    return restore_element(path.split("/")[3]);
-//    default:
-//    return undefined
-//  }
-//}
-//
-//function rbbt.page_entity_type(path){
-//  if (undefined === path){ path = window.location.pathname; }
-//  var entity_type;
-//
-//  switch(page_type(path)){
-//    case "entity":
-//    case "entity_list":
-//    case "entity_action":
-//    case "entity_list_action":
-//    case "entity_map":
-//    return restore_element(path.split("/")[2]);
-//    break;
-//  }
-//  return undefined;
-//}
-//
-//function rbbt.page_entity_base_type(path){
-//  return page_entity_type(path).split(":")[0]
-//}
-//
-//function rbbt.page_entity_format(path){
-//  return page_entity_type(path).split(":")[1]
-//}
-//
-//function rbbt.page_entity_info(path){
-// var params;
-// if (undefined === path){ 
-//  params = window.location.search; 
-// }else{
-//  params = path.split('?')[1]
-// }
-// return parse_parameters(params)
-//}
-//
-////{{{ Link generators
-//
-

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

@@ -78,7 +78,7 @@ rbbt.plots.list_plot = function(list, rules, create_obj){
       rbbt.log("Loading")
       return m('.ui.basic.segment.plot.loading', "Loading")
     }else{
-      rbbt.log("Wrap")
+      rbbt.log("Drawing")
       return m('.ui.basic.segment.plot', objs)
     }
   }
@@ -100,7 +100,6 @@ rbbt.plots.list_plot = function(list, rules, create_obj){
 
 //{{{ PLOTS
 
-
 //{{{ FORCE LAYOUT
 
 rbbt.plots.force_layout = function(graph){
@@ -136,7 +135,7 @@ rbbt.plots.association_network = function(nodes, associations){
       var target = value[1]
       var source_index = indices[source]
       var target_index = indices[target]
-      links.push({source: source_index, target: target_index, id: key})
+      links.push({source: source_index, target: target_index, id: key, values: value})
     })
 
     return links
@@ -151,23 +150,27 @@ rbbt.plots.basic_rules = function(study){
   rules.push({aes:'description', property: 'long_name'})
   rules.push({aes:'highlight', property: 'significant_in_study', args:study})
   rules.push({aes:'order', property: 'damage_bias_in_study', args:study})
-  rules.push({aes:'color_class', workflow: 'GEO', task: 'differential', args:{threshold: 0.05, dataset: 'GSE13507', to_gene: true, main:"/Primary/", contrast: "/ontrol/"}, extract: function(result, entity){
-    if (undefined === result[entity]) return ""
-    var pvalue = result[entity][result[entity].length-1]
-    if (pvalue > 0 && pvalue < 0.05){
-      return "green"
-    }else{
-      if (pvalue < 0 && pvalue > -0.05){
-        return "red"
-      }else{
-        return ""
-      }
-    }
+  rules.push({aes:'color_class', workflow: 'GEO', task: 'differential', 
+             args:{threshold: 0.05, dataset: 'GSE13507', to_gene: true, main:"/Primary/", contrast: "/ontrol/"},
+             extract: function(result, entity){
+              if (undefined === result[entity]) return ""
+              var pvalue = result[entity][result[entity].length-1]
+              if (pvalue > 0 && pvalue < 0.05){
+                return "green"
+              }else{
+                if (pvalue < 0 && pvalue > -0.05){
+                  return "red"
+                }else{
+                  return ""
+                }
+              }
   }})
-  rules.push({aes:'color', workflow: 'GEO', task: 'differential', mapper: 'sign-gradient', args:{threshold: 0.05, dataset: 'GSE13507', to_gene: true, main:"/Primary/", contrast: "/ontrol/"}, extract: function(result, entity){
-    if (undefined === result[entity]) return ""
-    var pvalue = result[entity][result[entity].length-1]
-    return pvalue_score(pvalue)
+  rules.push({aes:'color', workflow: 'GEO', task: 'differential', mapper: 'sign-gradient', 
+             args:{threshold: 0.05, dataset: 'GSE13507', to_gene: true, main:"/Primary/", contrast: "/ontrol/"}, 
+             extract: function(result, entity){
+              if (undefined === result[entity]) return ""
+              var pvalue = result[entity][result[entity].length-1]
+              return pvalue_score(pvalue)
   }})
 
   return rules
@@ -295,11 +298,13 @@ rbbt.plots.d3js_group_graph = function(graph, object){
       .nodes(graph.nodes)
       .links(graph.links)
       .groups(graph.groups)
-      .start()
+      .start(0,0,0)
 
-  for(i=0; i<1000; i++) force.tick()
+  rbbt.log("force:warmup")
+  for(i=0; i<100; i++) force.tick()
+  rbbt.log("force:warmup done")
 
-  var stop = true
+  var stop = false
   var e 
   if (stop) e = 'end'
   else e = 'tick'
@@ -318,7 +323,10 @@ rbbt.plots.d3js_group_graph = function(graph, object){
          .attr("width", function (d) { return d.bounds.width() - pad/2; })
          .attr("height", function (d) { return d.bounds.height() - pad/2; });
   
-    if (stop) svgPanZoom(object)
+    if (stop){
+      rbbt.log("force:panZoom")
+      svgPanZoom(object, {minZoom: 0, maxZoom: 1000})
+    }
   })
 
   var group = svg.selectAll(".group")
@@ -331,23 +339,40 @@ rbbt.plots.d3js_group_graph = function(graph, object){
   group.append('title').text(function(d){return d.name})
   var link = svg.selectAll(".link").data(graph.links).enter()
       .append("line").attr("class", "link")
-        .style("stroke-width", 5)
+        .style("stroke-width", 7)
+        .style("stroke", function(l){
+          if (l.type && l.type == 'move')
+            return 'green'
+          else
+            return 'gray'
+        })
+        .style("stroke-dasharray", function(l){
+          if (l.type && l.type == 'move')
+            return '20,10,5,5,10'
+          else
+            return undefined
+        })
 
   var node = svg.selectAll(".node").data(graph.nodes).enter()
-      .append("foreignObject").attr("class", "node")
-        .attr('width',xsize)
-        .attr('height',ysize).html(function(d){ return mrender(rbbt.plots.card_obj(d)) })
+      .append("foreignObject").attr("class", "node").attr('width',xsize).attr('height',ysize)
+      .html(function(d){ return mrender(rbbt.plots.card_obj(d)) })
       .call(force.drag)
 
-
+  //var node = svg.selectAll(".node").data(graph.nodes).enter()
+  //    .append("rect").attr("class", "node")
+  //    .attr('height', ysize)
+  //    .attr('width', xsize)
+  //    .attr('fill', 'white')
+  //    .call(force.drag)
 
   if (stop){
     force.stop()
   }else{
-    svgPanZoom(object)
+    rbbt.log("force:panZoom")
+    svgPanZoom(object, {minZoom: 0, maxZoom: 1000})
   }
 
-  rbbt.log("force:panZoom")
+  rbbt.log("force:done")
 }
 
 

metadata

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