Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
Merge branch 'main' of https://github.com/CSAFE-ISU/bulletAnalyzr

# Conflicts:
#	app/server.R
  • Loading branch information
heike committed Nov 12, 2024
2 parents 67ad958 + 6d349fe commit 3d64470
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions app/server.R
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,8 @@ server <- function(input, output, session) {
bull <- read_bullet(temp_dir)

# Check if we need to rotate the bullet

hinfo <- bull$x3p[[1]]$header.info
if (hinfo$sizeY > hinfo$sizeX) {
if (hinfo$sizeX < hinfo$sizeY) {
alert("Detected rotated bullet, rotating 90 degrees...")
bull$x3p <- lapply(bull$x3p, x3p_rotate, angle = -90)
}
Expand Down Expand Up @@ -795,4 +794,4 @@ server <- function(input, output, session) {
})
#################################################################################
#################################################################################
}
}

0 comments on commit 3d64470

Please sign in to comment.