Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tree browser #442

Merged
merged 7 commits into from
Nov 6, 2019
Merged

Tree browser #442

merged 7 commits into from
Nov 6, 2019

Conversation

ddelpiano
Copy link
Contributor

@ddelpiano ddelpiano commented Nov 4, 2019

  • Cypher query factored out in configuration file
  • change onClick behaviour, remove the i-info and if you click on label it will display on the term info, the arrows instead will drive the navigation.
  • Label will show tooltip with the thumbnail, remove the info icon.
  • vertical size of the boxes to be reduced.
  • Color picker to be included.
  • Checkbox to add individual to be added (eye icon to be in line with other components).
  • expand on instance selection not working (works for classes, need to discuss this in the sprint)
  • If focus term = Type or anat_ind -> open tree to corresponding node(s)

@ddelpiano ddelpiano self-assigned this Nov 4, 2019
@ddelpiano
Copy link
Contributor Author

Just a reminder for the sprint call, the last checkbox is not marked since that feature works for classes or for individual (once they are loaded), however I can see this works for either of them when I select something from the stackviewer - I need to discuss this with @Robbie1977 to understand what's done in the stack to get individual and class in one shot since this will be beneficial also for the tree.

@Robbie1977 Robbie1977 merged commit 35485e3 into development Nov 6, 2019
Copy link
Collaborator

@gidili gidili left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some comments after the fact

components/interface/TreeWidget.js Show resolved Hide resolved
components/interface/TreeWidget.js Show resolved Hide resolved
components/interface/TreeWidget.js Outdated Show resolved Hide resolved
@@ -1124,7 +1124,7 @@
* Nodes matching the search conditions are highlighted
*/
.rst__rowSearchMatch {
outline: solid 3px #0080ff;
//outline: solid 3px #0080ff;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ddelpiano remove if unused?

Copy link
Collaborator

@gidili gidili left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some more comments

onClick={ () => {
this.setState({ displayColorPicker: true });
}}>
{ (this.state.displayColorPicker
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@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.setState({ displayColorPicker: true });
}}>
{ (this.state.displayColorPicker
if (Instances[rowInfo.node.instanceId] !== undefined && typeof Instances[rowInfo.node.instanceId].isVisible !== "undefined") {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ddelpiano too many nested if else else if else - very hard to read --> switch

@@ -1615,10 +1615,12 @@
}

.nodeFound {
outline: solid 3px #0080ff;
//outline: solid 3px #0080ff;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ddelpiano cleanup

Copy link
Collaborator

@gidili gidili left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

more comments

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;
Copy link
Collaborator

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants