crop matrix now has an undo button

MaayanLab · Dec 16, 2016 · ffbc721 · ffbc721
1 parent 570eba6
commit ffbc721
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 16 deletions.
diff --git a/clustergrammer.js b/clustergrammer.js
diff --git a/src/config/set_defaults.js b/src/config/set_defaults.js
@@ -57,7 +57,7 @@ console.log('set_defaults')
     max_allow_fs: 20,
     dendro_filter:{'row':false, 'col':false},
     cat_filter:{'row':false, 'col':false},
-    // crop_filter:{'row':false, 'col':false},
+    crop_filter_nodes:{'row':false, 'col':false},
     row_tip_callback:null,
     col_tip_callback:null,
     tile_tip_callback:null,

diff --git a/src/dendrogram/click_filter_cats.js b/src/dendrogram/click_filter_cats.js
@@ -29,6 +29,7 @@ module.exports = function click_filter_cats(cgm, inst_data, inst_selection, inst
       var inst_col_nodes = cgm.params.network_data.col_nodes;
 
       // run filtering using found names
+      console.log('filter with cat')
       cgm.filter_viz_using_names(filter_names);
 
       // save backup of the inst_view
@@ -47,6 +48,10 @@ module.exports = function click_filter_cats(cgm, inst_data, inst_selection, inst
     filter_names = cgm.params.cat_filter[inst_rc];
 
     // reset filter
+    console.log('reset filter with cat')
+
+    console.log(filter_names)
+
     cgm.filter_viz_using_names(filter_names);
     // must set this after filtering has been run
     cgm.params.cat_filter[inst_rc] = false;

diff --git a/src/network/filter_viz_using_names.js b/src/network/filter_viz_using_names.js
@@ -17,6 +17,7 @@ module.exports = function filter_viz_using_names(names, external_cgm = false){
   var new_nodes = {};
   var found_nodes;
 
+  console.log(names)
   _.each(['row', 'col'], function(inst_rc){
 
     // I'm requiring view 0
@@ -38,6 +39,8 @@ module.exports = function filter_viz_using_names(names, external_cgm = false){
 
   });
 
+  console.log('new nodes')
+  console.log(new_nodes)
   // new_nodes.col_nodes = params.network_data.col_nodes;
 
   var new_network_data = filter_network_using_new_nodes(cgm.config, new_nodes);

diff --git a/src/params/ini_label_params.js b/src/params/ini_label_params.js
@@ -1,4 +1,4 @@
-module.exports = function set_label_params(params){
+module.exports = function ini_label_params(params){
 
   var labels = {};
   labels.super_label_scale = params.super_label_scale;

diff --git a/src/sidebar/make_icons.js b/src/sidebar/make_icons.js
@@ -115,9 +115,9 @@ module.exports = function make_icons(cgm, sidebar){
       if (is_crop){
 
         // keep list of names to return to state
-        cgm.params.crop_filter = {}
-        cgm.params.crop_filter.row = cgm.params.network_data.row_nodes_names;
-        cgm.params.crop_filter.col = cgm.params.network_data.col_nodes_names;
+        cgm.params.crop_filter_nodes = {}
+        cgm.params.crop_filter_nodes.row_nodes = cgm.params.network_data.row_nodes;
+        cgm.params.crop_filter_nodes.col_nodes = cgm.params.network_data.col_nodes;
 
         cgm.crop_matrix();
 
@@ -134,6 +134,13 @@ module.exports = function make_icons(cgm, sidebar){
           .classed('fa-crop', true)
           .classed('fa-undo', false);
 
+
+        console.log('****** reset to previous state')
+        console.log(cgm.params.crop_filter_nodes)
+        // cgm.filter_viz_using_names(cgm.params.crop_filter_nodes);
+        cgm.filter_viz_using_nodes(cgm.params.crop_filter_nodes);
+
+
       }
 
       two_translate_zoom(params, 0, 0, 1);

diff --git a/src/update/update_viz_with_network.js b/src/update/update_viz_with_network.js
@@ -19,7 +19,7 @@ module.exports = function update_viz_with_network(cgm, new_network_data){
   console.log('update viz ')
 
   var inst_group_level = cgm.params.group_level;
-  var inst_crop_fitler = cgm.params.crop_filter;
+  var inst_crop_fitler = cgm.params.crop_filter_nodes;
 
   // make tmp config to make new params
   var tmp_config = jQuery.extend(true, {}, cgm.config);
@@ -66,8 +66,8 @@ module.exports = function update_viz_with_network(cgm, new_network_data){
   // have persistent group levels while updating
   cgm.params.group_level = inst_group_level;
 
-  // have persistent crop_filter while updating
-  cgm.params.crop_filter = inst_crop_fitler;
+  // have persistent crop_filter_nodes while updating
+  cgm.params.crop_filter_nodes = inst_crop_fitler;
 
   enter_exit_update(cgm, new_network_data, delays);