Skip to content

Commit

Permalink
v1.8.0 dendrogram SVG-slider
Browse files Browse the repository at this point in the history
  • Loading branch information
@cornhundred
cornhundred committed Dec 12, 2016
1 parent 2bcb76d commit 703fb98
Show file tree
Hide file tree
Showing 8 changed files with 164 additions and 130 deletions.
25 changes: 17 additions & 8 deletions clustergrammer.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions clustergrammer.min.js
View file

Large diffs are not rendered by default.

31 changes: 28 additions & 3 deletions clustergrammer.node.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions clustergrammer.node.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "clustergrammer",
"version": "v1.7.3",
"version": "v1.8.0",
"description": "This is a clustergram implemented in D3.js. I started from the example http://bost.ocks.org/mike/miserables/ and added the following features",
"main": "clustergrammer.node.js",
"scripts": {
Expand Down
30 changes: 15 additions & 15 deletions src/labels/make_row_cat_super_labels.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,21 +86,21 @@ module.exports = function make_row_cat_super_labels(cgm){
var unit_length = extra_y_room * viz.cat_room.symbol_width;
var bar_width = unit_length * 0.9;

// optional bar behind name
///////////////////////////////
d3.select('.row_cat_label_bars')
.selectAll()
.data(viz.all_cats.row)
.enter()
.append('rect')
.style('height', bar_width +'px')
.style('width','70px')
.style('opacity',0.0)
.attr('transform', function(d){
var inst_y = unit_length * (parseInt( d.split('-')[1], 10 ) -0.75 );
// var inst_y = -10;
return 'translate(0,'+inst_y+')';
});
// // optional bar behind name
// ///////////////////////////////
// d3.select('.row_cat_label_bars')
// .selectAll()
// .data(viz.all_cats.row)
// .enter()
// .append('rect')
// .style('height', bar_width +'px')
// .style('width','70px')
// .style('opacity',0.0)
// .attr('transform', function(d){
// var inst_y = unit_length * (parseInt( d.split('-')[1], 10 ) -0.75 );
// // var inst_y = -10;
// return 'translate(0,'+inst_y+')';
// });


}
Expand Down
2 changes: 1 addition & 1 deletion src/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ var awesomplete = require('awesomplete');
require('!style!css!./d3.slider/d3.slider.css');
require('!style!css!awesomplete/awesomplete.css');

/* clustergrammer v1.7.3
/* clustergrammer v1.8.0
* Nick Fernandez, Ma'ayan Lab, Icahn School of Medicine at Mount Sinai
* (c) 2016
*/
Expand Down
188 changes: 94 additions & 94 deletions webpack.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,98 +33,98 @@ module.exports = [
]
}
}
// ,
// {
// entry: './src/main.js',
// // devtool: DEBUG ? 'cheap-module-eval-source-map' : false,
// devtool: DEBUG ? 'cheap-module-source-map' : false,
// target: 'web',
// output: {
// path: __dirname,
// filename: 'clustergrammer.min.js',
// libraryTarget: 'var',
// library: 'Clustergrammer'
// },
// externals: {
// 'jQuery': 'jQuery',
// 'lodash': '_',
// 'underscore': '_',
// 'd3': 'd3'
// },
// plugins:[
// new webpack.optimize.UglifyJsPlugin({compress: { warnings: false }})
// ],
// module: {
// loaders: [
// {
// test: /\.js$/,
// loader: 'babel',
// query: {
// presets: ['es2015']
// }
// }
// ]
// }
// },
// {
// entry: './src/main.js',
// // devtool: DEBUG ? 'cheap-module-eval-source-map' : false,
// devtool: DEBUG ? 'cheap-module-source-map' : false,
// target: 'web',
// output: {
// path: __dirname,
// filename: 'clustergrammer.node.js',
// libraryTarget: 'commonjs2',
// library: 'Clustergrammer'
// },
// externals: {
// 'jQuery': 'jQuery',
// 'lodash': '_',
// 'underscore': '_',
// 'd3': 'd3'
// },
// module: {
// loaders: [
// {
// test: /\.js$/,
// loader: 'babel',
// query: {
// presets: ['es2015']
// }
// }
// ]
// }
// },
// {
// entry: './src/main.js',
// // devtool: DEBUG ? 'cheap-module-eval-source-map' : false,
// devtool: DEBUG ? 'cheap-module-source-map' : false,
// target: 'web',
// output: {
// path: __dirname,
// filename: 'clustergrammer.node.min.js',
// libraryTarget: 'commonjs2',
// library: 'Clustergrammer'
// },
// externals: {
// 'jQuery': 'jQuery',
// 'lodash': '_',
// 'underscore': '_',
// 'd3': 'd3'
// },
// plugins:[
// new webpack.optimize.UglifyJsPlugin({compress: { warnings: false }})
// ],
// module: {
// loaders: [
// {
// test: /\.js$/,
// loader: 'babel',
// query: {
// presets: ['es2015']
// }
// }
// ]
// }
// }
,
{
entry: './src/main.js',
// devtool: DEBUG ? 'cheap-module-eval-source-map' : false,
devtool: DEBUG ? 'cheap-module-source-map' : false,
target: 'web',
output: {
path: __dirname,
filename: 'clustergrammer.min.js',
libraryTarget: 'var',
library: 'Clustergrammer'
},
externals: {
'jQuery': 'jQuery',
'lodash': '_',
'underscore': '_',
'd3': 'd3'
},
plugins:[
new webpack.optimize.UglifyJsPlugin({compress: { warnings: false }})
],
module: {
loaders: [
{
test: /\.js$/,
loader: 'babel',
query: {
presets: ['es2015']
}
}
]
}
},
{
entry: './src/main.js',
// devtool: DEBUG ? 'cheap-module-eval-source-map' : false,
devtool: DEBUG ? 'cheap-module-source-map' : false,
target: 'web',
output: {
path: __dirname,
filename: 'clustergrammer.node.js',
libraryTarget: 'commonjs2',
library: 'Clustergrammer'
},
externals: {
'jQuery': 'jQuery',
'lodash': '_',
'underscore': '_',
'd3': 'd3'
},
module: {
loaders: [
{
test: /\.js$/,
loader: 'babel',
query: {
presets: ['es2015']
}
}
]
}
},
{
entry: './src/main.js',
// devtool: DEBUG ? 'cheap-module-eval-source-map' : false,
devtool: DEBUG ? 'cheap-module-source-map' : false,
target: 'web',
output: {
path: __dirname,
filename: 'clustergrammer.node.min.js',
libraryTarget: 'commonjs2',
library: 'Clustergrammer'
},
externals: {
'jQuery': 'jQuery',
'lodash': '_',
'underscore': '_',
'd3': 'd3'
},
plugins:[
new webpack.optimize.UglifyJsPlugin({compress: { warnings: false }})
],
module: {
loaders: [
{
test: /\.js$/,
loader: 'babel',
query: {
presets: ['es2015']
}
}
]
}
}
];

0 comments on commit 703fb98

Please sign in to comment.