Skip to content
Open

Dev #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
215 commits
Select commit Hold shift + click to select a range
b02026a
Added docsify quick guide and introduction. Added more example data
Jan 25, 2021
b4ed28c
Added upload example data buttons
Jan 26, 2021
522bf96
Deleted arbitrary files
Jan 26, 2021
bf288c9
Simplified README
Jan 26, 2021
85906f4
Added biocircos image
Jan 26, 2021
405ff86
Fixed example ARTS data upload bug
Jan 31, 2021
5c30759
Default chr length is now 10 Mbp
Jan 31, 2021
4b03398
Renamed Data manipulation options menu
Jan 31, 2021
50cb575
Completed the documentation
Jan 31, 2021
2ea934a
Delete .~lock.antismash_1.csv#
Jan 31, 2021
0fbf45d
Deleted obsidian workspace junk folder
Jan 31, 2021
de43432
Renamed the renaming scheme upload field
Jan 31, 2021
199c630
Deleted obsolete image files
Jan 31, 2021
c9931c5
Fixed the shiny app link in README
Jan 31, 2021
613ec0d
Merge pull request #2 from ostash-group/dev
Jan 31, 2021
8f88668
Update README.md
Jan 31, 2021
7ea0bf8
Merge pull request #1 from ostash-group/master
Feb 2, 2021
417f128
Added badges
Feb 2, 2021
5262aeb
Merge pull request #3 from pavlohrab/master
Feb 2, 2021
a90e77d
Replaced IntervalSurgeon with GRanges
Feb 3, 2021
790d166
Merge pull request #4 from pavlohrab/master
Feb 3, 2021
064cd74
Changed link to an app
Mar 8, 2021
7bbcd76
Changed link for an app
Mar 8, 2021
3bd73b8
Changed link to an app
Mar 8, 2021
d340422
Merge pull request #2 from ostash-group/master
Mar 8, 2021
5f7749b
Fixed weird issue when hexadecimal numbers were converted to integers…
pavlohrab May 17, 2021
988efcf
Integrated gecco
May 24, 2021
025257e
Rewrote core computations + many if statements in for loops
May 28, 2021
7e59904
Added example gecco data
May 28, 2021
9c1d3f3
Last stable working version. Refractored the code.
Jul 10, 2021
ce73b0f
Added comments, deleted testing chunks
Jul 11, 2021
48a0753
DeepBGC and GECCO data do not crashe
Jul 11, 2021
8a9d84b
Merge pull request #5 from pavlohrab/dev
Jul 11, 2021
661db7d
Removed shiny library() statement, made ::
Oct 7, 2021
18db448
Removed BioCircos library() statement, made ::
Oct 7, 2021
c3611bd
Removed tidyverse library() statement, made :: for tidyr, plyr and dplyr
Oct 7, 2021
d9873e5
Removed DT library() statement, made ::
Oct 7, 2021
c39f0e4
Removed ggplot2 library() statement, made ::
Oct 7, 2021
9d58384
Removed plotly library() statement, made ::
Oct 7, 2021
7489a03
Removed shinyjs library() statement, made ::
Oct 7, 2021
c456b4a
Removed rjson library() statement, made ::
Oct 7, 2021
721b2a4
Removed stringr library() statement, made ::
Oct 7, 2021
d2a429a
Removed GenomicRanges library() statement, made ::
Oct 7, 2021
d29e6b8
data_uploads and similar lists used for iteration in app made global
Oct 8, 2021
3c66486
GECCO ref comparison have full text description, not letter coding. u…
Oct 8, 2021
27bfd3b
Created reading functions for every type of input
Oct 8, 2021
9aaa17b
Fixed RRE data loading and visualization bug
Oct 9, 2021
7cde51d
Fixed duplicates function now is fixing duplicates. This solved PRISM…
Oct 9, 2021
35ba462
Fixed duplicates function one more time. Works as expected
Oct 9, 2021
44f4ca0
Added accept value to fileInput fields
Oct 9, 2021
78bc72e
Accept value now gathers json file for prism and antismash
Oct 9, 2021
9479e08
Added MIME type detection for antismash and prism data
Oct 9, 2021
673e924
Add Start-Stop columns for DeepBGC data
Oct 9, 2021
694945f
input now code names, not letters
Oct 9, 2021
f72f04c
Fix RRE not coloring bug
Oct 9, 2021
4b49bf2
Deleted soft_let list used for coding. Now only abbr is used
Oct 9, 2021
efac8a6
Use of datatable for coloring, not the dataframe
Oct 10, 2021
f3cc1e9
biocircos_legend datatable is now editable from shiny
Oct 10, 2021
2fe1aec
Gecco data comparison ui is now not loading untill comparable datafra…
Oct 11, 2021
6c9d45f
DeepBGC data comparison ui is now not loading untill comparable dataf…
Oct 11, 2021
e54cf61
Fix deep_reference plotting error, when reference data is empty
Oct 11, 2021
b814f43
Fix input is not hiding after input is triggered
Oct 11, 2021
05e058f
Fix input and input trigger Biocircos replotting
Oct 11, 2021
d8366bf
Added warning that hybrid settings are resseted after reset names for…
Oct 11, 2021
d980bfd
Fix plots weren't loading at fresh app startup
Oct 11, 2021
f670b75
Fixed previous commit: added different triggers to inputData to trigg…
Oct 11, 2021
4abf756
Add prodigiosin as other to the rename.csv
Oct 11, 2021
9ea7d91
Fix arts_data_input increment (ARTS SCO data was not laoding correctly)
Oct 11, 2021
73d85af
Fix prism_supp_data ID adding based on Start of gene (in ascending or…
Oct 11, 2021
8ff8828
Fix edit of vals trigger Biocircos replotting
Oct 11, 2021
9a43691
Fix PRISM-Supp checkbox. Now data can be hidden from plots
Oct 11, 2021
4c08f0e
Add basic debouncing for dynamicIutput
Oct 11, 2021
8eb9f26
Added debouncing for DeepBGC and GECCO filtering. Decreased reactivit…
Oct 12, 2021
82d675d
Add input data validation for antismash, prism and sempi
Oct 12, 2021
1f9ce28
Add RRE input data validation
Oct 12, 2021
65bb2b0
Initial dashboard working prototype
Oct 19, 2021
86eb2ed
Added scrollbars to group_by table
Oct 20, 2021
c734eac
Fix box resizebility. Also added heigth = 100%
Oct 20, 2021
8251086
Fix DeepBGC and Gecco filtering boxes showing after data upload
Oct 20, 2021
b6bb3e5
Added icons for sidebar
Oct 20, 2021
c9d92ec
Added loaders, DeepBGC data validation and disconnect message
Oct 26, 2021
a8dc987
Added DeepBGC filtering to the sidebar
Oct 26, 2021
10e77d5
Fixed icons for DeepBGC menuItems
Oct 26, 2021
bc26380
Added GECCO filtering to the sidebar
Oct 26, 2021
bb13c34
Sidebar is not reorderable, but looks better
Oct 26, 2021
a37f216
Move validation functions to a separate file
Oct 29, 2021
7db60cd
Move helper functions to a separate file
Oct 30, 2021
f7962b8
Add close action to boxes and restore button
Oct 30, 2021
283ed3c
move biocircos, deep_reference and group_rable functions into separat…
Nov 1, 2021
120c913
Add draggable events for Annotation on chromosome and group_table plots
Nov 1, 2021
5565987
boxes are now resizable only in 2 direction
Nov 1, 2021
fef79ae
Added box sidebar for Biocircos plot
Nov 1, 2021
b100f6f
Remove draggable events (interfere with plotly select events)
Nov 1, 2021
50c0b7a
Annotation on chromosome plots are in column layout now
Nov 1, 2021
9ac9d0f
Add Improve visualization box hiding if no data, that is used, were …
Nov 1, 2021
bcc0932
Add prism_supplement_arts_box hiding if no data, that is used, were …
Nov 1, 2021
ff663b2
Fixed DeepBGC filtering
Nov 1, 2021
b5b2e8e
Add global filtering values to compare. Filtering can be done right f…
Nov 2, 2021
f89b680
Fix filtering value change after initial UI rendering, if in another …
Nov 2, 2021
3bf5755
Add column-based global options layout. Boxes there are not resizable…
Nov 2, 2021
024c048
Fix app hanging on window close
Nov 2, 2021
7c3491e
Initial commit of golem-structured app
Nov 3, 2021
afc8770
Read example data should work now
Nov 4, 2021
789c2b5
Refined reading example data from package
Nov 4, 2021
2d39bda
Pipe operator should not be exported
Nov 4, 2021
2bc046c
Fixed .gitignore file
Nov 4, 2021
bcd81c9
Export tranformation to csv function. Fixed package structure
Nov 4, 2021
63e0722
Added deep_reference plot module
Nov 5, 2021
eab5ef5
Add deep_reference_2 module
Nov 5, 2021
95e4b57
Add barplot_rank module
Nov 5, 2021
9067115
Add group_table module
Nov 5, 2021
a57e73e
Add download module
Nov 5, 2021
ef4b870
Add deepbgc_plots module
Nov 5, 2021
8d4fa6c
Add gecoo_plots module
Nov 5, 2021
b8807db
Add biocircos module
Nov 5, 2021
20679f1
Fixed sco_rre loading
pavlohrab Feb 17, 2022
e08d95c
Fixed < and > symbols in sntismash.json processing
pavlohrab May 27, 2022
c344795
Change input to zip archieve in sempi_to_csv function
pavlohrab May 27, 2022
9e48bda
Change input for ARTS data to one zip archive or csv file
pavlohrab May 27, 2022
d0adfe8
Added functions to change default behaviour
pavlohrab May 27, 2022
b01448e
Change default example data for ARTS
pavlohrab May 27, 2022
d5189f3
Can upload zip files for SEMPI now
pavlohrab May 27, 2022
2a18557
Fixed SEMPI archive not loading
pavlohrab May 27, 2022
d32b366
Added app.R to upload to shinyapps.io
pavlohrab May 28, 2022
b44c33b
Begin to add tests
pavlohrab May 28, 2022
d9aac36
R cmd check 'no visible bindings' error resolved
pavlohrab Jun 1, 2022
13f3a73
Added antismash data
pavlohrab Jun 2, 2022
ef9f583
Added prism data
pavlohrab Jun 2, 2022
67ce12f
Added prism_supp data
pavlohrab Jun 2, 2022
afb430d
Add prism-supp data raw code
pavlohrab Jun 2, 2022
b4c1a4c
Add gecco data
pavlohrab Jun 2, 2022
f3ea1f6
Add sempi data
pavlohrab Jun 2, 2022
16c88e5
Add arts data
pavlohrab Jun 2, 2022
1846063
Add deepbgc data
pavlohrab Jun 2, 2022
e296842
Fix deepbgc data colname to lower
pavlohrab Jun 2, 2022
75a42fc
Add rre finder data
pavlohrab Jun 2, 2022
71a6fa3
Changed hosting of raw data files
pavlohrab Jun 2, 2022
8447b6f
Add documentation of used data
pavlohrab Jun 2, 2022
e97ee18
Fixed small typo in documentation, added Rd files
pavlohrab Jun 2, 2022
747cbdb
Added data internally
pavlohrab Jun 2, 2022
ab30c0d
Deleted documentation and external datasets
pavlohrab Jun 2, 2022
b0c9578
Refractored reading functions. Fix Prism-supp bug in deep_reference. …
pavlohrab Jun 2, 2022
583caf8
Fix PRISM-Supp data calculation dependencies on checkbox
pavlohrab Jun 2, 2022
55b5aee
Remove debuging code
pavlohrab Jun 2, 2022
2814427
Suppressed warnings of unknown aestetics from ggplot in deep_reference
pavlohrab Jun 2, 2022
8218d18
Add Description
pavlohrab Jun 2, 2022
071a22c
Run styler package on BGCViz
pavlohrab Jun 2, 2022
94523f2
Fixed warnings in deep_reference_2
pavlohrab Jun 2, 2022
9659c14
Fixed several linting errors
pavlohrab Jun 2, 2022
bcb3969
Remove old example data
pavlohrab Jun 2, 2022
64b0807
Removed redundancy code
pavlohrab Jun 2, 2022
65b788f
Added better input file description
pavlohrab Jun 3, 2022
eb9e457
Updated documentation
pavlohrab Jun 3, 2022
a8ad25d
Merge pull request #8 from pavlohrab/dev
pavlohrab Jun 3, 2022
fb69d9a
Merge pull request #9 from ostash-group/dev
pavlohrab Jun 3, 2022
779deb1
Merge pull request #9 from ostash-group/dev
pavlohrab Jun 3, 2022
e0d131a
Added new images
pavlohrab Jun 3, 2022
1c5be8b
Merge pull request #10 from pavlohrab/dev
pavlohrab Jun 3, 2022
865e0f4
Merge pull request #11 from ostash-group/dev
pavlohrab Jun 3, 2022
7602bbb
Merge pull request #11 from ostash-group/dev
pavlohrab Jun 3, 2022
a7ed9da
Fixed image visualization
pavlohrab Jun 3, 2022
75f7993
Fixed image visualization
pavlohrab Jun 3, 2022
912a18c
Add rconnect image to the docs
pavlohrab Jun 4, 2022
4f2ceef
Add rconnect image to the docs
pavlohrab Jun 4, 2022
bdb9b9b
Better Description
pavlohrab Jun 4, 2022
822b609
Added vignette
pavlohrab Jun 4, 2022
4cdd257
Add examples to the functions
pavlohrab Jun 4, 2022
17ed1aa
Changed indentation to be 4 spaces
pavlohrab Jun 4, 2022
934fb8d
Added NEWS file
pavlohrab Jun 4, 2022
abc97b4
Changed T/F to TRUE/FALSE
pavlohrab Jun 4, 2022
c4ed25e
Added images to vignette. Fixed typos
pavlohrab Jun 4, 2022
4c77c6f
Merge branch 'master' of github.com:pavlohrab/BGCViz into pavlohrab-m…
pavlohrab Jun 4, 2022
140a105
Merge branch 'pavlohrab-master'
pavlohrab Jun 4, 2022
e1be88a
Fixed score filtering in deepbgc_barplot
pavlohrab Jul 17, 2022
3a7bcfc
Fixed score calculation in gecco_barplots
pavlohrab Jul 17, 2022
762c50e
Fixed annotatetext in gecco_barplot
pavlohrab Jul 17, 2022
b036dab
Fixed annotatetext in deep_barplot
pavlohrab Jul 17, 2022
398d20f
Fixed no parent folders in download archive
pavlohrab Jul 17, 2022
97710c0
Fixed Prism-supp label in group.py
pavlohrab Jul 17, 2022
32467dc
Now script skip last group
pavlohrab Jul 17, 2022
18065b1
Fixed antismash and deepbgc dataframe name reading
pavlohrab Jul 17, 2022
cae4d1c
Added gbff file support and improved performance of group.py
pavlohrab Jul 18, 2022
73712ea
Added clinker support. Refractored code
pavlohrab Jul 18, 2022
9f00094
Fixed incomplete CDS, updated documentation
pavlohrab Jul 18, 2022
8f13246
Added quiet option to the group.py
pavlohrab Jul 18, 2022
0a588f0
removed reduntant print statements
pavlohrab Jul 18, 2022
9e90a34
Added --jobs option to pass clinker
pavlohrab Jul 18, 2022
4533bf4
Updated documentation. Added required argument for group.py
pavlohrab Jul 18, 2022
e146fef
Merge pull request #13 from pavlohrab/master
pavlohrab Jul 18, 2022
3238264
Added dissect.py script and documentation
pavlohrab Jul 29, 2022
57db55b
Merge pull request #14 from pavlohrab/master
pavlohrab Sep 5, 2022
a4041ec
removed column other&other_probability in gecco data processing stage
Tsarin2061 Oct 19, 2022
afcaf83
adding rawdata as ripp_data-requires changing path to file; file with…
Tsarin2061 Feb 14, 2023
f13df15
changed URLs in data-raw,fixed 'misleading code' in data-raw
Tsarin2061 Feb 19, 2023
0f6b463
Annotation ref plot of ripp, doesnt work in combination with another …
Tsarin2061 Feb 23, 2023
e7e0737
mend
Tsarin2061 Feb 23, 2023
76532f5
mend
Tsarin2061 Feb 23, 2023
e7a4e8c
RippMiner: processing user data
Tsarin2061 Feb 24, 2023
e5ae49d
fully functional RippMiner-genome analysis
Tsarin2061 Mar 12, 2023
02d770a
ARTS tree sidemenu created
LevTsarin Sep 20, 2023
faf442a
WIP
LevTsarin Sep 26, 2023
b45a24e
Phylogenetic tree of the first file in alltrees.zip
LevTsarin Oct 10, 2023
1f75708
realization of switching tree files, plot different trees is available
LevTsarin Oct 10, 2023
52cf4fa
fixed error while uploading data from several programs
LevTsarin Oct 11, 2023
4a3d5ab
slightly updated README
LevTsarin Oct 11, 2023
2d342d5
fixing rippminer format reading issue
LevTsarin Oct 11, 2023
4ad108a
fixing tree object
LevTsarin Oct 13, 2023
d6d8247
implementing processing of reference data,emerald/sanntis
LevTsarin Oct 14, 2023
3a1bbcb
processed emerald and reference in app_server.R
LevTsarin Oct 14, 2023
b2c9dbf
Emerald/Santiss working, no deep testing performed
LevTsarin Oct 23, 2023
1fe4e77
WIP antismash json feature
LevTsarin Nov 28, 2023
dcd13fd
working button, but still having some issues with data
LevTsarin Nov 28, 2023
bc0f2c1
working verstion
LevTsarin Dec 8, 2023
8522577
reference processing
LevTsarin Dec 8, 2023
baa143f
bug fixes
LevTsarin Dec 9, 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 added .DS_Store
Binary file not shown.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
# History files
.Rhistory
.Rapp.history
.result_for_antismash.json
.data_all.csv

# Session Data files
.RData
Expand Down
22 changes: 14 additions & 8 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
Package: BGCViz
Title: BGCViz
Version: 0.0.0.9000
Authors@R: person('Pavlo', 'Hrab', email = 'pavlo.hrab@gmail.com', role = c('cre', 'aut'))
Description: BGCViz is a shiny package, that aims to integrate BGC result from different softwares for same genome sequence.
Version: 0.99.0
Authors@R: person('Lev', 'Tsarin', email = 'Tsarinlev@gmail.com', role = c('cre', 'aut'))
Description: BGCViz is a shiny package, that aims to integrate BGC result
from different softwares for same genome sequence. On top of additional
filtering of GECCO and DeepBGC data and choosing optimal thresholds for them,
package allows to form groups of semi-identical BGCs, allowing better
annotation and boundary resolution of each one. The output of BGCViz can
serve as input to clinker software.
License: MIT + file LICENSE
biocViews:
biocViews: Visualization, MultipleComparison, FunctionalGenomics, ShinyApps
Imports:
BioCircos,
config (>= 0.3.1),
Expand All @@ -28,10 +33,10 @@ Imports:
sortable,
stringi,
stringr,
tidyr
tidyr,
ggtree
Encoding: UTF-8
LazyData: true
RoxygenNote: 7.2.0
RoxygenNote: 7.2.3
URL: https://github.com/ostash-group/BGCViz
BugReports: https://github.com/ostash-group/BGCViz/issues
Suggests:
Expand All @@ -45,4 +50,5 @@ Config/testthat/edition: 3
Language: en-US
VignetteBuilder: knitr
Depends:
R (>= 2.10)
R (>= 4.2.0)
LazyData: true
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
export(antismash_to_csv)
export(arts_to_csv)
export(get_defaults)
export(get_dissect_example)
export(prism_to_csv)
export(run_app)
export(sempi_to_csv)
Expand Down
2 changes: 2 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Changes in version 0.99.0 (2022-06-06)
+ Submitted to Bioconductor
28 changes: 14 additions & 14 deletions R/app_config.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
#'
#' NOTE: If you manually change your package name in the DESCRIPTION,
#' don't forget to change it here too, and in the config file.
#' For a safer name change mechanism, use the `golem::set_golem_name()`
#' For a safer name change mechanism, use the `golem::set_golem_name()`
#' function.
#'
#' @param ... character vectors, specifying subdirectory and file(s)
#' within your package. The default, none, returns the root of the app.
#'
#' @noRd
app_sys <- function(...) {
system.file(..., package = "BGCViz")
system.file(..., package = "BGCViz")
}


Expand All @@ -24,18 +24,18 @@ app_sys <- function(...) {
#' @noRd
get_golem_config <- function(value,
config = Sys.getenv(
"GOLEM_CONFIG_ACTIVE",
Sys.getenv(
"R_CONFIG_ACTIVE",
"default"
)
"GOLEM_CONFIG_ACTIVE",
Sys.getenv(
"R_CONFIG_ACTIVE",
"default"
)
),
use_parent = TRUE) {
config::get(
value = value,
config = config,
# Modify this if your config file is somewhere else:
file = app_sys("golem-config.yml"),
use_parent = use_parent
)
config::get(
value = value,
config = config,
# Modify this if your config file is somewhere else:
file = app_sys("golem-config.yml"),
use_parent = use_parent
)
}
3,413 changes: 1,889 additions & 1,524 deletions R/app_server.R

Large diffs are not rendered by default.

Loading