# HG changeset patch
# User matthiasm
# Date 1385735739 0
# Node ID df8784695584151284836b689ffc098f51aa426f
# Parent  279cf9b11c737501dacf45f24aaa57ab4cb8d9e1
icons

diff -r 279cf9b11c73 -r df8784695584 deploy/osx/Info.plist
--- a/deploy/osx/Info.plist	Fri Nov 29 13:46:12 2013 +0000
+++ b/deploy/osx/Info.plist	Fri Nov 29 14:35:39 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>
diff -r 279cf9b11c73 -r df8784695584 generateIcon.R
--- a/generateIcon.R	Fri Nov 29 13:46:12 2013 +0000
+++ b/generateIcon.R	Fri Nov 29 14:35:39 2013 +0000
@@ -1,5 +1,5 @@
 t <- seq(0,8*pi,.01)
-w <- pnorm(t, 4*pi, 1)
+w <- pnorm(t, 4*pi, .7)
 n <- length(t)
 pitchDiff <- 6
 sin1 <- sin(t) + pitchDiff
@@ -9,14 +9,14 @@
 outlineWidth <- 20
 sz <- 200
 
-png("tonyLogoWave.png", width = sz, height = sz)
+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(-2, pitchDiff+2) + c(1,-1)*0.1,
+     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(-2,pitchDiff+2), lwd=outlineWidth, col = 'blue', lend=2)
-lines(c(0,0)+8*pi,c(-2,pitchDiff+2), lwd=outlineWidth, col = 'blue', lend=2)
-lines(c(0,8*pi),c(0,0)+pitchDiff+2, lwd=outlineWidth, col = 'blue', lend=2)
-lines(c(0,8*pi),c(0,0)-2, lwd=outlineWidth, col = 'blue', lend=2)
+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
diff -r 279cf9b11c73 -r df8784695584 tony.icns
Binary file tony.icns has changed