Skip to content

Commit 703fb98

Browse files
cornhundredcornhundred
committed
v1.8.0 dendrogram SVG-slider
1 parent 2bcb76d commit 703fb98

File tree

8 files changed

+164
-130
lines changed

8 files changed

+164
-130
lines changed

‎clustergrammer.js‎

Lines changed: 17 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎clustergrammer.min.js‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎clustergrammer.node.js‎

Lines changed: 28 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎clustergrammer.node.min.js‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "clustergrammer",
3-
"version": "v1.7.3",
3+
"version": "v1.8.0",
44
"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",
55
"main": "clustergrammer.node.js",
66
"scripts": {

‎src/labels/make_row_cat_super_labels.js‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -86,21 +86,21 @@ module.exports = function make_row_cat_super_labels(cgm){
8686
var unit_length = extra_y_room * viz.cat_room.symbol_width;
8787
var bar_width = unit_length * 0.9;
8888

89-
// optional bar behind name
90-
///////////////////////////////
91-
d3.select('.row_cat_label_bars')
92-
.selectAll()
93-
.data(viz.all_cats.row)
94-
.enter()
95-
.append('rect')
96-
.style('height', bar_width +'px')
97-
.style('width','70px')
98-
.style('opacity',0.0)
99-
.attr('transform', function(d){
100-
var inst_y = unit_length * (parseInt( d.split('-')[1], 10 ) -0.75 );
101-
// var inst_y = -10;
102-
return 'translate(0,'+inst_y+')';
103-
});
89+
// // optional bar behind name
90+
// ///////////////////////////////
91+
// d3.select('.row_cat_label_bars')
92+
// .selectAll()
93+
// .data(viz.all_cats.row)
94+
// .enter()
95+
// .append('rect')
96+
// .style('height', bar_width +'px')
97+
// .style('width','70px')
98+
// .style('opacity',0.0)
99+
// .attr('transform', function(d){
100+
// var inst_y = unit_length * (parseInt( d.split('-')[1], 10 ) -0.75 );
101+
// // var inst_y = -10;
102+
// return 'translate(0,'+inst_y+')';
103+
// });
104104

105105

106106
}

‎src/main.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var awesomplete = require('awesomplete');
2121
require('!style!css!./d3.slider/d3.slider.css');
2222
require('!style!css!awesomplete/awesomplete.css');
2323

24-
/* clustergrammer v1.7.3
24+
/* clustergrammer v1.8.0
2525
* Nick Fernandez, Ma'ayan Lab, Icahn School of Medicine at Mount Sinai
2626
* (c) 2016
2727
*/

‎webpack.config.js‎

Lines changed: 94 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -33,98 +33,98 @@ module.exports = [
3333
]
3434
}
3535
}
36-
// ,
37-
// {
38-
// entry: './src/main.js',
39-
// // devtool: DEBUG ? 'cheap-module-eval-source-map' : false,
40-
// devtool: DEBUG ? 'cheap-module-source-map' : false,
41-
// target: 'web',
42-
// output: {
43-
// path: __dirname,
44-
// filename: 'clustergrammer.min.js',
45-
// libraryTarget: 'var',
46-
// library: 'Clustergrammer'
47-
// },
48-
// externals: {
49-
// 'jQuery': 'jQuery',
50-
// 'lodash': '_',
51-
// 'underscore': '_',
52-
// 'd3': 'd3'
53-
// },
54-
// plugins:[
55-
// new webpack.optimize.UglifyJsPlugin({compress: { warnings: false }})
56-
// ],
57-
// module: {
58-
// loaders: [
59-
// {
60-
// test: /\.js$/,
61-
// loader: 'babel',
62-
// query: {
63-
// presets: ['es2015']
64-
// }
65-
// }
66-
// ]
67-
// }
68-
// },
69-
// {
70-
// entry: './src/main.js',
71-
// // devtool: DEBUG ? 'cheap-module-eval-source-map' : false,
72-
// devtool: DEBUG ? 'cheap-module-source-map' : false,
73-
// target: 'web',
74-
// output: {
75-
// path: __dirname,
76-
// filename: 'clustergrammer.node.js',
77-
// libraryTarget: 'commonjs2',
78-
// library: 'Clustergrammer'
79-
// },
80-
// externals: {
81-
// 'jQuery': 'jQuery',
82-
// 'lodash': '_',
83-
// 'underscore': '_',
84-
// 'd3': 'd3'
85-
// },
86-
// module: {
87-
// loaders: [
88-
// {
89-
// test: /\.js$/,
90-
// loader: 'babel',
91-
// query: {
92-
// presets: ['es2015']
93-
// }
94-
// }
95-
// ]
96-
// }
97-
// },
98-
// {
99-
// entry: './src/main.js',
100-
// // devtool: DEBUG ? 'cheap-module-eval-source-map' : false,
101-
// devtool: DEBUG ? 'cheap-module-source-map' : false,
102-
// target: 'web',
103-
// output: {
104-
// path: __dirname,
105-
// filename: 'clustergrammer.node.min.js',
106-
// libraryTarget: 'commonjs2',
107-
// library: 'Clustergrammer'
108-
// },
109-
// externals: {
110-
// 'jQuery': 'jQuery',
111-
// 'lodash': '_',
112-
// 'underscore': '_',
113-
// 'd3': 'd3'
114-
// },
115-
// plugins:[
116-
// new webpack.optimize.UglifyJsPlugin({compress: { warnings: false }})
117-
// ],
118-
// module: {
119-
// loaders: [
120-
// {
121-
// test: /\.js$/,
122-
// loader: 'babel',
123-
// query: {
124-
// presets: ['es2015']
125-
// }
126-
// }
127-
// ]
128-
// }
129-
// }
36+
,
37+
{
38+
entry: './src/main.js',
39+
// devtool: DEBUG ? 'cheap-module-eval-source-map' : false,
40+
devtool: DEBUG ? 'cheap-module-source-map' : false,
41+
target: 'web',
42+
output: {
43+
path: __dirname,
44+
filename: 'clustergrammer.min.js',
45+
libraryTarget: 'var',
46+
library: 'Clustergrammer'
47+
},
48+
externals: {
49+
'jQuery': 'jQuery',
50+
'lodash': '_',
51+
'underscore': '_',
52+
'd3': 'd3'
53+
},
54+
plugins:[
55+
new webpack.optimize.UglifyJsPlugin({compress: { warnings: false }})
56+
],
57+
module: {
58+
loaders: [
59+
{
60+
test: /\.js$/,
61+
loader: 'babel',
62+
query: {
63+
presets: ['es2015']
64+
}
65+
}
66+
]
67+
}
68+
},
69+
{
70+
entry: './src/main.js',
71+
// devtool: DEBUG ? 'cheap-module-eval-source-map' : false,
72+
devtool: DEBUG ? 'cheap-module-source-map' : false,
73+
target: 'web',
74+
output: {
75+
path: __dirname,
76+
filename: 'clustergrammer.node.js',
77+
libraryTarget: 'commonjs2',
78+
library: 'Clustergrammer'
79+
},
80+
externals: {
81+
'jQuery': 'jQuery',
82+
'lodash': '_',
83+
'underscore': '_',
84+
'd3': 'd3'
85+
},
86+
module: {
87+
loaders: [
88+
{
89+
test: /\.js$/,
90+
loader: 'babel',
91+
query: {
92+
presets: ['es2015']
93+
}
94+
}
95+
]
96+
}
97+
},
98+
{
99+
entry: './src/main.js',
100+
// devtool: DEBUG ? 'cheap-module-eval-source-map' : false,
101+
devtool: DEBUG ? 'cheap-module-source-map' : false,
102+
target: 'web',
103+
output: {
104+
path: __dirname,
105+
filename: 'clustergrammer.node.min.js',
106+
libraryTarget: 'commonjs2',
107+
library: 'Clustergrammer'
108+
},
109+
externals: {
110+
'jQuery': 'jQuery',
111+
'lodash': '_',
112+
'underscore': '_',
113+
'd3': 'd3'
114+
},
115+
plugins:[
116+
new webpack.optimize.UglifyJsPlugin({compress: { warnings: false }})
117+
],
118+
module: {
119+
loaders: [
120+
{
121+
test: /\.js$/,
122+
loader: 'babel',
123+
query: {
124+
presets: ['es2015']
125+
}
126+
}
127+
]
128+
}
129+
}
130130
];

0 commit comments

Comments
 (0)