Mercurial > hg > screen-ui

changeset 7:38f63c4300d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tested small modification
author Henrik Ekeus <hekeus@eecs.qmul.ac.uk>
date Wed, 25 Jan 2012 16:32:57 +0000
parents d879a30556f8
children 3d9e0db254dc
files MelodyTriangle.xcodeproj/hekeus.mode1v3 MelodyTriangle.xcodeproj/hekeus.pbxuser src/melodyTriangle.cpp
diffstat 3 files changed, 29 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/MelodyTriangle.xcodeproj/hekeus.mode1v3	Wed Jan 25 16:30:07 2012 +0000
+++ b/MelodyTriangle.xcodeproj/hekeus.mode1v3	Wed Jan 25 16:32:57 2012 +0000
@@ -216,7 +216,7 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>C8D33D0714D0645600191D50</string>
+						<string>C8D33D1414D0660600191D50</string>
 						<key>history</key>
 						<array>
 							<string>C858DABD14D0643D0009C9DF</string>
@@ -367,7 +367,7 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>C8D33D0414D0645600191D50</string>
+										<string>C8D33D1314D0660600191D50</string>
 										<key>history</key>
 										<array>
 											<string>C8E1DA3A14BF6043000A0193</string>
@@ -578,7 +578,6 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>C8D33D1014D0645600191D50</string>
 		<string>C8D33D1114D0645600191D50</string>
 		<string>C8D33D1214D0645600191D50</string>
 		<string>1C78EAAD065D492600B07095</string>
--- a/MelodyTriangle.xcodeproj/hekeus.pbxuser	Wed Jan 25 16:30:07 2012 +0000
+++ b/MelodyTriangle.xcodeproj/hekeus.pbxuser	Wed Jan 25 16:32:57 2012 +0000
@@ -138,7 +138,7 @@
 		fRef = C8E1D9D914BF50E0000A0193 /* melodyTriangle.cpp */;
 		name = "melodyTriangle.cpp: 123";
 		rLen = 0;
-		rLoc = 3225;
+		rLoc = 3231;
 		rType = 0;
 		vrLen = 1413;
 		vrLoc = 2427;
@@ -202,7 +202,7 @@
 		fRef = C8E1D9D914BF50E0000A0193 /* melodyTriangle.cpp */;
 		name = "melodyTriangle.cpp: 123";
 		rLen = 0;
-		rLoc = 3225;
+		rLoc = 3231;
 		rType = 0;
 		vrLen = 1287;
 		vrLoc = 2427;
@@ -217,11 +217,31 @@
 		vrLen = 1293;
 		vrLoc = 56;
 	};
+	C8D33D1314D0660600191D50 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = C8E1D9D914BF50E0000A0193 /* melodyTriangle.cpp */;
+		name = "melodyTriangle.cpp: 116";
+		rLen = 0;
+		rLoc = 2956;
+		rType = 0;
+		vrLen = 1342;
+		vrLoc = 2427;
+	};
+	C8D33D1414D0660600191D50 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = C8E1D9D914BF50E0000A0193 /* melodyTriangle.cpp */;
+		name = "melodyTriangle.cpp: 19";
+		rLen = 0;
+		rLoc = 440;
+		rType = 0;
+		vrLen = 1327;
+		vrLoc = 56;
+	};
 	C8E1D9D914BF50E0000A0193 /* melodyTriangle.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {912, 5577}}";
+			sepNavIntBoundsRect = "{{0, 0}, {912, 5590}}";
 			sepNavSelRange = "{440, 0}";
-			sepNavVisRange = "{56, 1293}";
+			sepNavVisRange = "{56, 1327}";
 			sepNavWindowFrame = "{{293, 4}, {971, 730}}";
 		};
 	};
@@ -358,6 +378,8 @@
 			C858DABD14D0643D0009C9DF = C858DABD14D0643D0009C9DF /* PBXTextBookmark */;
 			C8D33D0414D0645600191D50 /* PBXTextBookmark */ = C8D33D0414D0645600191D50 /* PBXTextBookmark */;
 			C8D33D0714D0645600191D50 /* PBXTextBookmark */ = C8D33D0714D0645600191D50 /* PBXTextBookmark */;
+			C8D33D1314D0660600191D50 /* PBXTextBookmark */ = C8D33D1314D0660600191D50 /* PBXTextBookmark */;
+			C8D33D1414D0660600191D50 /* PBXTextBookmark */ = C8D33D1414D0660600191D50 /* PBXTextBookmark */;
 			C8E1DA3A14BF6043000A0193 = C8E1DA3A14BF6043000A0193 /* PlistBookmark */;
 		};
 		sourceControlManager = C859B006140D23E1002C5ACF /* Source Control */;
--- a/src/melodyTriangle.cpp	Wed Jan 25 16:30:07 2012 +0000
+++ b/src/melodyTriangle.cpp	Wed Jan 25 16:32:57 2012 +0000
@@ -113,6 +113,7 @@
 				
 				if (ofDist((*voices[voiceGrabbed]).posx, (*voices[voiceGrabbed]).posy, mouseX, mouseY) > (*voices[voiceGrabbed]).radius*2){ 
 				
+					
 				ofxOscMessage m;
 				///track id x y left right top bottom area  
 				m.setAddress( "/death" );