Skip to content

Commit baad507

Browse files
fix: Standardize normalize output figures across MOSuite function calls (#4)
* Update boolean parameters to TRUE/FALSE list options * Move count_type to first position in Basic category * Update norm_type to list with voom option (default: voom) * Update voom_normalization_method to list with none, scale, quantile, cyclicloess (default: quantile) * Update legend_position parameter(s) to list with top, bottom, left, right options * Match PCA point size default to filter capsule * Split visualization parameters by plot type * Align normalize capsule color defaults Use the MOSuite plot color default for normalize-counts and update capsule help text for supplied colors, generated extras, and random fallback behavior. * Align plot color defaults * Align histogram legend font default * docs: update plot default changelog * build: install FigOutSync package for normalize capsule * docs: add changelog author attribution * `air format` (GitHub Actions) * Delete environment/postInstall * Update CHANGELOG.md Co-authored-by: Kelly Sovacool, PhD <kelly-sovacool@users.noreply.github.com> * chore: add MOSuite via syncweaver (#5) * chore: add MOSuite via syncweaver * `air format` (GitHub Actions) --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * test: remove capsule environment tests * `air format` (GitHub Actions) --------- Co-authored-by: Kelly Sovacool, PhD <kelly-sovacool@users.noreply.github.com>
1 parent 45b167b commit baad507

305 files changed

Lines changed: 52035 additions & 29 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.codeocean/app-panel.json‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,19 @@
7070
"filt"
7171
]
7272
},
73+
{
74+
"id": "vA3pMmQwKs8nZx1c",
75+
"category": "gn9FXwemlVazWQIo",
76+
"name": "Normalization type",
77+
"param_name": "norm_type",
78+
"description": "Normalization type (default: voom)",
79+
"type": "list",
80+
"value_type": "string",
81+
"default_value": "voom",
82+
"extra_data": [
83+
"voom"
84+
]
85+
},
7386
{
7487
"id": "vB4qNnRxLt9oAy2d",
7588
"category": "gn9FXwemlVazWQIo",
@@ -94,19 +107,6 @@
94107
"FALSE"
95108
]
96109
},
97-
{
98-
"id": "vA3pMmQwKs8nZx1c",
99-
"category": "gn9FXwemlVazWQIo",
100-
"name": "Normalization type",
101-
"param_name": "norm_type",
102-
"description": "Normalization type (default: voom)",
103-
"type": "list",
104-
"value_type": "string",
105-
"default_value": "voom",
106-
"extra_data": [
107-
"voom"
108-
]
109-
},
110110
{
111111
"id": "vD6sPpTzNv1qCw4f",
112112
"category": "gn9FXwemlVazWQIo",
@@ -178,10 +178,11 @@
178178
"category": "VisGeneral",
179179
"name": "Colors for plots",
180180
"param_name": "colors_for_plots",
181-
"description": "Comma-separated list of colors for PCA and histogram",
182-
"help_text": "Use color names or hex codes. Leave blank to use defaults",
181+
"description": "Comma-separated colors for PCA and histogram. Defaults to the MOSuite palette.",
182+
"help_text": "Use color names or hex codes. Supplied colors are used first; if there are more groups than colors, additional colors are generated from the MOSuite palette, with random colors only if that palette is too short.",
183183
"type": "text",
184-
"value_type": "string"
184+
"value_type": "string",
185+
"default_value": "#5954d6,#e1562c,#b80058,#00c6f8,#d163e6,#00a76c,#ff9287,#008cf9,#006e00,#796880,#FFA500,#878500"
185186
},
186187
{
187188
"id": "vK3zWwAgUc8xJd1m",
@@ -271,7 +272,7 @@
271272
"description": "Point size for the PCA plot",
272273
"type": "text",
273274
"value_type": "number",
274-
"default_value": "1"
275+
"default_value": "3"
275276
},
276277
{
277278
"id": "vS1hEeIoCk6fRl9u",
@@ -326,10 +327,10 @@
326327
"category": "VisHistogram",
327328
"name": "Legend font size for histogram",
328329
"param_name": "legend_font_size_for_histogram",
329-
"description": "Legend font size for histogram plot",
330+
"description": "Legend font size for histogram plot. Leave blank to scale automatically.",
330331
"type": "text",
331332
"value_type": "number",
332-
"default_value": "10"
333+
"default_value": ""
333334
},
334335
{
335336
"id": "vX6mJjNtHp1kWq4z",

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
code/MOSuite linguist-vendored

‎.syncweaver-lock.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"host": "NIDAP-Community/MOSuite-normalize-counts",
3+
"orchestrator": "NIDAP-Community/syncweaver-orchestrator",
4+
"syncweaver_version": "0.0.1-dev",
5+
"sources": {
6+
"code/MOSuite": {
7+
"repo_url": "https://github.com/CCBR/MOSuite",
8+
"ref": "FigOutSync",
9+
"git_sha": "ee8f9259be4cf5c5567e365d31ae452873de46df"
10+
}
11+
}
12+
}

‎CHANGELOG.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# Code Ocean capsule - MOSuite - normalize counts
22

3-
## development version
3+
## Development version
44

5+
- Align plot color defaults with MOSuite package defaults (#4, @phoman14).
6+
- Leave the histogram legend font size blank by default so MOSuite can scale long or numerous legend labels automatically (#4, @phoman14).
57
- Improve the Code Ocean app panel parameter selection and categories. (#3, @phoman14)
68

79
## v3.0

‎code/MOSuite/.Rbuildignore‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
^renv$
2+
^renv\.lock$
3+
^_pkgdown\.yml$
4+
^\.github$
5+
^\.lintr$
6+
^\.pre-commit-config\.yaml$
7+
^\.prettierignore$
8+
^\.prettierrc$
9+
^\.Rproj\.user$
10+
^CITATION\.cff$
11+
^codemeta\.json$
12+
^data-raw$
13+
^doc$
14+
^Dockerfile$
15+
^docker$
16+
^docs$
17+
^figures$
18+
^LICENSE\.md$
19+
^Meta$
20+
^MOSuite\.Rproj$
21+
^pkgdown$
22+
^README\.Rmd$
23+
^README\.html$
24+
^README_files$
25+
^Rplots\.pdf$
26+
^moo_input\.rds$
27+
^plot-volc-enh\.json$
28+
^volc-sum-params\.json$
29+
^report_files$
30+
^inst/quarto/report_files$
31+
^tests/figures$
32+
^vignettes/figures/$
33+
^vignettes/memory\.Rmd$
34+
^vignettes/cli\.Rmd$
35+
VennDiagram.*\.log
36+
^[.]?air[.]toml$
37+
^\.vscode$
38+
^SECURITY\.md$

‎code/MOSuite/.gitattributes‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
CITATION.cff linguist-generated
2+
codemeta.json linguist-generated
3+
NAMESPACE linguist-generated
4+
man/ linguist-generated

‎code/MOSuite/.github/.Rprofile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rlang::global_entrace()

‎code/MOSuite/.github/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.html

0 commit comments

Comments
 (0)