Update app.R

app.R

@@ -159,10 +159,6 @@ app_css <- "
 }
 "
 
-# =====================================================================
-# ======================  HITTER CODE (VERBATIM)  ======================
-# =====================================================================
-
 process_dataset <- function(df) {
   if ("Batter" %in% names(df)) {
     df <- df %>% mutate(Batter = stringr::str_replace(Batter, "^\\s*(\\w+)\\s*,\\s*(\\w+)\\s*$", "\\2 \\1"))
@@ -1590,14 +1586,12 @@ draw_tableau_table_fill <- function(
   }
 }
 
-# =====================================================================
-# MAIN PDF FUNCTION
-# =====================================================================
+
 create_tableau_pitcher_pdf <- function(game_df, pitcher_name, output_file) {
   if (length(dev.list()) > 0) try(dev.off(), silent = TRUE)
 
   pitcher_df <- process_tableau_pitcher_data(game_df) %>%
-    filter(Pitcher == pitcher_name)
+    dplyr::filter(Pitcher == pitcher_name)
 
   if (nrow(pitcher_df) == 0) {
     pdf(output_file, width = 8.5, height = 11)
@@ -1608,6 +1602,7 @@ create_tableau_pitcher_pdf <- function(game_df, pitcher_name, output_file) {
     return(output_file)
   }
 
+  # ---- metadata ----
   game_date <- tryCatch({
     d <- unique(pitcher_df$Date)[1]
     if (inherits(d, "Date")) format(d, "%m/%d/%Y") else as.character(d)
@@ -1617,26 +1612,40 @@ create_tableau_pitcher_pdf <- function(game_df, pitcher_name, output_file) {
   batter_teams <- batter_teams[!is.na(batter_teams)]
   away_team <- if (length(batter_teams) > 0) batter_teams[1] else "Unknown"
 
-  stats <- calculate_tableau_header_stats(pitcher_df)
-  loc_data <- calculate_tableau_location_data(pitcher_df)
+  # ---- calculations ----
+  stats      <- calculate_tableau_header_stats(pitcher_df)
+  loc_data   <- calculate_tableau_location_data(pitcher_df)
   usage_data <- calculate_tableau_pitch_usage(pitcher_df)
-  velo_data <- calculate_tableau_velo_movement(pitcher_df)
-  rel_data <- calculate_tableau_release_data(pitcher_df)
+  velo_data  <- calculate_tableau_velo_movement(pitcher_df)
+  rel_data   <- calculate_tableau_release_data(pitcher_df)
+
+  # Pitch types ordered by usage (Pitch Count desc), then append any that appear elsewhere
+  usage_order <- usage_data %>%
+    dplyr::arrange(dplyr::desc(`Pitch Count`)) %>%
+    dplyr::pull(TaggedPitchType) %>%
+    unique()
+
+  other_types <- unique(c(loc_data$TaggedPitchType, velo_data$TaggedPitchType, rel_data$TaggedPitchType))
+  other_types <- other_types[!is.na(other_types) & other_types != ""]
+  usage_order <- usage_order[!is.na(usage_order) & usage_order != ""]
 
-  pitch_types <- unique(c(loc_data$TaggedPitchType, usage_data$TaggedPitchType))
-  pitch_types <- pitch_types[!is.na(pitch_types) & pitch_types != ""]
+  pitch_types <- unique(c(usage_order, setdiff(other_types, usage_order)))
   if (length(pitch_types) == 0) pitch_types <- "Undefined"
 
+  # ---- plots ----
   loc_plot <- create_tableau_location_plot(pitcher_df, tableau_pitch_colors)
   mov_plot <- create_tableau_movement_plot(pitcher_df, tableau_pitch_colors)
   rel_plot <- create_tableau_release_plot(pitcher_df, tableau_pitch_colors)
 
+  # ---- render ----
   pdf(output_file, width = 8.5, height = 11)
   on.exit(try(dev.off(), silent = TRUE), add = TRUE)
 
   grid.newpage()
 
+  # =====================================================================
   # HEADER BAR
+  # =====================================================================
   grid.rect(x = 0, y = 0.955, width = 1, height = 0.045,
             just = c("left", "bottom"),
             gp = gpar(fill = "#006F71", col = NA))
@@ -1648,85 +1657,98 @@ create_tableau_pitcher_pdf <- function(game_df, pitcher_name, output_file) {
   info_y <- 0.935
   grid.text(paste0(game_date, "   |   ", pitcher_name, "   vs   ", away_team),
             x = 0.02, y = info_y, just = "left",
-            gp = gpar(cex = 0.8, fontface = "bold"))
+            gp = gpar(cex = 0.82, fontface = "bold"))
 
+  # =====================================================================
+  # STAT TILES (Tableau-style: top color band + bottom white; BIG + readable)
+  # =====================================================================
+  stat_labels <- c("At Bats","H","XBH","R","BB/HBP","SO","AVG",
+                   "Strike%","1st P K%","E+A%","Comp%","LOO%")
+  stat_values <- c(stats$at_bats, stats$hits, stats$xbh, stats$runs,
+                   stats$bb_hbp, stats$so, stats$avg,
+                   stats$strike_pct, stats$fp_k_pct, stats$ea_pct,
+                   stats$comp_pct, stats$loo_pct)
 
-stat_labels <- c("At Bats","H","XBH","R","BB/HBP","SO","AVG","Strike%","1st P K%","E+A%","Comp%","LOO%")
-stat_values <- c(stats$at_bats, stats$hits, stats$xbh, stats$runs,
-                 stats$bb_hbp, stats$so, stats$avg,
-                 stats$strike_pct, stats$fp_k_pct, stats$ea_pct,
-                 stats$comp_pct, stats$loo_pct)
-
-# Same palette vibe as the PDF row (red/blue/green/cyan/orange)
-label_colors <- c("#E74C3C", "#3498DB", "#3498DB", "#27AE60", "#27AE60", "#27AE60",
-                  "#00BCD4", "#F39C12", "#F39C12", "#F39C12", "#F39C12", "#F39C12")
+  label_colors <- c("#E74C3C", "#3498DB", "#3498DB", "#27AE60", "#27AE60", "#27AE60",
+                    "#00BCD4", "#F39C12", "#F39C12", "#F39C12", "#F39C12", "#F39C12")
 
-# Layout: make the tiles taller and a bit wider, like the PDF
-tiles_y   <- 0.895
-tile_w    <- 0.073
-tile_h    <- 0.055
-tile_gap  <- 0.010
-x_start   <- 0.02
+  # Fit math (prevents clipping)
+  tiles_y  <- 0.905
+  x_start  <- 0.02
+  tile_w   <- 0.0715
+  tile_h   <- 0.060
+  tile_gap <- 0.0075
 
-band_h <- tile_h * 0.55
+  band_h   <- tile_h * 0.52
+  bottom_h <- tile_h - band_h
 
-for (i in seq_along(stat_labels)) {
-  x_pos <- x_start + (i - 1) * (tile_w + tile_gap)
+  for (i in seq_along(stat_labels)) {
+    x_pos <- x_start + (i - 1) * (tile_w + tile_gap)
 
-  # Outer border
-  grid.rect(
-    x = x_pos, y = tiles_y, width = tile_w, height = tile_h,
-    just = c("left", "center"),
-    gp = gpar(fill = NA, col = label_colors[i], lwd = 2.2)
-  )
+    # Outer border
+    grid.rect(
+      x = x_pos, y = tiles_y, width = tile_w, height = tile_h,
+      just = c("left", "center"),
+      gp = gpar(fill = NA, col = label_colors[i], lwd = 2.4)
+    )
 
-  # Top colored band
-  grid.rect(
-    x = x_pos, y = tiles_y + (tile_h/2) - (band_h/2),
-    width = tile_w, height = band_h,
-    just = c("left", "center"),
-    gp = gpar(fill = label_colors[i], col = NA)
-  )
+    # Top colored band
+    grid.rect(
+      x = x_pos,
+      y = tiles_y + (tile_h/2) - (band_h/2),
+      width = tile_w, height = band_h,
+      just = c("left", "center"),
+      gp = gpar(fill = label_colors[i], col = NA)
+    )
 
-  # Bottom white area (optional subtle border line)
-  grid.rect(
-    x = x_pos, y = tiles_y - (tile_h/2) + ((tile_h - band_h)/2),
-    width = tile_w, height = (tile_h - band_h),
-    just = c("left", "center"),
-    gp = gpar(fill = "white", col = "black", lwd = 0.8)
-  )
+    # Bottom white area
+    grid.rect(
+      x = x_pos,
+      y = tiles_y - (tile_h/2) + (bottom_h/2),
+      width = tile_w, height = bottom_h,
+      just = c("left", "center"),
+      gp = gpar(fill = "white", col = "black", lwd = 0.9)
+    )
 
-  # Label (white, centered in colored band)
-  grid.text(
-    stat_labels[i],
-    x = x_pos + tile_w/2,
-    y = tiles_y + (tile_h/2) - (band_h/2),
-    gp = gpar(col = "white", cex = 0.72, fontface = "bold")
-  )
+    # Label (white, centered in color band)
+    grid.text(
+      stat_labels[i],
+      x = x_pos + tile_w/2,
+      y = tiles_y + (tile_h/2) - (band_h/2),
+      gp = gpar(col = "white", cex = 0.88, fontface = "bold")
+    )
 
-  # Value (big, centered in white area)
-  grid.text(
-    as.character(stat_values[i]),
-    x = x_pos + tile_w/2,
-    y = tiles_y - (tile_h/2) + ((tile_h - band_h)/2),
-    gp = gpar(col = "black", cex = 1.05, fontface = "bold")
-  )
-}
+    # Value (BIG)
+    grid.text(
+      as.character(stat_values[i]),
+      x = x_pos + tile_w/2,
+      y = tiles_y - (tile_h/2) + (bottom_h/2),
+      gp = gpar(col = "black", cex = 1.35, fontface = "bold")
+    )
+  }
 
-  # CHARTS (Location directly under stats; similar sizing)
-  pushViewport(viewport(x = 0.23, y = 0.67, width = 0.42, height = 0.30))
+  # =====================================================================
+  # CHARTS (left column)
+  # =====================================================================
+  # Location directly under header stats
+  pushViewport(viewport(x = 0.23, y = 0.675, width = 0.42, height = 0.30))
   print(loc_plot, newpage = FALSE)
   popViewport()
 
-  pushViewport(viewport(x = 0.23, y = 0.37, width = 0.40, height = 0.24))
+  pushViewport(viewport(x = 0.23, y = 0.375, width = 0.40, height = 0.24))
   print(mov_plot, newpage = FALSE)
   popViewport()
 
-  pushViewport(viewport(x = 0.23, y = 0.13, width = 0.42, height = 0.24))
+  pushViewport(viewport(x = 0.23, y = 0.135, width = 0.42, height = 0.24))
   print(rel_plot, newpage = FALSE)
   popViewport()
 
-  # TABLES (Top third = Location + Usage; middle = Velo; bottom = Release)
+  # =====================================================================
+  # TABLES (right column) - lifted + guaranteed fit
+  #   Top third: Location + Usage
+  #   Middle:    Velo & Movement
+  #   Bottom:    Release Data
+  # =====================================================================
   table_x <- 0.56
   table_w <- 0.41
 
@@ -1736,7 +1758,7 @@ for (i in seq_along(stat_labels)) {
     rows = c("Zone%"="Zone%", "Edge%"="Edge%", "Strike%"="Strike%", "Whiff%"="Whiff%"),
     pitch_types = pitch_types,
     pitch_colors = tableau_pitch_colors,
-    x = table_x, y = 0.78, width = table_w, height = 0.16
+    x = table_x, y = 0.84, width = table_w, height = 0.16
   )
 
   draw_tableau_table_fill(
@@ -1745,7 +1767,7 @@ for (i in seq_along(stat_labels)) {
     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.14
+    x = table_x, y = 0.66, width = table_w, height = 0.15
   )
 
   draw_tableau_table_fill(
@@ -1756,7 +1778,7 @@ for (i in seq_along(stat_labels)) {
              "Avg. IVB"="Avg. IVB", "Avg. HB"="Avg. HB"),
     pitch_types = pitch_types,
     pitch_colors = tableau_pitch_colors,
-    x = table_x, y = 0.42, width = table_w, height = 0.20
+    x = table_x, y = 0.48, width = table_w, height = 0.22
   )
 
   draw_tableau_table_fill(
@@ -1769,195 +1791,13 @@ for (i in seq_along(stat_labels)) {
              "Ext"="Avg. Ext"),
     pitch_types = pitch_types,
     pitch_colors = tableau_pitch_colors,
-    x = table_x, y = 0.20, width = table_w, height = 0.22
+    x = table_x, y = 0.285, width = table_w, height = 0.22
   )
 
   invisible(output_file)
 }
 
 
-# =====================================================================
-# MAIN PDF FUNCTION
-# =====================================================================
-create_tableau_pitcher_pdf <- function(game_df, pitcher_name, output_file) {
-  if (length(dev.list()) > 0) try(dev.off(), silent = TRUE)
-  
-  pitcher_df <- process_tableau_pitcher_data(game_df) %>% 
-    filter(Pitcher == pitcher_name)
-  
-  if (nrow(pitcher_df) == 0) {
-    pdf(output_file, width = 8.5, height = 11)
-    grid.newpage()
-    grid.text(paste("No data found for", pitcher_name), 
-              gp = gpar(fontsize = 16, fontface = "bold"))
-    dev.off()
-    return(output_file)
-  }
-  
-  # Metadata - only get away team (batter team)
-  game_date <- tryCatch({
-    d <- unique(pitcher_df$Date)[1]
-    if (inherits(d, "Date")) format(d, "%m/%d/%Y") else as.character(d)
-  }, error = function(e) "NA")
-  
-  # Get opponent team (batter team, not pitcher team)
-  batter_teams <- unique(pitcher_df$BatterTeam)
-  batter_teams <- batter_teams[!is.na(batter_teams)]
-  away_team <- if (length(batter_teams) > 0) batter_teams[1] else "Unknown"
-  
-  # Calculate stats
-  stats <- calculate_tableau_header_stats(pitcher_df)
-  loc_data <- calculate_tableau_location_data(pitcher_df)
-  usage_data <- calculate_tableau_pitch_usage(pitcher_df)
-  velo_data <- calculate_tableau_velo_movement(pitcher_df)
-  rel_data <- calculate_tableau_release_data(pitcher_df)
-  
-# Pitch types ordered by usage (Pitch Count desc)
-pitch_types <- usage_data %>%
-  arrange(desc(`Pitch Count`)) %>%
-  pull(TaggedPitchType) %>%
-  unique()
-
-pitch_types <- pitch_types[!is.na(pitch_types) & pitch_types != ""]
-if (length(pitch_types) == 0) pitch_types <- "Undefined"  
-  # Create plots
-  loc_plot <- create_tableau_location_plot(pitcher_df, tableau_pitch_colors)
-  mov_plot <- create_tableau_movement_plot(pitcher_df, tableau_pitch_colors)
-  rel_plot <- create_tableau_release_plot(pitcher_df, tableau_pitch_colors)
-  
-  # Create PDF
-  pdf(output_file, width = 8.5, height = 11)
-  on.exit(try(dev.off(), silent = TRUE), add = TRUE)
-  
-  grid.newpage()
-  
-  # =====================================================================
-  # HEADER BAR
-  # =====================================================================
-  grid.rect(x = 0, y = 0.955, width = 1, height = 0.045, 
-            just = c("left", "bottom"),
-            gp = gpar(fill = "#006F71", col = NA))
-  
-  grid.text("Pitcher Post-Game Report", x = 0.02, y = 0.977, just = "left",
-            gp = gpar(col = "white", fontface = "bold", cex = 1.2))
-  
-  # =====================================================================
-  # INFO ROW - Date, Pitcher Name, vs Away Team only
-  # =====================================================================
-  info_y <- 0.935
-  grid.text(paste0(game_date, "   |   ", pitcher_name, "   vs   ", away_team), 
-            x = 0.02, y = info_y, just = "left",
-            gp = gpar(cex = 0.7, fontface = "bold"))
-  
-  # =====================================================================
-  # STAT BOXES - Colored labels, white value backgrounds
-  # =====================================================================
-  stat_labels <- c("At Bats", "H", "XBH", "R", "BB/HBP", "SO", "AVG", 
-                   "Strike%", "1st P K%", "E+A%", "Comp%", "LOO%")
-  stat_values <- c(stats$at_bats, stats$hits, stats$xbh, stats$runs, 
-                   stats$bb_hbp, stats$so, stats$avg,
-                   stats$strike_pct, stats$fp_k_pct, stats$ea_pct, 
-                   stats$comp_pct, stats$loo_pct)
-  
-  # Label colors (text color for the stat name)
-  label_colors <- c("#E74C3C", "#3498DB", "#3498DB", "#27AE60", "#27AE60", "#27AE60", "#00BCD4",
-                    "#E67E22", "#E67E22", "#E67E22", "#E67E22", "#E67E22")
-  
-  box_y <- 0.905
-  box_w <- 0.065
-  box_h <- 0.038
-  x_start <- 0.02
-  
-  for (i in 1:12) {
-    x_pos <- x_start + (i-1) * (box_w + 0.012)
-    
-    # White background box with border matching label color
-    grid.rect(x = x_pos, y = box_y, width = box_w, height = box_h,
-              just = c("left", "center"),
-              gp = gpar(fill = "white", col = label_colors[i], lwd = 1.5))
-    
-    # Colored label at top
-    grid.text(stat_labels[i], x = x_pos + box_w/2, y = box_y + 0.010,
-              gp = gpar(col = label_colors[i], cex = 0.40, fontface = "bold"))
-    
-    # Black value below
-    grid.text(as.character(stat_values[i]), x = x_pos + box_w/2, y = box_y - 0.007,
-              gp = gpar(col = "black", cex = 0.52, fontface = "bold"))
-  }
-  
-  # =====================================================================
-  # CHARTS - Moved left and higher
-  # =====================================================================
-  
-  # Location plot (top left) - moved left and up
-  pushViewport(viewport(x = 0.22, y = 0.69, width = 0.40, height = 0.28))
-  print(loc_plot, newpage = FALSE)
-  popViewport()
-  
-  # Movement plot (middle left)
-  pushViewport(viewport(x = 0.22, y = 0.41, width = 0.38, height = 0.24))
-  print(mov_plot, newpage = FALSE)
-  popViewport()
-  
-  # Release plot (bottom left) - bigger
-  pushViewport(viewport(x = 0.22, y = 0.14, width = 0.40, height = 0.24))
-  print(rel_plot, newpage = FALSE)
-  popViewport()
-  
-
-# =====================================================================
-# TABLES (moved UP to avoid cutoff + stacked like Tableau)
-# =====================================================================
-table_x <- 0.58
-table_w <- 0.41
-
-# Top third (Location + Usage)
-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.83, width = table_w, height = 0.16
-)
-
-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.64, width = table_w, height = 0.15
-)
-
-# Middle block (Velo & Movement)
-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.46, width = table_w, height = 0.20
-)
-
-# Bottom block (Release Data) – lifted so it always fits
-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.24, width = table_w, height = 0.20
-)
-             
-  invisible(output_file)
-}
                         
 # =====================================================================
 # =====================  CATCHER CODE (wrapped)  =======================