Mercurial > hg > tony
changeset 78:896b89e67f3c
Merge
| author | Chris Cannam |
|---|---|
| date | Fri, 29 Nov 2013 14:53:46 +0000 |
| parents | 170c334c54b9 (current diff) df8784695584 (diff) |
| children | ce44317dd055 |
| files | |
| diffstat | 3 files changed, 25 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/deploy/osx/Info.plist Fri Nov 29 14:52:13 2013 +0000 +++ b/deploy/osx/Info.plist Fri Nov 29 14:53:46 2013 +0000 @@ -8,9 +8,9 @@ <string>Tony</string> <key>CFBundleExecutable</key> <string>Tony</string> -<!-- <key>CFBundleIconFile</key> - <string>sv-macicon.icns</string> ---> <key>CFBundleIdentifier</key> + <key>CFBundleIconFile</key> + <string>tony.icns</string> + <key>CFBundleIdentifier</key> <string>uk.ac.qmul.eecs.c4dm.Tony</string> <key>CFBundleShortVersionString</key> <string>TONY_VERSION</string>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/generateIcon.R Fri Nov 29 14:53:46 2013 +0000 @@ -0,0 +1,22 @@ +t <- seq(0,8*pi,.01) +w <- pnorm(t, 4*pi, .7) +n <- length(t) +pitchDiff <- 6 +sin1 <- sin(t) + pitchDiff +sin2 <- sin(t) + +lineWidth <- 15 +outlineWidth <- 20 +sz <- 200 + +png("tonyLogoWave.png", width = sz, height = sz, bg="transparent") +par(mar=c(0,0,0,0)) +plot(t, sin1 * w + sin2 * (1-w), type='l', + lwd=lineWidth, bty='n', xaxt='n', yaxt='n', + ylim = c(-pad, pitchDiff+pad) + c(1,-1)*0.1, + xlim = c(0, 8*pi) + c(1,-1)*0.1) +lines(c(0,0),c(-pad,pitchDiff+pad), lwd=outlineWidth, col = 'blue', lend=2) +lines(c(0,0)+8*pi,c(-pad,pitchDiff+pad), lwd=outlineWidth, col = 'blue', lend=2) +lines(c(0,8*pi),c(0,0)+pitchDiff+pad, lwd=outlineWidth, col = 'blue', lend=2) +lines(c(0,8*pi),c(0,0)-pad, lwd=outlineWidth, col = 'blue', lend=2) +dev.off() \ No newline at end of file