Skip to content

Commit e77504f

Browse files
committed
netpyne-172 Fix merge issue
1 parent 6f389b4 commit e77504f

1 file changed

Lines changed: 3 additions & 55 deletions

File tree

webapp/components/definition/stimulationSources/NetPyNEStimulationSource.js

Lines changed: 3 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -593,61 +593,9 @@ class NetPyNEStimulationSource extends React.Component {
593593
disabled={this.renaming}
594594
label="Frequency (Hz)"
595595
/>
596-
<TextField
597-
variant="filled"
598-
fullWidth
599-
onChange={this.handleRenameChange}
600-
value={this.state.currentName}
601-
disabled={this.renaming}
602-
label="freStd (Hz)"
603-
/>
604-
<NetPyNEField mb={0} id="netParams.popParams.cellType">
605-
<NetPyNESelectField
606-
style={{mb: 0}}
607-
method="netpyne_geppetto.getAvailableCellTypes"
608-
model={
609-
`netParams.popParams['${this.props.name}']['cellType']`
610-
}
611-
postProcessItems={this.postProcessMenuItems}
612-
/>
613-
</NetPyNEField>
614-
<NetPyNEField mb={0} id="netParams.popParams.cellType">
615-
<NetPyNESelectField
616-
style={{mb: 0}}
617-
method="netpyne_geppetto.getAvailableCellTypes"
618-
model={
619-
`netParams.popParams['${this.props.name}']['cellType']`
620-
}
621-
postProcessItems={this.postProcessMenuItems}
622-
/>
623-
</NetPyNEField>
624-
<TextField
625-
variant="filled"
626-
fullWidth
627-
onChange={this.handleRenameChange}
628-
value={this.state.currentName}
629-
disabled={this.renaming}
630-
label="EventsPerCycle"
631-
/>
632-
<TextField
633-
variant="filled"
634-
fullWidth
635-
onChange={this.handleRenameChange}
636-
value={this.state.currentName}
637-
disabled={this.renaming}
638-
label="Repeats"
639-
/>
640-
<TextField
641-
variant="filled"
642-
fullWidth
643-
onChange={this.handleRenameChange}
644-
value={this.state.currentName}
645-
disabled={this.renaming}
646-
label="Stops"
647-
/>
648-
</Box> *}
649-
{/* <div> */}
650-
{/* <Box mb={1}>
596+
</Box> */}
597+
<div>
598+
<Box mb={1}>
651599
<TextField
652600
fullWidth
653601
variant="filled"

0 commit comments

Comments
 (0)