Skip to content

Commit 4164ddc

Browse files
MouksassiMouksassi
Mouksassi
authored and
Mouksassi
committed
add more colors to the default manual scales for a total of 10
1 parent 21281c4 commit 4164ddc

File tree

4 files changed

+28
-14
lines changed

4 files changed

+28
-14
lines changed

‎R/ggcontinuousexpdist.R‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1343,9 +1343,11 @@ ggcontinuousexpdist <- function(data = effICGI,
13431343
}
13441344
if( theme_certara && !fit_by_color_fill){
13451345
pf <- pf1 +
1346-
ggplot2::scale_colour_manual(values = c( "#4682AC","#FDBB2F","#EE3124" ,"#336343","#7059a6", "#803333"),
1346+
ggplot2::scale_colour_manual(values = c( "#4682AC","#FDBB2F","#EE3124","#336343","#7059a6", "#803333",
1347+
"#2F71FD","#093B6D","#EF761B","#279594"),
13471348
drop=FALSE,na.value = "grey50")+
1348-
ggplot2::scale_fill_manual( values = c("gray80","#4682AC","#FDBB2F","#EE3124" ,"#336343","#7059a6", "#803333"),
1349+
ggplot2::scale_fill_manual( values = c("gray80","#4682AC","#FDBB2F","#EE3124","#336343","#7059a6", "#803333",
1350+
"#2F71FD","#093B6D","#EF761B","#279594"),
13491351
drop=FALSE,na.value = "grey50")+
13501352
ggplot2::theme(strip.background = ggplot2::element_rect(fill="#475c6b"),
13511353
strip.text = ggplot2::element_text(face = "bold",color = "white"))
@@ -1359,9 +1361,11 @@ ggcontinuousexpdist <- function(data = effICGI,
13591361
}
13601362
if( theme_certara && fit_by_color_fill){
13611363
pf <- pf1 +
1362-
ggplot2::scale_colour_manual(values = c("#4682AC","#FDBB2F","#EE3124" ,"#336343","#7059a6", "#803333"),
1364+
ggplot2::scale_colour_manual(values = c("#4682AC","#FDBB2F","#EE3124","#336343","#7059a6", "#803333",
1365+
"#2F71FD","#093B6D","#EF761B","#279594"),
13631366
drop=FALSE,na.value = "grey50")+
1364-
ggplot2::scale_fill_manual( values = c("#4682AC","#FDBB2F","#EE3124" ,"#336343","#7059a6", "#803333"),
1367+
ggplot2::scale_fill_manual( values = c("#4682AC","#FDBB2F","#EE3124","#336343","#7059a6", "#803333",
1368+
"#2F71FD","#093B6D","#EF761B","#279594"),
13651369
drop=FALSE,na.value = "grey50")+
13661370
ggplot2::theme(strip.background = ggplot2::element_rect(fill="#475c6b"),
13671371
strip.text = ggplot2::element_text(face = "bold",color = "white"))

‎R/ggkmrisktable.R‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -808,9 +808,11 @@ ggkmrisktable <- function(data = lung_long, # long format filter to Endpoint of
808808
}
809809
if(theme_certara){
810810
pf <- plotkm +
811-
ggplot2::scale_colour_manual(values = c( "#4682AC","#FDBB2F","#EE3124" ,"#336343","#7059a6", "#803333"),
811+
ggplot2::scale_colour_manual(values = c( "#4682AC","#FDBB2F","#EE3124","#336343","#7059a6", "#803333",
812+
"#2F71FD","#093B6D","#EF761B","#279594"),
812813
drop=FALSE,na.value = "grey50")+
813-
ggplot2::scale_fill_manual( values = c( "#4682AC","#FDBB2F","#EE3124" ,"#336343","#7059a6", "#803333"),
814+
ggplot2::scale_fill_manual( values = c( "#4682AC","#FDBB2F","#EE3124","#336343","#7059a6", "#803333",
815+
"#2F71FD","#093B6D","#EF761B","#279594"),
814816
drop=FALSE,na.value = "grey50")+
815817
ggplot2::theme(strip.background = ggplot2::element_rect(fill="#475c6b"),
816818
strip.text = ggplot2::element_text(face = "bold",color = "white"))

‎R/gglogisticexpdist.R‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,9 +1268,11 @@ if(!exposure_distribution_percent){
12681268
}
12691269
if( theme_certara && !logistic_by_color_fill){
12701270
pf <- pf1 +
1271-
ggplot2::scale_colour_manual(values = c( "#4682AC","#FDBB2F","#EE3124" ,"#336343","#7059a6", "#803333"),
1271+
ggplot2::scale_colour_manual(values = c("#4682AC","#FDBB2F","#EE3124","#336343","#7059a6", "#803333",
1272+
"#2F71FD","#093B6D","#EF761B","#279594"),
12721273
drop=FALSE,na.value = "grey50")+
1273-
ggplot2::scale_fill_manual( values = c("gray80","#4682AC","#FDBB2F","#EE3124" ,"#336343","#7059a6", "#803333"),
1274+
ggplot2::scale_fill_manual( values = c("gray80","#4682AC","#FDBB2F","#EE3124","#336343","#7059a6", "#803333",
1275+
"#2F71FD","#093B6D","#EF761B","#279594"),
12741276
drop=FALSE,na.value = "grey50")+
12751277
ggplot2::theme(strip.background = ggplot2::element_rect(fill="#475c6b"),
12761278
strip.text = ggplot2::element_text(face = "bold",color = "white"))
@@ -1284,9 +1286,11 @@ if(!exposure_distribution_percent){
12841286
}
12851287
if( theme_certara && logistic_by_color_fill){
12861288
pf <- pf1 +
1287-
ggplot2::scale_colour_manual(values = c("#4682AC","#FDBB2F","#EE3124" ,"#336343","#7059a6", "#803333"),
1289+
ggplot2::scale_colour_manual(values = c("#4682AC","#FDBB2F","#EE3124","#336343","#7059a6", "#803333",
1290+
"#2F71FD","#093B6D","#EF761B","#279594"),
12881291
drop=FALSE,na.value = "grey50")+
1289-
ggplot2::scale_fill_manual( values = c("#4682AC","#FDBB2F","#EE3124" ,"#336343","#7059a6", "#803333"),
1292+
ggplot2::scale_fill_manual( values = c("#4682AC","#FDBB2F","#EE3124","#336343","#7059a6", "#803333",
1293+
"#2F71FD","#093B6D","#EF761B","#279594"),
12901294
drop=FALSE,na.value = "grey50")+
12911295
ggplot2::theme(strip.background = ggplot2::element_rect(fill="#475c6b"),
12921296
strip.text = ggplot2::element_text(face = "bold",color = "white"))

‎R/ggresponseexpdist.R‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1764,9 +1764,11 @@ if(!exposure_distribution_percent=="none"){
17641764
}
17651765
if( theme_certara && !fit_by_color_fill){
17661766
pf <- pf1 +
1767-
ggplot2::scale_colour_manual(values = c( "#4682AC","#FDBB2F","#EE3124" ,"#336343","#7059a6", "#803333"),
1767+
ggplot2::scale_colour_manual(values = c( "#4682AC","#FDBB2F","#EE3124","#336343","#7059a6", "#803333",
1768+
"#2F71FD","#093B6D","#EF761B","#279594"),
17681769
drop=FALSE,na.value = "grey50")+
1769-
ggplot2::scale_fill_manual( values = c("gray80","#4682AC","#FDBB2F","#EE3124" ,"#336343","#7059a6", "#803333"),
1770+
ggplot2::scale_fill_manual( values = c("gray80","#4682AC","#FDBB2F","#EE3124","#336343","#7059a6", "#803333",
1771+
"#2F71FD","#093B6D","#EF761B","#279594"),
17701772
drop=FALSE,na.value = "grey50")+
17711773
ggplot2::theme(strip.background = ggplot2::element_rect(fill="#475c6b"),
17721774
strip.text = ggplot2::element_text(face = "bold",color = "white"))
@@ -1780,9 +1782,11 @@ if(!exposure_distribution_percent=="none"){
17801782
}
17811783
if( theme_certara && fit_by_color_fill){
17821784
pf <- pf1 +
1783-
ggplot2::scale_colour_manual(values = c("#4682AC","#FDBB2F","#EE3124" ,"#336343","#7059a6", "#803333"),
1785+
ggplot2::scale_colour_manual(values = "#4682AC","#FDBB2F","#EE3124","#336343","#7059a6", "#803333",
1786+
"#2F71FD","#093B6D","#EF761B","#279594"),
17841787
drop=FALSE,na.value = "grey50")+
1785-
ggplot2::scale_fill_manual( values = c("#4682AC","#FDBB2F","#EE3124" ,"#336343","#7059a6", "#803333"),
1788+
ggplot2::scale_fill_manual( values = "#4682AC","#FDBB2F","#EE3124","#336343","#7059a6", "#803333",
1789+
"#2F71FD","#093B6D","#EF761B","#279594"),
17861790
drop=FALSE,na.value = "grey50")+
17871791
ggplot2::theme(strip.background = ggplot2::element_rect(fill="#475c6b"),
17881792
strip.text = ggplot2::element_text(face = "bold",color = "white"))

0 commit comments

Comments
 (0)