Tree browser #442
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -275,9 +275,20 @@ export default class TreeWidget extends React.Component { | |
| nodesList.push(edges[childrenList[i]].to) | ||
| } | ||
| var uniqNodes = [...new Set(nodesList)]; | ||
|
|
||
| for (var j = uniqNodes.length - 1; j >= 0 ; j--) { | ||
| var node = nodes[this.findChildren({ id: uniqNodes[j] }, "id", nodes)[0]]; | ||
| if (node.instanceId.indexOf("VFB_") > -1) { | ||
| child.instanceId = node.instanceId; | ||
| // child.subtitle = child.subtitle + " " + node.instanceId; | ||
| uniqNodes.splice(j, 1); | ||
| } | ||
| } | ||
|
|
||
| for ( var j = 0; j < uniqNodes.length; j++) { | ||
| var node = nodes[this.findChildren({ id: uniqNodes[j] }, "id", nodes)[0]]; | ||
| if (node.instanceId.indexOf("VFB_") > -1) { | ||
| console.log("child.instanceId contains " + child.instanceId + "but I am overwriting it with " + node.instanceId); | ||
| child.instanceId = node.instanceId; | ||
| } else { | ||
| child.children.push({ | ||
|
|
@@ -420,34 +431,76 @@ export default class TreeWidget extends React.Component { | |
|
|
||
| getButtons (rowInfo) { | ||
| var buttons = []; | ||
| if (Instances[rowInfo.node.instanceId] !== undefined && typeof Instances[rowInfo.node.instanceId].isVisible !== "undefined") { | ||
|
There was a problem hiding this comment. @ddelpiano too many nested if else else if else - very hard to read --> switch |
||
| // rowInfo.node.subtitle = rowInfo.node.instanceId; | ||
| if (Instances[rowInfo.node.instanceId].isVisible()) { | ||
| var color = Instances[rowInfo.node.instanceId].getColor(); | ||
| buttons.push(<i className="fa fa-eye-slash" | ||
| aria-hidden="true" | ||
| onClick={ () => { | ||
| Instances[rowInfo.node.instanceId].hide(); | ||
| this.setState({ nodeSelected: rowInfo.node }); | ||
| }} />); | ||
| buttons.push(<i className="fa fa-tint" | ||
| style={{ | ||
| paddingLeft: "6px", | ||
| color: color | ||
| }} | ||
| aria-hidden="true" | ||
| onClick={ () => { | ||
| this.setState({ displayColorPicker: true }); | ||
| }}> | ||
| { (this.state.displayColorPicker | ||
|
There was a problem hiding this comment. @ddelpiano ternary operator here makes the code hard to read, it's ok for short one-liners but in cases like this I would avoid it |
||
| && this.state.nodeSelected.subtitle === rowInfo.node.subtitle | ||
| && this.colorPickerNode === undefined) | ||
| ? <CompactColor | ||
| ref={node => this.colorPickerNode = node} | ||
| color={Instances[rowInfo.node.instanceId].getColor()} | ||
| onChangeComplete={ color => { | ||
| Instances[rowInfo.node.instanceId].setColor(color.hex); | ||
| this.setState({ displayColorPicker: true }); | ||
| }} | ||
| style={{ zIndex: 10 }}/> | ||
| : null} | ||
| </i>); | ||
| } else { | ||
| if (rowInfo.node.instanceId.indexOf("VFB_") > -1) { | ||
| buttons.push(<i className="fa fa-eye" | ||
| aria-hidden="true" | ||
| onClick={ () => { | ||
| Instances[rowInfo.node.instanceId].show(); | ||
| this.setState({ nodeSelected: rowInfo.node }); | ||
| }} />); | ||
| } | ||
| } | ||
| } else { | ||
| if (rowInfo.node.instanceId.indexOf("VFB_") > -1) { | ||
| buttons.push(<i className="fa fa-eye" | ||
| aria-hidden="true" | ||
| onClick={ () => { | ||
| // rowInfo.node.subtitle = rowInfo.node.instanceId; | ||
| this.props.selectionHandler(rowInfo.node.instanceId); | ||
| this.setState({ nodeSelected: rowInfo.node }); | ||
| }} />); | ||
| } | ||
| } | ||
| return buttons; | ||
| } | ||
|
|
||
| getNodes (rowInfo) { | ||
| if (rowInfo.node.title !== "No data available.") { | ||
| var title = <MuiThemeProvider theme={this.theme}> | ||
| <Tooltip placement="right-start" | ||
| title={ (rowInfo.node.instanceId.indexOf("VFB_") > -1) | ||
| ? (<div> | ||
| <div> {rowInfo.node.description} </div> | ||
| <div> | ||
| <img style={{ textAlign: "center" }} | ||
| src={"https://VirtualFlyBrain.org/reports/" + rowInfo.node.instanceId + "/thumbnailT.png"} /> | ||
| </div></div>) | ||
| : (<div> | ||
| <div> {rowInfo.node.description} </div> | ||
| </div>)}> | ||
| <div | ||
| className={rowInfo.node.subtitle === this.state.nodeSelected.subtitle | ||
| ? "nodeFound nodeSelected" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ddelpiano cleanup if this is gone for real