Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
6ef5574
Evidente Backup
DoloKra Oct 27, 2022
3b6b96a
Collapse by depth
DoloKra Nov 21, 2022
40116d5
collapse by depth by scale
DoloKra Nov 22, 2022
c584e9c
first collapse by depth horizontal, collapse funktion from evidente
DoloKra Nov 23, 2022
f50df7d
Evidente collapse by depth y-achsis; Bug: Fast scroll
DoloKra Nov 25, 2022
122ea2d
Functional Collapse by depth in evidente
DoloKra Nov 29, 2022
35549d1
Functional Collapse by depth in evidente
DoloKra Nov 29, 2022
f8a80be
Zoom with focus on mouse movement
DoloKra Dec 5, 2022
a74b6be
Bug fix zoom with fokus on mouse
DoloKra Dec 6, 2022
991c8fd
fixed jumping bug when dragging and zooming
DoloKra Dec 6, 2022
a6d832c
functionaler zoom with mouse fokus
DoloKra Dec 12, 2022
7636a3e
added yscale to props fpr Phylotree
DoloKra Dec 13, 2022
c1e5478
first try select nodes by tage
DoloKra Dec 20, 2022
bc1af66
collaspe by selecting Leafs (with major bugs)
DoloKra Dec 21, 2022
40817bc
select labels: fixed mouse coordinates, still some bugs
DoloKra Jan 9, 2023
2c16a4a
selection collapse, only bug left is the selection ractangle
DoloKra Jan 17, 2023
bbc77a4
User can collapse by depth
DoloKra Jan 23, 2023
dc36e76
zoom on snp and metadata possible
DoloKra Jan 27, 2023
dfadf1c
Reimplemented zoom for Heatmap
DoloKra Feb 1, 2023
976f725
Bug fix select labels, rectangle does work now
DoloKra Feb 2, 2023
2f5159e
Bug fix select labels, rectangle does work now
DoloKra Feb 2, 2023
241c49a
created a collapse Modal for collapse bx depth
DoloKra Feb 8, 2023
cb8a69f
finished collapse Modal for collapse bx depth
DoloKra Feb 8, 2023
4e802a7
Bug fix collapse by depth. Heatmap is now also updated
DoloKra Feb 9, 2023
385f8c4
Bug fix collapse by depth. Heatmap is now also updated
DoloKra Feb 9, 2023
f811f85
Filter Nodes by SNP content
DoloKra Feb 16, 2023
3565be5
added apply-filter-modal.jsx
DoloKra Feb 21, 2023
6f9197d
Bug fix: Horizontal zoom Heatmap and semantic zoom
DoloKra Feb 24, 2023
ee35472
functional filter collapse or hide
DoloKra Mar 1, 2023
35588f5
filter decollapse with bugs
DoloKra Mar 1, 2023
ea7b9e5
comment
DoloKra Mar 1, 2023
872c514
bug fix: decollapse filtered nodes
DoloKra Mar 1, 2023
db8a5eb
commit before trying true semantic zoom
DoloKra Mar 2, 2023
94fc1d1
"semantic zoom with bugs"
DoloKra Mar 29, 2023
987a770
semantic zoom: heatmap does not sync
DoloKra Apr 3, 2023
f0770e5
Semantic Zoom: labels are synced with heatmap, not with tree
DoloKra Apr 3, 2023
1661f5a
Semantic zoom, labels are sync, not heatmap
DoloKra Apr 5, 2023
b805dfd
semantic zoom
DoloKra Apr 14, 2023
d24f096
adjustment to collapse by SNP
DoloKra Apr 17, 2023
6f48a4f
filter by snp content can be removed
DoloKra Apr 19, 2023
cc8cb6e
bugFix: margine size Heatmap, labels and guidelines
DoloKra May 5, 2023
35cadad
Final version with comments
DoloKra May 15, 2023
94d27da
last commit
DoloKra May 22, 2023
e75ee16
Adds nvm 16
mwittep Aug 27, 2023
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
Binary file modified .DS_Store
Binary file not shown.
15 changes: 15 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "chrome",
"request": "launch",
"name": "Launch Chrome against localhost",
"url": "http://localhost:3000",
"webRoot": "${workspaceFolder}"
}
]
}
28,131 changes: 14,429 additions & 13,702 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.5.0",
"@testing-library/user-event": "^7.2.1",
"popper.js": "^1.16.1",
"array-move": "^2.2.1",
"bootstrap": "^4.5.0",
"browserify": "^17.0.0",
Expand All @@ -20,9 +19,10 @@
"evergreen-ui": "^2.0.1",
"html2canvas": "^1.3.2",
"jquery": "^3.5.1",
"lodash": "^4.17.21",
"jspdf": "^2.3.1",
"lodash": "^4.17.21",
"phylotree": "github:mwittep/phylotree.js",
"popper.js": "^1.16.1",
"react": "^16.13.1",
"react-bootstrap": "^1.0.1",
"react-color": "^2.18.1",
Expand Down
Binary file modified server/.DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion server/backend_prepare_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def call_classico(tmpdir, nwk, snp):
fp_nwk.flush()
fp_snp.flush()
env = dict(os.environ)
subprocess.run(["java", "-jar", ScriptDir + "/classico.jar", fp_snp.name,
subprocess.run(["java", "-jar", "-Xms4G", ScriptDir + "/classico.jar", fp_snp.name,
fp_nwk.name, tmpdir], env=env)


Expand Down
33,607 changes: 18,195 additions & 15,412 deletions server/data/go-basic.obo

Large diffs are not rendered by default.

Binary file modified src/.DS_Store
Binary file not shown.
Loading