Commit: tip - myprojects-hg-reborn (hg)

Commit MetaInfo

• Révision: 646bddfa8bc1583d0c8546d13c5f31fc79aacb1d (tree)
• l'heure: 2024-12-19 23:03:15
• Auteur: Lorenzo Isella <lorenzo.isella@gmai...>
• Commiter: Lorenzo Isella

Message de Log

I improved the theme.

Change Summary

• modified: R-codes/stat_lib.R

Modification

diff -r 8abc5e0d1aa9 -r 646bddfa8bc1 R-codes/stat_lib.R
--- a/R-codes/stat_lib.R	Thu Dec 19 11:48:06 2024 +0100
+++ b/R-codes/stat_lib.R	Thu Dec 19 15:03:15 2024 +0100
@@ -1418,37 +1418,115 @@
 
 
 
-
-my_ggplot_theme2 <- function(legend_coord){
-    theme_bw()+
-
-    theme(## legend.title = element_text(vjust=1,lineheight=1, size=14 ),
-
-        legend.title = element_text(vjust = 1,lineheight=1,
-                                    size=14, margin = margin(t = 4.5)),
-        legend.spacing.y = grid::unit(3, "pt"),
-        ## legend.text.align = 0.5,
-          ## legend.text = element_text(hjust=0.5),
-          panel.grid.minor = element_blank(),
-          plot.title = element_text(lineheight=.8, size=24, face="bold",
-                                    vjust=1),
-        legend.text = element_text(vjust=.4, hjust=0.5, lineheight=1,size = 14 ),
-          axis.title.x = element_text(size = 20, vjust=1),
-                axis.title.y = element_text(size = 20, angle=90, vjust=1),
-                axis.text.x = element_text(size=15, colour="black", vjust=1),
-          axis.text.y = element_text(size=15, colour="black", hjust=1),
-        legend.position.inside = legend_coord,
-        ## legend.position = legend_coord,
-           strip.background = element_rect(colour = 'blue',
-                           fill = 'white', linewidth = 1, linetype=1),
-                strip.text.x = element_text(colour = 'red', angle = 0,
-                                     size = 12, hjust = 0.5,
-                    vjust = 0.5, face = 'bold'),
-                   strip.text.y = element_text(colour = 'red', angle = 0,
-                    size = 12, hjust = 0.5,
-                    vjust = 0.5, face = 'bold'),
+## my_ggplot_theme2 <- function(legend_coord){
+##     theme_bw()+
+
+##     theme(## legend.title = element_text(vjust=1,lineheight=1, size=14 ),
+
+##         legend.title = element_text(vjust = 1,lineheight=1,
+##                                     size=14, margin = margin(t = 4.5)),
+##         legend.spacing.y = grid::unit(3, "pt"),
+##         ## legend.text.align = 0.5,
+##           ## legend.text = element_text(hjust=0.5),
+##           panel.grid.minor = element_blank(),
+##           plot.title = element_text(lineheight=.8, size=24, face="bold",
+##                                     vjust=1),
+##         legend.text = element_text(vjust=.4, hjust=0.5, lineheight=1,size = 14 ),
+##           axis.title.x = element_text(size = 20, vjust=1),
+##                 axis.title.y = element_text(size = 20, angle=90, vjust=1),
+##                 axis.text.x = element_text(size=15, colour="black", vjust=1),
+##           axis.text.y = element_text(size=15, colour="black", hjust=1),
+##         legend.position.inside = legend_coord,
+##         ## legend.position = legend_coord,
+##            strip.background = element_rect(colour = 'blue',
+##                            fill = 'white', linewidth = 1, linetype=1),
+##                 strip.text.x = element_text(colour = 'red', angle = 0,
+##                                      size = 12, hjust = 0.5,
+##                     vjust = 0.5, face = 'bold'),
+##                    strip.text.y = element_text(colour = 'red', angle = 0,
+##                     size = 12, hjust = 0.5,
+##                     vjust = 0.5, face = 'bold'),
      
-          )
+##           )
+## }
+
+
+
+## chatgpt revision
+
+my_ggplot_theme2 <- function(legend_coord) {
+  theme_bw() +
+    theme(
+      # Legend settings
+      legend.title = element_text(
+        vjust = 1,
+        lineheight = 1,
+        size = 14,
+        margin = margin(t = 4.5)
+      ),
+      legend.text = element_text(
+        vjust = 0.4,
+        hjust = 0.5,
+        lineheight = 1,
+        size = 14
+      ),
+      legend.spacing.y = grid::unit(3, "pt"),
+      
+      # Conditionally handle legend position
+      legend.position = if (is.character(legend_coord)) {
+        legend_coord
+      } else if (is.numeric(legend_coord) && length(legend_coord) == 2) {
+        "none" # Temporarily set a default
+      } else {
+        stop("`legend_coord` must be a character or a numeric vector of length 2.")
+      },
+      legend.position.inside = if (is.numeric(legend_coord) && length(legend_coord) == 2) {
+        legend_coord
+      } else {
+        NULL
+      },
+
+      # Plot title
+      plot.title = element_text(
+        lineheight = 0.8,
+        size = 24,
+        face = "bold",
+        vjust = 1
+      ),
+
+      # Axis titles
+      axis.title.x = element_text(size = 20, vjust = 1),
+      axis.title.y = element_text(size = 20, angle = 90, vjust = 1),
+
+      # Axis text
+      axis.text.x = element_text(size = 15, colour = "black", vjust = 1),
+      axis.text.y = element_text(size = 15, colour = "black", hjust = 1),
+
+      # Strip settings
+      strip.background = element_rect(
+        colour = 'blue',
+        fill = 'white',
+        linewidth = 1,
+        linetype = 1
+      ),
+      strip.text.x = element_text(
+        colour = 'red',
+        size = 12,
+        hjust = 0.5,
+        vjust = 0.5,
+        face = 'bold'
+      ),
+      strip.text.y = element_text(
+        colour = 'red',
+        size = 12,
+        hjust = 0.5,
+        vjust = 0.5,
+        face = 'bold'
+      ),
+
+      # Grid lines
+      panel.grid.minor = element_blank()
+    )
 }