mirror of
https://github.com/chanzuckerberg/cellxgene.git
synced 2026-10-06 02:08:11 +08:00
move color control to continuous
This commit is contained in:
@@ -8,6 +8,7 @@ import SectionHeader from "../framework/sectionHeader";
|
|||||||
import setupParallelCoordinates from "./setupParallelCoordinates";
|
import setupParallelCoordinates from "./setupParallelCoordinates";
|
||||||
import drawAxes from "./drawAxes";
|
import drawAxes from "./drawAxes";
|
||||||
import drawLinesCanvas from "./drawLinesCanvas";
|
import drawLinesCanvas from "./drawLinesCanvas";
|
||||||
|
import ColorControl from "../controls/color";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
margin,
|
margin,
|
||||||
@@ -131,8 +132,7 @@ class Continuous extends React.Component {
|
|||||||
render() {
|
render() {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div id="parcoords_wrapper" style={{marginTop: 50}}>
|
<div id="parcoords_wrapper">
|
||||||
<SectionHeader text="Continuous Metadata"/>
|
|
||||||
<div
|
<div
|
||||||
className={styles.parcoords}
|
className={styles.parcoords}
|
||||||
id="parcoords"
|
id="parcoords"
|
||||||
@@ -140,9 +140,13 @@ class Continuous extends React.Component {
|
|||||||
width: width + margin.left + margin.right + "px",
|
width: width + margin.left + margin.right + "px",
|
||||||
height: height + margin.top + margin.bottom + "px"
|
height: height + margin.top + margin.bottom + "px"
|
||||||
}}></div>
|
}}></div>
|
||||||
|
<ColorControl/>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export default Continuous;
|
export default Continuous;
|
||||||
|
|
||||||
|
|
||||||
|
// <SectionHeader text="Continuous Metadata"/>
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import styles from "./graph.css";
|
|||||||
import {setupGraphElements, drawGraph} from "./drawGraph";
|
import {setupGraphElements, drawGraph} from "./drawGraph";
|
||||||
import SectionHeader from "../framework/sectionHeader";
|
import SectionHeader from "../framework/sectionHeader";
|
||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
import ColorControl from "../controls/color";
|
|
||||||
|
|
||||||
@connect((state) => {
|
@connect((state) => {
|
||||||
|
|
||||||
@@ -105,8 +104,6 @@ class Graph extends React.Component {
|
|||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<div id="graphWrapper" style={{height: 600 /* move this to globals */}}>
|
<div id="graphWrapper" style={{height: 600 /* move this to globals */}}>
|
||||||
<SectionHeader text="Graph"/>
|
|
||||||
<ColorControl/>
|
|
||||||
<div id="graphAttachPoint"> </div>
|
<div id="graphAttachPoint"> </div>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
@@ -114,3 +111,5 @@ class Graph extends React.Component {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export default Graph;
|
export default Graph;
|
||||||
|
|
||||||
|
// <SectionHeader text="Graph"/>
|
||||||
|
|||||||
Reference in New Issue
Block a user