opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Scatterplot: wind down current development, fix label assignment, flatten model config, style fixes

Browse Source
This commit is contained in:
Carl Eberhard
2014-03-14 13:44:26 -04:00
parent 095d7098e5
commit 72907724b8
8 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/plugins/visualizations/scatterplot/src/scatterplot.js
+8 -6
View File
@@ -73,19 +73,19 @@ function scatterplot( renderTo, config, data ){
// .................................................................... axes
var axis = { x : {}, y : {} };
//console.log( 'x.ticks:', config.x.ticks );
//console.log( 'y.ticks:', config.y.ticks );
//console.log( 'xTicks:', config.xTicks );
//console.log( 'yTicks:', config.yTicks );
axis.x.fn = d3.svg.axis()
.orient( 'bottom' )
.scale( interpolaterFns.x )
.ticks( config.x.ticks )
.ticks( config.xTicks )
// this will convert thousands -> k, millions -> M, etc.
.tickFormat( d3.format( 's' ) );
axis.y.fn = d3.svg.axis()
.orient( 'left' )
.scale( interpolaterFns.y )
.ticks( config.y.ticks )
.ticks( config.yTicks )
.tickFormat( d3.format( 's' ) );
axis.x.g = content.append( 'g' )
@@ -103,8 +103,9 @@ function scatterplot( renderTo, config, data ){
var padding = 6;
// x-axis label
axis.x.label = svg.append( 'text' )
.attr( 'id', 'x-axis-label' )
.attr( 'class', 'axis-label' )
.text( config.x.label )
.text( config.xLabel )
// align to the top-middle
.attr( 'text-anchor', 'middle' )
.attr( 'dominant-baseline', 'text-after-edge' )
@@ -117,8 +118,9 @@ function scatterplot( renderTo, config, data ){
// y-axis label
// place 4 pixels left of the axis.y.g left edge
axis.y.label = svg.append( 'text' )
.attr( 'id', 'y-axis-label' )
.attr( 'class', 'axis-label' )
.text( config.y.label )
.text( config.yLabel )
// align to bottom-middle
.attr( 'text-anchor', 'middle' )
.attr( 'dominant-baseline', 'text-before-edge' )