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.

Sign up for GitHub

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

Jump to bottom

Hover over names #261

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Hover over names #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e4314f9
Update useLayers.js
theosanderson Jun 1, 2022
701a706
Prettified Code!
theosanderson Jun 1, 2022
0347aea
Update useLayers.js
theosanderson Jun 1, 2022
e5049b7
Prettified Code!
theosanderson Jun 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ Taxonium is a tool for exploring trees.

## How do I..


### visualise my own Newick phylogeny?

Upload a Newick file to [Taxonium.org](http://taxonium.org), and optionally a metadata file in CSV or TSV format. If using a metadata file the leftmost column must contain names of the nodes as in the tree.
Expand Down Expand Up @@ -42,5 +41,3 @@ Taxonium now consists of a number of components:
- [Exploring the NCBI Taxonomy](https://taxonium.org/?treeUrl=https%3A%2F%2Fcov2tree.nyc3.digitaloceanspaces.com%2Fncbi%2Ftree.nwk.gz&ladderizeTree=true&metaUrl=https%3A%2F%2Fcov2tree.nyc3.digitaloceanspaces.com%2Fncbi%2Fmetadata.tsv.gz&configUrl=https%3A%2F%2Fcov2tree.nyc3.digitaloceanspaces.com%2Fncbi%2Fconfig.json)
- [Serratus](https://serratus.io/trees) (click Tree Viewer on any tree)
- [mpxTree](http://mpxtree.taxonium.org/)


8 changes: 3 additions & 5 deletions taxonium_web_client/src/components/SearchPanel.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,11 +300,9 @@ function SearchPanel({
selectedDetails.nodeDetails.node_id !==
selectedDetails.nodeDetails.parent_id && (
<>


<div
className="text-xs font-bold mt-4 mb-0 text-gray-700 justify-between flex">
<div className="pt-1">Mutations at this node:</div> {settings.miniMutationsMenu()}
<div className="text-xs font-bold mt-4 mb-0 text-gray-700 justify-between flex">
<div className="pt-1">Mutations at this node:</div>{" "}
{settings.miniMutationsMenu()}
</div>
<div className="text-xs mt-1 text-gray-700 mr-1">
{settings
Expand Down
3 changes: 2 additions & 1 deletion taxonium_web_client/src/hooks/useLayers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,8 @@ const useLayers = ({

getColor: [180, 180, 180],
getAngle: 0,

onHover: (info) => setHoverInfo(info),
pickable: true,
billboard: true,
getTextAnchor: "start",
getAlignmentBaseline: "center",
Expand Down
5 changes: 3 additions & 2 deletions taxonium_web_client/src/hooks/useSettings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useState, useMemo, useCallback } from "react";
import {AiFillEye} from 'react-icons/ai';
import { AiFillEye } from "react-icons/ai";
export const useSettings = ({ query, updateQuery }) => {
const [minimapEnabled, setMinimapEnabled] = useState(true);
const [displayTextForInternalNodes, setDisplayTextForInternalNodes] =
Expand Down Expand Up @@ -39,7 +39,8 @@ export const useSettings = ({ query, updateQuery }) => {

const miniMutationsMenu = () => {
return (
<div className="block font-normal pt-1 mr-3"><AiFillEye className="mr-1 text-gray-400 inline-block w-5 h-4 mb-1" />
<div className="block font-normal pt-1 mr-3">
<AiFillEye className="mr-1 text-gray-400 inline-block w-5 h-4 mb-1" />
{Object.keys(mutationTypesEnabled).map((key) => (
<div key={key} className="inline-block mr-3 -mb-1 -pb-1">
<label key={key}>
Expand Down