Commit ed12d3ac authored by Sascha Herzinger's avatar Sascha Herzinger
Browse files

Minor improvements

parent c0e70ff9
......@@ -48,11 +48,11 @@
</div>
<div>
<label for="fjs-dgea-5">P.Value</label>
<input type="radio" id="fjs-dgea-5" value="P.Value" v-model="rankingMethod">
<input type="radio" id="fjs-dgea-5" value="P.Val" v-model="rankingMethod">
</div>
<div>
<label for="fjs-dgea-6">adj.P.Value</label>
<input type="radio" id="fjs-dgea-6" value="adj.P.Value" v-model="rankingMethod">
<input type="radio" id="fjs-dgea-6" value="adj.P.Val" v-model="rankingMethod">
</div>
</fieldset>
</div>
......@@ -271,7 +271,7 @@
return {
main: { height: gridSize, width: gridSize },
rowCluster: { height: gridSize, width: gridSize },
colCluster: { height: gridSize , width: gridSize },
colCluster: { height: gridSize, width: gridSize },
padding: { height: gridSize, width: gridSize }
}
},
......
......@@ -29,11 +29,13 @@
<g class="fjs-axis fjs-y-axis-1"></g>
<text :x="padded.width / 2"
:y="- margin.top / 2"
text-anchor="middle">
text-anchor="middle"
v-show="results.data.length">
Principal Component 1 (Variance Ratio: {{ results.variance_ratios[0].toFixed(2) }})
</text>
<text text-anchor="middle"
:transform="`translate(${this.padded.width + this.margin.right / 2}, ${this.padded.height / 2})rotate(90)`">
:transform="`translate(${this.padded.width + this.margin.right / 2}, ${this.padded.height / 2})rotate(90)`"
v-show="results.data.length">
Principal Component 2 (Variance Ratio: {{ results.variance_ratios[1].toFixed(2) }})
</text>
<polygon class="fjs-scatterplot-point"
......
......@@ -51,14 +51,13 @@ export function tweenGroup ({mutation, model, target, animationTime}) {
mutation(model.concat(target.slice(model.length)))
}
model.forEach((tweenedCell, i) => {
const tween = new TweenLite(tweenedCell, animationTime, target[i])
timeline.add(tween, 0)
timeline.to(tweenedCell, animationTime, target[i], 0)
})
timeline.play()
}
export function getPolygonPointsForSubset ({cx, cy, size, subset}) {
const diamond = (cx, cy, size) => `${cx},${cy - size / 2} ${cx + size / 2},${cy} ${cx},${cy + size / 2} ${cx - size / 2},${cy}`
const diamond = (cx, cy, size) => `${cx},${cy - size * 0.75} ${cx + size * 0.75},${cy} ${cx},${cy + size * 0.75} ${cx - size * 0.75},${cy}`
const square = (cx, cy, size) => `${cx - size / 2},${cy - size / 2} ${cx + size / 2},${cy - size / 2} ${cx + size / 2},${cy + size / 2} ${cx - size / 2},${cy + size / 2}`
const triangle = (cx, cy, size) => `${cx},${cy - size / 2} ${cx + size / 2},${cy + size / 2} ${cx - size / 2},${cy + size / 2}`
const revTriangle = (cx, cy, size) => `${cx - size / 2},${cy - size / 2} ${cx + size / 2},${cy - size / 2} ${cx},${cy + size / 2}`
......
......@@ -38,6 +38,7 @@
return credentials1
}
})
fjs.setSubsets([[...new Array(250).keys()], [...new Array(500).keys()].slice(250, 500)])
function loadData () {
fjs.loadData([
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment