Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
@chgibb
chgibb committed Sep 20, 2019
1 parent 28cd1a8 commit 8ca2079
Show file tree
Hide file tree
Showing 4 changed files with 109 additions and 98 deletions.
16 changes: 10 additions & 6 deletions src/req/renderer/containers/forms/newCoverageTrackForm/newCoverageTrackForm.tsx
View file
@@ -1,7 +1,9 @@
import * as React from "react";
import { CircularFigure, Contig } from '../../../circularFigure/circularFigure';
import { AlignData } from '../../../../alignData';
import { Form, FullWidthStepperForm } from '../../fullWidthStepperForm';

import {CircularFigure, Contig} from "../../../circularFigure/circularFigure";
import {AlignData} from "../../../../alignData";
import {Form, FullWidthStepperForm} from "../../fullWidthStepperForm";

import {step1} from "./step1";

export interface NewCoverageTrackFormProps
Expand Down Expand Up @@ -39,14 +41,16 @@ export class NewCoverageTrackForm extends React.Component<NewCoverageTrackFormPr

public onAdvance(step : number) : Promise<boolean>
{
return new Promise<boolean>((resolve : (val : boolean) => void) : void => {
return new Promise<boolean>((resolve : (val : boolean) => void) : void =>
{
return resolve(true);
});
}

public onRetreat(step : number) : Promise<boolean>
{
return new Promise<boolean>((resolve : (val : boolean) => void) : void => {
return new Promise<boolean>((resolve : (val : boolean) => void) : void =>
{
return resolve(true);
});
}
Expand All @@ -66,6 +70,6 @@ export class NewCoverageTrackForm extends React.Component<NewCoverageTrackFormPr
/>
</div>
</div>
)
);
}
}
38 changes: 21 additions & 17 deletions src/req/renderer/containers/forms/newCoverageTrackForm/step1.tsx
View file
@@ -1,13 +1,15 @@
import * as React from "react";
import { NewCoverageTrackForm } from './newCoverageTrackForm';
import { FullWidthFormStep } from '../../fullWidthStepperForm';
import { GridWrapper } from '../../gridWrapper';
import { Grid } from '../../../components/grid';
import { Switch } from '../../../components/switch';
import { FormGroup } from '../../../components/formGroup';
import { FormControlLabel } from '../../../components/formControlLabel';
import { OutlinedInput } from '../../../components/outlinedInput';
import { Typography } from '../../../components/typography';

import {FullWidthFormStep} from "../../fullWidthStepperForm";
import {GridWrapper} from "../../gridWrapper";
import {Grid} from "../../../components/grid";
import {Switch} from "../../../components/switch";
import {FormGroup} from "../../../components/formGroup";
import {FormControlLabel} from "../../../components/formControlLabel";
import {OutlinedInput} from "../../../components/outlinedInput";
import {Typography} from "../../../components/typography";

import {NewCoverageTrackForm} from "./newCoverageTrackForm";

export function step1(this : NewCoverageTrackForm) : FullWidthFormStep
{
Expand Down Expand Up @@ -39,7 +41,8 @@ export function step1(this : NewCoverageTrackForm) : FullWidthFormStep
<Switch
color="primary"
checked={this.state.log10Scale}
onChange={(event) => {
onChange={(event) =>
{
this.setState({
log10Scale : event.target.checked
});
Expand All @@ -51,18 +54,19 @@ export function step1(this : NewCoverageTrackForm) : FullWidthFormStep
</FormGroup>
</Grid>
<Grid item style={{marginTop:".5vh"}}>
<GridWrapper>
<Grid container spacing={4} justify="center">
<Grid item>
<Typography>And then scale by:</Typography>
</Grid>
</Grid>
<GridWrapper>
<Grid container spacing={4} justify="center">
<Grid item>
<Typography>And then scale by:</Typography>
</Grid>
</Grid>
</GridWrapper>
<OutlinedInput
label={this.state.scaleFactor.toString()}
inputProps={{
type : "number",
onChange : (event) => {
onChange : (event) =>
{
let value = parseFloat(event.target.value);

if(!isNaN(value))
Expand Down
120 changes: 61 additions & 59 deletions ...ircularGenomeBuilderView/containers/overlays/coverageTrackOverlay/contigSelectOverlay.tsx
View file
Expand Up @@ -12,7 +12,8 @@ import {ExpandMore} from "../../../../../components/icons/expandMore";
import {ChevronRight} from "../../../../../components/icons/chevronRight";
import {AddBox} from "../../../../../components/icons/addBox";
import {TreeItem} from "../../../../../components/treeItem";
import { CreateCoverageTrackOverlay } from './createCoverageTrackOverlay';

import {CreateCoverageTrackOverlay} from "./createCoverageTrackOverlay";

export interface ContigSelectProps {
onClose: () => void;
Expand Down Expand Up @@ -53,65 +54,66 @@ export class ContigSelectOverlay extends React.Component<ContigSelectProps, Cont
</div>
{
!this.state.selectedContig ?
<GridWrapper>
<div style={{marginLeft: "1vh", marginBottom: "1vh"}}>
<Grid container direction="row" spacing={1} justify="flex-start">
<Grid item>
<TreeView
defaultExpandIcon={<ChevronRight color="primary" classes={{colorPrimary: blue}} />}
defaultCollapseIcon={<ExpandMore color="primary" classes={{colorPrimary: blue}} />}
>
{
this.props.figure.contigs.map((contig,i) =>
{
return (
<TreeItem
nodeId={`${contig.name}-${i}`}
label={contig.name}
>
{
this.props.figure.renderedCoverageTracks.map((track,j) =>
{
return (
<TreeItem
nodeId={`${contig.name}-${i}-${j}`}
label={`Scaled by ${track.scaleFactor}${track.log10Scaled ? ", log10 scaled" : ""}`}
/>
);
})
}
<TreeItem
nodeId={`${contig.name}-${i}-new`}
label="New Coverage Track"
icon={
<AddBox
color="primary"
classes={{colorPrimary:blue}}
/>
}
onClick={()=>{
this.setState({
selectedContig : contig
});
}}
/>
</TreeItem>
);
})
}
</TreeView>
</Grid>
</Grid>
</div>
</GridWrapper> :
<GridWrapper>
<div style={{marginLeft: "1vh", marginBottom: "1vh"}}>
<Grid container direction="row" spacing={1} justify="flex-start">
<Grid item>
<TreeView
defaultExpandIcon={<ChevronRight color="primary" classes={{colorPrimary: blue}} />}
defaultCollapseIcon={<ExpandMore color="primary" classes={{colorPrimary: blue}} />}
>
{
this.props.figure.contigs.map((contig,i) =>
{
return (
<TreeItem
nodeId={`${contig.name}-${i}`}
label={contig.name}
>
{
this.props.figure.renderedCoverageTracks.map((track,j) =>
{
return (
<TreeItem
nodeId={`${contig.name}-${i}-${j}`}
label={`Scaled by ${track.scaleFactor}${track.log10Scaled ? ", log10 scaled" : ""}`}
/>
);
})
}
<TreeItem
nodeId={`${contig.name}-${i}-new`}
label="New Coverage Track"
icon={
<AddBox
color="primary"
classes={{colorPrimary:blue}}
/>
}
onClick={()=>
{
this.setState({
selectedContig : contig
});
}}
/>
</TreeItem>
);
})
}
</TreeView>
</Grid>
</Grid>
</div>
</GridWrapper> :

<React.Fragment>
<CreateCoverageTrackOverlay
figure={this.props.figure}
selectedContig={this.state.selectedContig}
align={this.props.align}
/>
</React.Fragment>
<React.Fragment>
<CreateCoverageTrackOverlay
figure={this.props.figure}
selectedContig={this.state.selectedContig}
align={this.props.align}
/>
</React.Fragment>
}
</React.Fragment>
);
Expand Down
33 changes: 17 additions & 16 deletions ...GenomeBuilderView/containers/overlays/coverageTrackOverlay/createCoverageTrackOverlay.tsx
View file
@@ -1,10 +1,11 @@
import * as React from "react";
import { CircularFigure } from '../../../../../circularFigure/circularFigure';
import { Contig } from '../../../../../../fastaContigLoader';
import { Grid } from '../../../../../components/grid';
import { Typography } from '../../../../../components/typography';
import { NewCoverageTrackForm } from '../../../../../containers/forms/newCoverageTrackForm/newCoverageTrackForm';
import { AlignData } from '../../../../../../alignData';

import {CircularFigure} from "../../../../../circularFigure/circularFigure";
import {Contig} from "../../../../../../fastaContigLoader";
import {Grid} from "../../../../../components/grid";
import {Typography} from "../../../../../components/typography";
import {NewCoverageTrackForm} from "../../../../../containers/forms/newCoverageTrackForm/newCoverageTrackForm";
import {AlignData} from "../../../../../../alignData";

export interface CreateCoverageTrackOverlayProps
{
Expand Down Expand Up @@ -34,16 +35,16 @@ export class CreateCoverageTrackOverlay extends React.Component<CreateCoverageTr
return (
<React.Fragment>
<div style={{marginLeft: "2.5vh"}}>
<Grid container spacing={4} justify="flex-start">
<Typography>New Coverage Track for {this.props.selectedContig.alias}:</Typography>
</Grid>
</div>
<NewCoverageTrackForm
figure={this.props.figure}
contig={this.props.selectedContig}
align={this.props.align}
/>
<Grid container spacing={4} justify="flex-start">
<Typography>New Coverage Track for {this.props.selectedContig.alias}:</Typography>
</Grid>
</div>
<NewCoverageTrackForm
figure={this.props.figure}
contig={this.props.selectedContig}
align={this.props.align}
/>
</React.Fragment>
)
);
}
}

0 comments on commit 8ca2079

Please sign in to comment.