Update app.R

app.R

@@ -1438,30 +1438,32 @@ create_tableau_location_plot <- function(pitcher_df, pitch_colors) {
 # =====================================================================
 create_tableau_movement_plot <- function(pitcher_df, pitch_colors) {
   filter_types <- get_valid_pitch_types(pitcher_df)
-  
+
   df <- pitcher_df %>%
     filter(TaggedPitchType %in% filter_types,
            !is.na(HorzBreak), !is.na(InducedVertBreak))
-  
+
   if (nrow(df) == 0) {
-    return(ggplot() + theme_void() + 
+    return(ggplot() + theme_void() +
              labs(title = "Movement Profile") +
              theme(plot.title = element_text(size = 12, face = "bold", hjust = 0.5)))
   }
-  
-  ggplot(df, aes(x = HorzBreak, y = InducedVertBreak, color = TaggedPitchType)) +
+
+  ggplot(df, aes(x = HorzBreak, y = InducedVertBreak)) +
     geom_vline(xintercept = 0, color = "black", linewidth = 0.4) +
     geom_hline(yintercept = 0, color = "black", linewidth = 0.4) +
-    geom_point(size = 4, alpha = 1, shape = 21, color = "black", stroke = 2) +
-    scale_color_manual(values = pitch_colors) +
-    coord_cartesian(xlim = c(-25, 25), ylim = c(-25, 25)) +
+    # shape 21 uses fill for the inside color
+    geom_point(aes(fill = TaggedPitchType), size = 4, alpha = 1,
+               shape = 21, color = "black", stroke = 0.9) +
+    scale_fill_manual(values = pitch_colors, drop = FALSE) +
+    coord_cartesian(xlim = c(-30, 30), ylim = c(-30, 30)) +
     labs(title = "Movement Profile", x = "HB", y = "IVB") +
     theme_minimal() +
     theme(
-      plot.title = element_text(size = 9, face = "bold", hjust = 0.5),
+      plot.title = element_text(size = 12, face = "bold", hjust = 0.5),
       legend.position = "none",
-      axis.title = element_text(size = 7),
-      axis.text = element_text(size = 6),
+      axis.title = element_text(size = 10),
+      axis.text = element_text(size = 9),
       plot.margin = margin(2, 2, 2, 2)
     )
 }
@@ -1471,116 +1473,163 @@ create_tableau_movement_plot <- function(pitcher_df, pitch_colors) {
 # =====================================================================
 create_tableau_release_plot <- function(pitcher_df, pitch_colors) {
   filter_types <- get_valid_pitch_types(pitcher_df)
-  
+
   df <- pitcher_df %>%
     filter(TaggedPitchType %in% filter_types,
            !is.na(RelSide), !is.na(RelHeight))
-  
+
   if (nrow(df) == 0) {
-    return(ggplot() + theme_void() + 
+    return(ggplot() + theme_void() +
              labs(title = "Release Plot") +
              theme(plot.title = element_text(size = 10, face = "bold", hjust = 0.5)))
   }
-  
-  # Mound arc
+
   mound_theta <- seq(0, pi, length.out = 100)
   mound_radius <- 3
   mound_df <- data.frame(
     x = mound_radius * cos(mound_theta),
     y = mound_radius * sin(mound_theta) * 0.35
   )
-  
+
   ggplot(df, aes(x = RelSide, y = RelHeight)) +
-    geom_polygon(data = mound_df, aes(x = x, y = y), 
+    geom_polygon(data = mound_df, aes(x = x, y = y),
                  fill = "#C0392B", color = NA, inherit.aes = FALSE) +
-    annotate("rect", xmin = -0.5, xmax = 0.5, ymin = 0.85, ymax = 1.05, 
+    annotate("rect", xmin = -0.5, xmax = 0.5, ymin = 0.85, ymax = 1.05,
              fill = "white", color = "gray40", linewidth = 0.3) +
     geom_vline(xintercept = 0, color = "gray60", linetype = "dashed", linewidth = 0.3) +
-    geom_point(aes(color = TaggedPitchType), size = 4, alpha = 1, shape = 21, stroke = 2, color = "black") +
-    scale_color_manual(values = pitch_colors) +
+    geom_point(aes(fill = TaggedPitchType), size = 4, alpha = 1,
+               shape = 21, color = "black", stroke = 0.9) +
+    scale_fill_manual(values = pitch_colors, drop = FALSE) +
     coord_cartesian(xlim = c(-4, 4), ylim = c(0, 7)) +
     labs(title = "Release Plot", x = "Side", y = "Height") +
     theme_minimal() +
     theme(
-      plot.title = element_text(size = 9, face = "bold", hjust = 0.5),
+      plot.title = element_text(size = 12, face = "bold", hjust = 0.5),
       legend.position = "none",
-      axis.title = element_text(size = 7),
-      axis.text = element_text(size = 6),
+      axis.title = element_text(size = 10),
+      axis.text = element_text(size = 9),
       plot.margin = margin(2, 2, 2, 2)
     )
 }
 
 # =====================================================================
-# TABLE DRAWING - Compact with bigger text
+# TABLE DRAWING (BIG + AUTO-SCALED TO FILL A RECTANGLE)
 # =====================================================================
-draw_tableau_table_v3 <- function(title, data, metrics, pitch_types, pitch_colors, 
-                                   x_start, y_start, col_w = 0.075, row_h = 0.014) {
-  
+draw_tableau_table_fill <- function(
+  title,
+  data,
+  rows,                 # a named vector: names = display label, values = column name in `data`
+  pitch_types,
+  pitch_colors,
+  x, y,                 # TOP-LEFT anchor of the table block (npc)
+  width, height         # size of the table block (npc)
+) {
+  if (is.null(pitch_types) || length(pitch_types) == 0) pitch_types <- "Undefined"
+
+  n_cols <- length(pitch_types)
+  n_rows <- length(rows) + 1  # +1 header row
+
+  # Leave some space for the title
+  title_h <- min(0.06, height * 0.20)
+  table_top <- y - title_h
+  table_h <- height - title_h
+
+  col_w <- width / n_cols
+  row_h <- table_h / n_rows
+
+  # Scale font to row height (tuned for letter portrait)
+  header_cex <- max(0.9, min(1.6, row_h * 28))
+  body_cex   <- max(0.85, min(1.5, row_h * 26))
+  label_cex  <- max(0.85, min(1.5, row_h * 26))
+  title_cex  <- max(1.1, min(1.9, row_h * 30))
+
   # Title
-  grid.text(title, x = x_start + length(pitch_types) * col_w / 2, y = y_start + 0.018, 
-            gp = gpar(fontface = "bold", cex = 0.65, col = "#006F71"))
-  
+  grid.text(
+    title,
+    x = x + width/2,
+    y = y,
+    gp = gpar(fontface = "bold", cex = title_cex, col = "#006F71")
+  )
+
   # Column headers (pitch types)
-  header_y <- y_start
   for (i in seq_along(pitch_types)) {
     pt <- pitch_types[i]
-    col_color <- if (pt %in% names(pitch_colors)) pitch_colors[pt] else "#95A5A6"
-    
-    grid.rect(x = x_start + (i-1)*col_w, y = header_y, 
-              width = col_w * 0.96, height = row_h,
-              just = c("left", "center"),
-              gp = gpar(fill = col_color, col = "gray60", lwd = 0.3))
-    
-    # Abbreviate long pitch names
-    pt_short <- gsub("ChangeUp", "CH", pt)
-    pt_short <- gsub("Fastball", "FB", pt_short)
+    col_color <- if (pt %in% names(pitch_colors)) pitch_colors[[pt]] else "#95A5A6"
+
+    grid.rect(
+      x = x + (i-1)*col_w,
+      y = table_top,
+      width = col_w * 0.98,
+      height = row_h * 0.95,
+      just = c("left", "top"),
+      gp = gpar(fill = col_color, col = "gray30", lwd = 0.6)
+    )
+
+    pt_short <- pt
+    pt_short <- gsub("ChangeUp|Changeup", "CH", pt_short)
+    pt_short <- gsub("Fastball|Four-Seam|FourSeamFastBall|Four-Seam Fastball|4-Seam Fastball|Four-Seam", "FB", pt_short)
     pt_short <- gsub("Curveball", "CB", pt_short)
     pt_short <- gsub("Slider", "SL", pt_short)
     pt_short <- gsub("Sinker", "SI", pt_short)
     pt_short <- gsub("Cutter", "CT", pt_short)
     pt_short <- gsub("Splitter", "SP", pt_short)
     pt_short <- gsub("Sweeper", "SW", pt_short)
-    
-    grid.text(pt_short, x = x_start + (i-1)*col_w + col_w/2, y = header_y,
-              gp = gpar(col = "white", cex = 0.42, fontface = "bold"))
+
+    grid.text(
+      pt_short,
+      x = x + (i-1)*col_w + col_w/2,
+      y = table_top - row_h*0.48,
+      gp = gpar(col = "white", cex = header_cex, fontface = "bold")
+    )
   }
-  
+
   # Data rows
-  for (m in seq_along(metrics)) {
-    metric_name <- metrics[m]
-    y_pos <- header_y - m * row_h
-    
-    # Row label - abbreviated
-    metric_short <- gsub("Usage vs. ", "", metric_name)
-    metric_short <- gsub("Avg. ", "", metric_short)
-    metric_short <- gsub("Max. ", "Max ", metric_short)
-    metric_short <- gsub("Pitch Count", "#", metric_short)
-    metric_short <- gsub(" Rate", "", metric_short)
-    
-    grid.text(metric_short, x = x_start - 0.008, y = y_pos, just = "right",
-              gp = gpar(cex = 0.42, fontface = "bold"))
-    
-    # Values for each pitch type
+  row_names <- names(rows)
+  col_names <- as.character(rows)
+
+  for (r in seq_along(col_names)) {
+    disp <- row_names[r]
+    coln <- col_names[r]
+    y_row_top <- table_top - r*row_h
+
+    # Row label on the left (slightly outside the block)
+    grid.text(
+      disp,
+      x = x - 0.010,
+      y = y_row_top - row_h*0.55,
+      just = "right",
+      gp = gpar(cex = label_cex, fontface = "bold")
+    )
+
     for (i in seq_along(pitch_types)) {
       pt <- pitch_types[i]
       idx <- which(data$TaggedPitchType == pt)
-      val <- if (length(idx) > 0 && metric_name %in% names(data)) {
-        as.character(data[[metric_name]][idx])
-      } else {
-        "-"
+
+      val <- "-"
+      if (length(idx) > 0 && coln %in% names(data)) {
+        val <- as.character(data[[coln]][idx[1]])
       }
-      
-      grid.rect(x = x_start + (i-1)*col_w, y = y_pos,
-                width = col_w * 0.96, height = row_h * 0.92,
-                just = c("left", "center"),
-                gp = gpar(fill = "white", col = "gray80", lwd = 0.2))
-      
-      grid.text(val, x = x_start + (i-1)*col_w + col_w/2, y = y_pos,
-                gp = gpar(cex = 0.40))
+
+      grid.rect(
+        x = x + (i-1)*col_w,
+        y = y_row_top,
+        width = col_w * 0.98,
+        height = row_h * 0.95,
+        just = c("left", "top"),
+        gp = gpar(fill = "white", col = "gray40", lwd = 0.6)
+      )
+
+      grid.text(
+        val,
+        x = x + (i-1)*col_w + col_w/2,
+        y = y_row_top - row_h*0.55,
+        gp = gpar(cex = body_cex, fontface = "plain")
+      )
     }
   }
 }
 
+
 # =====================================================================
 # MAIN PDF FUNCTION
 # =====================================================================
@@ -1708,56 +1757,52 @@ create_tableau_pitcher_pdf <- function(game_df, pitcher_name, output_file) {
   # =====================================================================
   # TABLES - Farther right, more compact, bigger text
   # =====================================================================
+table_x <- 0.54
+table_w <- 0.43   # wide right block
+# Each table gets a tall rectangle
+draw_tableau_table_fill(
+  title = "Location Data",
+  data = loc_data,
+  rows = c("Zone%"="Zone%", "Edge%"="Edge%", "Strike%"="Strike%", "Whiff%"="Whiff%"),
+  pitch_types = pitch_types,
+  pitch_colors = tableau_pitch_colors,
+  x = table_x, y = 0.80, width = table_w, height = 0.18
+)
+
   
-  # Adjust table position based on number of pitch types
-  n_types <- length(pitch_types)
-  col_w <- min(0.085, 0.42 / max(1, n_types))
-  table_x <- 0.54
-  
-  # Location Data table
-  draw_tableau_table_v3(
-    title = "Location Data",
-    data = loc_data,
-    metrics = c("Zone%", "Edge%", "Strike%", "Whiff%"),
-    pitch_types = pitch_types,
-    pitch_colors = tableau_pitch_colors,
-    x_start = table_x, y_start = 0.78,
-    col_w = col_w, row_h = 0.014
-  )
-  
-  # Pitch Usage table
-  draw_tableau_table_v3(
-    title = "Pitch Usage",
-    data = usage_data,
-    metrics = c("Usage vs. LHH", "Usage vs. RHH", "Pitch Count"),
-    pitch_types = pitch_types,
-    pitch_colors = tableau_pitch_colors,
-    x_start = table_x, y_start = 0.66,
-    col_w = col_w, row_h = 0.014
-  )
-  
-  # Velo & Movement table
-  draw_tableau_table_v3(
-    title = "Velo & Movement",
-    data = velo_data,
-    metrics = c("Avg. Velo", "Max. Velo", "Avg. Spin", "Max. Spin", "Avg. IVB", "Avg. HB"),
-    pitch_types = pitch_types,
-    pitch_colors = tableau_pitch_colors,
-    x_start = table_x, y_start = 0.52,
-    col_w = col_w, row_h = 0.013
-  )
-  
-  # Release Data table
-  draw_tableau_table_v3(
-    title = "Release Data",
-    data = rel_data,
-    metrics = c("Rel Ht", "vs FB", "Rel Side", "vs FB (S)", "Ext"),
-    pitch_types = pitch_types,
-    pitch_colors = tableau_pitch_colors,
-    x_start = table_x, y_start = 0.36,
-    col_w = col_w, row_h = 0.013
-  )
-  
+draw_tableau_table_fill(
+  title = "Pitch Usage",
+  data = usage_data,
+  rows = c("Usage vs. LHH"="Usage vs. LHH", "Usage vs. RHH"="Usage vs. RHH", "Pitch Count"="Pitch Count"),
+  pitch_types = pitch_types,
+  pitch_colors = tableau_pitch_colors,
+  x = table_x, y = 0.60, width = table_w, height = 0.18
+)
+
+draw_tableau_table_fill(
+  title = "Velo & Movement",
+  data = velo_data,
+  rows = c("Avg. Velo"="Avg. Velo", "Max Velo"="Max. Velo", "Avg. Spin"="Avg. Spin",
+           "Max Spin"="Max. Spin", "Avg. IVB"="Avg. IVB", "Avg. HB"="Avg. HB"),
+  pitch_types = pitch_types,
+  pitch_colors = tableau_pitch_colors,
+  x = table_x, y = 0.40, width = table_w, height = 0.22
+)
+
+# IMPORTANT: your old call was using fake column names, so it printed "-" everywhere.
+draw_tableau_table_fill(
+  title = "Release Data",
+  data = rel_data,
+  rows = c("Rel Ht"="Avg. Rel Ht",
+           "Rel Ht vs FB (in)"="Rel Ht vs. FB",
+           "Rel Side"="Avg. Rel Side",
+           "Rel Side vs FB (in)"="Rel Side vs. FB",
+           "Ext"="Avg. Ext"),
+  pitch_types = pitch_types,
+  pitch_colors = tableau_pitch_colors,
+  x = table_x, y = 0.14, width = table_w, height = 0.22
+)
+                        
   invisible(output_file)
 }