Thanks to visit codestin.com
Credit goes to github.com

Skip to content

485 tadacomparabledataidentifier is used for legend labels in tada twocharacteristicscatterplot uses a different column for id cols #490

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

Merged
hillarymarler merged 63 commits into from
Jul 29, 2024
Merged

485 tadacomparabledataidentifier is used for legend labels in tada twocharacteristicscatterplot uses a different column for id cols #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
a1e58a2
Updated legends in TADA_TwoCharacteristicScatterplot
wokenny13 Jun 26, 2024
024e9ac
Delete TADA.Rproj
wokenny13 Jun 27, 2024
314b822
TwoCharacteristic requires two characteristic arguments
wokenny13 Jun 28, 2024
b10aa6d
TwoCharacteristicScatter changed allowable arguments
wokenny13 Jun 28, 2024
2648105
updated if statements in function
wokenny13 Jun 29, 2024
8898aed
Formatting and Logic fixes
wokenny13 Jun 29, 2024
b0da639
plot.data includes id_col2 now
wokenny13 Jul 1, 2024
82ede6b
updated plot shapes and colors
wokenny13 Jul 1, 2024
573f09d
Fixed bug in if statement
wokenny13 Jul 1, 2024
cc8ad6c
Merge branch 'develop' into 485-tadacomparabledataidentifier-is-used-…
wokenny13 Jul 1, 2024
5a1d37a
Merge branch 'develop' into 485-tadacomparabledataidentifier-is-used-…
hillarymarler Jul 8, 2024
2a6aedb
Created function TADA_MultiScatterPlot
wokenny13 Jul 10, 2024
09602ef
edit comment
wokenny13 Jul 10, 2024
a7e3de2
Update TADA_TwoCharacteristicScatterplot.Rd
wokenny13 Jul 10, 2024
188e26c
New Function MulitScatterplot
wokenny13 Jul 11, 2024
479b441
Merge branch 'develop' into 485-tadacomparabledataidentifier-is-used-…
wokenny13 Jul 12, 2024
e0b6348
devtools document ran for new function
wokenny13 Jul 12, 2024
ca5d3bb
Will plot up to 4 groups
wokenny13 Jul 12, 2024
a4b05de
Handling of argument inputs for the function
wokenny13 Jul 15, 2024
05bdf16
Update Figures.R
wokenny13 Jul 15, 2024
47b983c
Update .gitignore
hillarymarler Jul 15, 2024
e5e5daf
Spelling corrections and added to global variables
hillarymarler Jul 15, 2024
94f42fc
Update WORDLIST
hillarymarler Jul 15, 2024
960a10f
Update Figures.R
hillarymarler Jul 15, 2024
4b70415
Update Figures.R
hillarymarler Jul 15, 2024
5f43aeb
Update documentation
hillarymarler Jul 15, 2024
c704bf7
Update Figures.R
hillarymarler Jul 15, 2024
aac13ee
Merge branch 'develop' into 485-tadacomparabledataidentifier-is-used-…
hillarymarler Jul 16, 2024
03b3f36
Merge branch 'develop' into 485-tadacomparabledataidentifier-is-used-…
hillarymarler Jul 17, 2024
4947109
Progress - Note: y axis title needs to be fixed still
wokenny13 Jul 17, 2024
7d12ee5
Updated documentation and examples
wokenny13 Jul 18, 2024
62aad68
fixed y axis title
wokenny13 Jul 18, 2024
9a23147
Changed NULL to "null"
wokenny13 Jul 19, 2024
1936dab
fixed axis title bugs
wokenny13 Jul 19, 2024
2aac50c
vecsets
wokenny13 Jul 19, 2024
fe3ebd0
update ref
wokenny13 Jul 19, 2024
6875e6e
Update Figures.R
wokenny13 Jul 23, 2024
cc36839
Description change and documentation
wokenny13 Jul 23, 2024
e7db001
Created Internal Function for Removing NAs
wokenny13 Jul 23, 2024
b9ac071
Update Utilities.R
hillarymarler Jul 24, 2024
b958c51
Update .gitignore
hillarymarler Jul 24, 2024
2c6ce99
Update Figures.R
hillarymarler Jul 24, 2024
6a81e10
Documentation updates
hillarymarler Jul 24, 2024
0e327b5
Update Figures.R
hillarymarler Jul 24, 2024
1206249
Update Figures.R
hillarymarler Jul 24, 2024
95516da
Update Figures.R
hillarymarler Jul 24, 2024
dffc4b8
Update Figures.R
hillarymarler Jul 24, 2024
3b95202
Update TADA_GroupedScatterplot.Rd
hillarymarler Jul 24, 2024
fa53118
Update Figures.R
hillarymarler Jul 24, 2024
af757fb
Update TADA_GroupedScatterplot.Rd
hillarymarler Jul 24, 2024
4f16e3f
Update Utilities.R
hillarymarler Jul 25, 2024
5f158c9
Update DepthProfile.R
hillarymarler Jul 25, 2024
a3137ee
Update DepthProfile.R
hillarymarler Jul 25, 2024
9037380
Update Figures.R
hillarymarler Jul 25, 2024
a477835
Update TADA_CharStringRemoveNA.Rd
hillarymarler Jul 25, 2024
593e3f1
Styler updates
hillarymarler Jul 25, 2024
11541fc
Update Figures.R
hillarymarler Jul 25, 2024
43befe4
TADA_GroupedScatterplot updates
hillarymarler Jul 25, 2024
3cee0fe
Minor updates
wokenny13 Jul 26, 2024
7b78007
Merge branch 'develop' into 485-tadacomparabledataidentifier-is-used-…
hillarymarler Jul 26, 2024
059701d
Updated Example
wokenny13 Jul 26, 2024
acfde4a
Update Figures.R
wokenny13 Jul 26, 2024
9f25cd9
devtool document
wokenny13 Jul 26, 2024
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
2 changes: 2 additions & 0 deletions NAMESPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export(TADA_AutoFilter)
export(TADA_BigDataRetrieval)
export(TADA_Boxplot)
export(TADA_CalculateTotalNP)
export(TADA_CharStringRemoveNA)
export(TADA_ColorPalette)
export(TADA_ConvertDepthUnits)
export(TADA_ConvertResultUnits)
Expand Down Expand Up @@ -51,6 +52,7 @@ export(TADA_GetTemplate)
export(TADA_GetUSGSSynonymRef)
export(TADA_GetUniqueNearbySites)
export(TADA_GetWQXCharValRef)
export(TADA_GroupedScatterplot)
export(TADA_HarmonizeSynonyms)
export(TADA_Histogram)
export(TADA_IDCensoredData)
Expand Down
90 changes: 36 additions & 54 deletions R/DepthProfile.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1136,15 +1136,12 @@ TADA_DepthProfilePlot <- function(.data,
data = param1,
x = ~TADA.ResultMeasureValue,
y = ~TADA.ConsolidatedDepth,
name = stringr::str_remove_all(stringr::str_remove_all(
stringr::str_remove_all(paste0(
param1$TADA.ResultSampleFractionText[1], " ",
param1$TADA.CharacteristicName[1], " ",
param1$TADA.MethodSpeciationName[1], " ",
"(", param1$TADA.ResultMeasure.MeasureUnitCode[1], ")"
), stringr::fixed(" (NA)")),
stringr::fixed("NA ")
), stringr::fixed(" NA")),
name = TADA_CharStringRemoveNA(paste0(
param1$TADA.ResultSampleFractionText[1], " ",
param1$TADA.CharacteristicName[1], " ",
param1$TADA.MethodSpeciationName[1], " ",
"(", param1$TADA.ResultMeasure.MeasureUnitCode[1], ")"
)),
marker = list(
size = 10,
color = tada.pal[10]
Expand Down Expand Up @@ -1173,15 +1170,12 @@ TADA_DepthProfilePlot <- function(.data,
plotly::add_lines(
y = param1$TADA.ResultMeasureValue[1],
x = xrange,
name = stringr::str_remove_all(stringr::str_remove_all(
stringr::str_remove_all(paste0(
param1$TADA.ResultSampleFractionText[1], " ",
param1$TADA.CharacteristicName[1], " ",
param1$TADA.MethodSpeciationName[1], " ",
"(", param1$TADA.ResultMeasure.MeasureUnitCode[1], ")"
), stringr::fixed(" (NA)")),
stringr::fixed("NA ")
), stringr::fixed(" NA")),
name = TADA_CharStringRemoveNA(paste0(
param1$TADA.ResultSampleFractionText[1], " ",
param1$TADA.CharacteristicName[1], " ",
param1$TADA.MethodSpeciationName[1], " ",
"(", param1$TADA.ResultMeasure.MeasureUnitCode[1], ")"
)),
showlegend = TRUE,
line = list(color = tada.pal[10], dash = "dash"),
hoverinfo = "text",
Expand All @@ -1208,15 +1202,12 @@ TADA_DepthProfilePlot <- function(.data,
data = param2,
x = ~TADA.ResultMeasureValue,
y = ~TADA.ConsolidatedDepth,
name = stringr::str_remove_all(stringr::str_remove_all(
stringr::str_remove_all(paste0(
param2$TADA.ResultSampleFractionText[1], " ",
param2$TADA.CharacteristicName[1], " ",
param2$TADA.MethodSpeciationName[1], " ",
"(", param2$TADA.ResultMeasure.MeasureUnitCode[1], ")"
), stringr::fixed(" (NA)")),
stringr::fixed("NA ")
), stringr::fixed(" NA")),
name = TADA_CharStringRemoveNA(paste0(
param2$TADA.ResultSampleFractionText[1], " ",
param2$TADA.CharacteristicName[1], " ",
param2$TADA.MethodSpeciationName[1], " ",
"(", param2$TADA.ResultMeasure.MeasureUnitCode[1], ")"
)),
marker = list(
size = 10,
color = tada.pal[12]
Expand Down Expand Up @@ -1245,15 +1236,12 @@ TADA_DepthProfilePlot <- function(.data,
plotly::add_lines(
y = param2$TADA.ResultMeasureValue[1],
x = xrange,
name = stringr::str_remove_all(stringr::str_remove_all(
stringr::str_remove_all(paste0(
param2$TADA.ResultSampleFractionText[1], " ",
param2$TADA.CharacteristicName[1], " ",
param2$TADA.MethodSpeciationName[1], " ",
"(", param2$TADA.ResultMeasure.MeasureUnitCode[1], ")"
), stringr::fixed(" (NA)")),
stringr::fixed("NA ")
), stringr::fixed(" NA")),
name = TADA_CharStringRemoveNA(paste0(
param2$TADA.ResultSampleFractionText[1], " ",
param2$TADA.CharacteristicName[1], " ",
param2$TADA.MethodSpeciationName[1], " ",
"(", param2$TADA.ResultMeasure.MeasureUnitCode[1], ")"
)),
# inherit = FALSE,
showlegend = TRUE,
line = list(color = tada.pal[12], dash = "dash"),
Expand Down Expand Up @@ -1281,15 +1269,12 @@ TADA_DepthProfilePlot <- function(.data,
data = param3,
x = ~TADA.ResultMeasureValue,
y = ~TADA.ConsolidatedDepth,
name = stringr::str_remove_all(stringr::str_remove_all(
stringr::str_remove_all(paste0(
param3$TADA.ResultSampleFractionText[1], " ",
param3$TADA.CharacteristicName[1], " ",
param3$TADA.MethodSpeciationName[1], " ",
"(", param3$TADA.ResultMeasure.MeasureUnitCode[1], ")"
), stringr::fixed(" (NA)")),
stringr::fixed("NA ")
), stringr::fixed(" NA")),
name = TADA_CharStringRemoveNA(paste0(
param3$TADA.ResultSampleFractionText[1], " ",
param3$TADA.CharacteristicName[1], " ",
param3$TADA.MethodSpeciationName[1], " ",
"(", param3$TADA.ResultMeasure.MeasureUnitCode[1], ")"
)),
marker = list(
size = 10,
color = tada.pal[11]
Expand Down Expand Up @@ -1318,15 +1303,12 @@ TADA_DepthProfilePlot <- function(.data,
plotly::add_lines(
y = param3$TADA.ResultMeasureValue[1],
x = xrange,
name = stringr::str_remove_all(stringr::str_remove_all(
stringr::str_remove_all(paste0(
param3$TADA.ResultSampleFractionText[1], " ",
param3$TADA.CharacteristicName[1], " ",
param3$TADA.MethodSpeciationName[1], " ",
"(", param3$TADA.ResultMeasure.MeasureUnitCode[1], ")"
), stringr::fixed(" (NA)")),
stringr::fixed("NA ")
), stringr::fixed(" NA")),
name = TADA_CharStringRemoveNA(paste0(
param3$TADA.ResultSampleFractionText[1], " ",
param3$TADA.CharacteristicName[1], " ",
param3$TADA.MethodSpeciationName[1], " ",
"(", param3$TADA.ResultMeasure.MeasureUnitCode[1], ")"
)),
# inherit = FALSE,
showlegend = TRUE,
line = list(color = tada.pal[11], dash = "dash"),
Expand Down
Loading