Mercurial > hg > soniczoomios

changeset 41:79c129e500e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
r
author Robert Tubb <rt300@eecs.qmul.ac.uk>
date Fri, 12 Apr 2013 17:50:25 +0100
parents af06bb942d58
children 3d627dce8bf0
files HelpViewController.xib Question.m ServerComms.mm TopButtonViewController.h eventLogger.mm
diffstat 5 files changed, 53 insertions(+), 52 deletions(-) [+]
line wrap: on
line diff
--- a/HelpViewController.xib	Fri Apr 12 16:13:42 2013 +0100
+++ b/HelpViewController.xib	Fri Apr 12 17:50:25 2013 +0100
@@ -54,46 +54,46 @@
 						<bool key="IBUIShowsHorizontalScrollIndicator">NO</bool>
 						<bool key="IBUIUsesAttributedText">YES</bool>
 						<object class="NSAttributedString" key="IBUIAttributedText">
-							<string type="base64-UTF8" key="NSString">SU5TVFJVQ1RJT05TDQ1QcmVzcyB0aGUgcGxheSBidXR0b24gYXQgdGhlIHRvcCB0byBzdGFydCB0aGUg
-c2VxdWVuY2VyLiBQcmVzcyBwYXVzZSB0byBzdG9wLg1Zb3Ugd2lsbCBiZSB1c2luZyBhbGwgdGhyZWUg
-bW9kZXM6IHRoZSBTTElERVJTLCB0aGUgWk9PTUVSIGFuZCBCT1RIIGZvciBhYm91dCA1IG1pbnV0ZXMg
-ZWFjaCwgaW4gYSByYW5kb20gb3JkZXIuIA0NT1BFUkFUSU5HIFRIRSBaT09NRVLigKgNVGhlIHJlZCBj
-cm9zc2hhaXJzIGluIHRoZSBjZW50cmUgb2YgdGhlIHNjcmVlbiByZXByZXNlbnQgdGhlIHBvaW50IG9u
-IHRoZSBzdXJmYWNlIHRoYXQgeW91IGFyZSBsaXN0ZW5pbmcgdG8uIFNjcm9sbCB0aGUgc3VyZmFjZSB1
-bmRlciB0aGlzIHBvaW50IHRvIG1vdmUgdG8gYSBkaWZmZXJlbnQgc291bmQuIEluIEJPVEggbW9kZSB5
-b3Ugd2lsbCBiZSBhYmxlIHRvIHNlZSB0aGUgZWZmZWN0IG9mIHRoaXMgb24gdGhlIHNsaWRlcnMuIExp
-a2V3aXNlIGlmIHlvdSBtb3ZlIGEgc2xpZGVyIHlvdSB3aWxsIGhvcCB0byBhIGRpZmZlcmVudCBwb2lu
-dCBvbiB0aGUgc3VyZmFjZS4gWW91ciBwYXRoIHRocm91Z2ggdGhlIHNwYWNlIHdpbGwgc2hvdyBhcyBh
-IHdoaXRlIGxpbmUsIGFueSBwb2ludHMgeW91IGhhdmUgaG92ZXJlZCBvdmVyIHdpbGwgc2hvdyBhcyBi
-bHVlIGNpcmNsZXMu4oCoDVNhdmUgYW55IHNvdW5kcy9zZXF1ZW5jZXMgdGhhdCB5b3UgbGlrZSB1c2lu
-ZyB0aGUg4oCcc2F2ZSBwcmVzZXTigJ0gYnV0dG9uLiBBIG1hcmtlciB3aWxsIGFwcGVhciBvbiB0aGUg
-em9vbSBzdXJmYWNlLiBJZiB5b3UgbW92ZSB0byB0aGUgdmljaW5pdHkgb2YgYSBwcmVzZXQgbWFya2Vy
-LCB0aGUgY3Jvc3NoYWlycyB3aWxsIHNuYXAgdG8gdGhlIHByZXNldCwgaXRzIGRldGFpbHMgd2lsbCBh
-cHBlYXIgYW5kIHRoYXQgc291bmQgd2lsbCBwbGF5Lg3igKhVc2luZyB0d28gZmluZ2VyIHBpbmNoIG1v
-dmVtZW50IHpvb21zIHRoZSBzdXJmYWNlIGp1c3QgYXMgaW4gYSBtYXBzIGFwcC4gVGhlIGZ1cnRoZXIg
-eW91IHpvb20gaW4sIHRoZSBsZXNzIHRoZSBzb3VuZCB3aWxsIGNoYW5nZSBhcyB5b3Ugc2Nyb2xsIGFy
-b3VuZC4gRm9yIGV4YW1wbGUgdGhlIHllbGxvdyBsaW5lcyB0aGF0IGFwcGVhciBhdCB0aGUgbGFyZ2Vz
-dCBzY2FsZSBjb3JyZXNwb25kIHRvIHRoZSBzbGlkZXJzIGp1bXBpbmcgNjQgdW5pdHMuIFRoZSB3aGl0
-ZSBsaW5lcyBhdCB0aGUgc21hbGxlc3Qgc2NhbGUgY29ycmVzcG9uZCB0byBqdW1wcyBvZiBvbmUgdW5p
-dC4gVGhlcmUgYXJlIDcgbGV2ZWxzOuKAqOKAqFllbGxvdyA9IDY0LCBUZWFsID0gMzIsIFB1cnBsZSA9
-IDE2LCBHcmVlbiA9IDgsIERhcmsgQmx1ZSA9IDQsIFJlZCA9IDIsIFdoaXRlID0gMeKAqOKAqExPQ0vi
-gKjigKhJZiB5b3UgZmluZCBhIHNlcXVlbmNlIHlvdSBsaWtlIGJ1dCB3YW50IHRvIGNoYW5nZSB0aGUg
-c3ludGggc291bmQgdXNlIHRoZSAiTG9jayBYIiBidXR0b24uIFRoaXMgd2lsbCBwcmV2ZW50IHlvdSBh
-Y2NpZGVudGFsbHkgbW92aW5nIGluIGZyb20gbGVmdCB0byByaWdodCBhbmQgbWVzc2luZyB1cCB5b3Vy
-IG5vdGUgcGF0dGVybi4gU2ltaWxhcmx5IGlmIHlvdSBmaW5kIGEgc3ludGggc291bmQgdGhhdCB5b3Ug
-bGlrZSwgYnV0IHdhbnQgdG8gY2hhbmdlIHRoZSBub3RlIHNlcXVlbmNlLCB1c2UgdGhlICJMb2NrIFki
-IGJ1dHRvbi4g4oCo4oCoUkFORE9NSVNF4oCo4oCoVXNlIHRoZSByYW5kb21pc2UgYnV0dG9uIHRvIGp1
-bXAgdG8gYSByYW5kb20gcG9pbnQgb24gdGhlIGdyaWQuIOKAqOKAqEVYVFJBIEZFQVRVUkVT4oCo4oCo
-QWZ0ZXIgeW91IGNvbXBsZXRlIHRoZSB0aW1lZCBzZXNzaW9ucyBhbmQgdGhlIHF1ZXN0aW9ubmFpcmUs
-IHlvdSBjYW4gdHVybiB0aGUgc2xpZGVycyBhbmQgdGhlIHpvb21lciBvbi9vZmYgdXNpbmcgdGhlIHRh
-YnMgYXQgdGhlIGJvdHRvbSBvZiB0aGUgc2NyZWVuLiBUaGVzZSBmdXJ0aGVyIGZlYXR1cmVzIHdpbGwg
-YmUgZW5hYmxlZDrigKjigKhTTU9PVEhJTkfigKjigKhXaGVuIHlvdSBoYXZlIGZpbmlzaGVkIHRoZSBl
-eHBlcmltZW50LCBhICJzbW9vdGgiIHN3aXRjaCB3aWxsIGFwcGVhci4gVGhpcyB3aWxsIGludGVycG9s
-YXRlIHRoZSBncmlkIHNvIHRoYXQgdGhlIHNsaWRlcnMgY2hhbmdlIG1vcmUgc21vb3RobHkuIE5vdGUg
-dGhpcyB3aWxsIGJyZWFrIHRoZSBvbmUgdG8gb25lIG1hcHBpbmcgYmV0d2VlbiBzbGlkZXJzIGFuZCBz
-dXJmYWNlOiBwcmV2aW91c2x5IHNhdmVkIHByZXNldHMgd2lsbCBub3QgYXBwZWFyLCBhbmQgYW55IHNh
-dmVkIGluIHRoaXMgbW9kZSB3aWxsIHRlbmQgdG8gYXBwZWFyIGluIGEgc2xpZ2h0bHkgZGlmZmVyZW50
-IHBvc2l0aW9uIHdoZW4gc21vb3RoIGlzIHR1cm5lZCBvZmYu4oCo4oCoTUlESQ0NA</string>
+							<string type="base64-UTF8" key="NSString">UHJlc3MgdGhlIHBsYXkgYnV0dG9uIGF0IHRoZSB0b3AgdG8gc3RhcnQgdGhlIHNlcXVlbmNlci4gUHJl
+c3MgcGF1c2UgdG8gc3RvcC4NWW91IHdpbGwgYmUgdXNpbmcgYWxsIHRocmVlIG1vZGVzOiB0aGUgU0xJ
+REVSUywgdGhlIFpPT01FUiBhbmQgQk9USCBmb3IgYWJvdXQgNSBtaW51dGVzIGVhY2gsIGluIGEgcmFu
+ZG9tIG9yZGVyLiANDU9QRVJBVElORyBUSEUgWk9PTUVS4oCoDVRoZSByZWQgY3Jvc3NoYWlycyBpbiB0
+aGUgY2VudHJlIG9mIHRoZSBzY3JlZW4gcmVwcmVzZW50IHRoZSBwb2ludCBvbiB0aGUgc3VyZmFjZSB0
+aGF0IHlvdSBhcmUgbGlzdGVuaW5nIHRvLiBTY3JvbGwgdGhlIHN1cmZhY2UgdW5kZXIgdGhpcyBwb2lu
+dCB0byBtb3ZlIHRvIGEgZGlmZmVyZW50IHNvdW5kLiBJbiBCT1RIIG1vZGUgeW91IHdpbGwgYmUgYWJs
+ZSB0byBzZWUgdGhlIGVmZmVjdCBvZiB0aGlzIG9uIHRoZSBzbGlkZXJzLiBMaWtld2lzZSBpZiB5b3Ug
+bW92ZSBhIHNsaWRlciB5b3Ugd2lsbCBob3AgdG8gYSBkaWZmZXJlbnQgcG9pbnQgb24gdGhlIHN1cmZh
+Y2UuIFlvdXIgcGF0aCB0aHJvdWdoIHRoZSBzcGFjZSB3aWxsIHNob3cgYXMgYSB3aGl0ZSBsaW5lLCBh
+bnkgcG9pbnRzIHlvdSBoYXZlIGhvdmVyZWQgb3ZlciB3aWxsIHNob3cgYXMgYmx1ZSBjaXJjbGVzLuKA
+qA1TYXZlIGFueSBzb3VuZHMvc2VxdWVuY2VzIHRoYXQgeW91IGxpa2UgdXNpbmcgdGhlIOKAnHNhdmUg
+cHJlc2V04oCdIGJ1dHRvbi4gQSBtYXJrZXIgd2lsbCBhcHBlYXIgb24gdGhlIHpvb20gc3VyZmFjZS4g
+SWYgeW91IG1vdmUgdG8gdGhlIHZpY2luaXR5IG9mIGEgcHJlc2V0IG1hcmtlciwgdGhlIGNyb3NzaGFp
+cnMgd2lsbCBzbmFwIHRvIHRoZSBwcmVzZXQsIGl0cyBkZXRhaWxzIHdpbGwgYXBwZWFyIGFuZCB0aGF0
+IHNvdW5kIHdpbGwgcGxheS4N4oCoVHdvIGZpbmdlciBwaW5jaCBtb3ZlbWVudHMgem9vbSB0aGUgc3Vy
+ZmFjZSBqdXN0IGFzIGluIGEgbWFwcyBhcHAuIFRoZSBmdXJ0aGVyIHlvdSB6b29tIGluLCB0aGUgbGVz
+cyB0aGUgc291bmQgd2lsbCBjaGFuZ2UgYXMgeW91IHNjcm9sbCBhcm91bmQuIEZvciBleGFtcGxlIHRo
+ZSB5ZWxsb3cgbGluZXMgdGhhdCBhcHBlYXIgYXQgdGhlIGxhcmdlc3Qgc2NhbGUgY29ycmVzcG9uZCB0
+byB0aGUgc2xpZGVycyBqdW1waW5nIDY0IHVuaXRzLiBUaGUgd2hpdGUgbGluZXMgYXQgdGhlIHNtYWxs
+ZXN0IHNjYWxlIGNvcnJlc3BvbmQgdG8ganVtcHMgb2Ygb25lIHVuaXQuIFRoZXJlIGFyZSA3IGxldmVs
+czrigKjigKhZZWxsb3cgPSA2NCwgVGVhbCA9IDMyLCBQdXJwbGUgPSAxNiwgR3JlZW4gPSA4LCBEYXJr
+IEJsdWUgPSA0LCBSZWQgPSAyLCBXaGl0ZSA9IDHigKjigKhMT0NL4oCo4oCoSWYgeW91IGZpbmQgYSBz
+ZXF1ZW5jZSB5b3UgbGlrZSBidXQgd2FudCB0byBjaGFuZ2UgdGhlIHN5bnRoIHNvdW5kIHVzZSB0aGUg
+IkxvY2sgWCIgYnV0dG9uLiBUaGlzIHdpbGwgcHJldmVudCB5b3UgYWNjaWRlbnRhbGx5IG1vdmluZyBp
+biBmcm9tIGxlZnQgdG8gcmlnaHQgYW5kIG1lc3NpbmcgdXAgeW91ciBub3RlIHBhdHRlcm4uIFNpbWls
+YXJseSBpZiB5b3UgZmluZCBhIHN5bnRoIHNvdW5kIHRoYXQgeW91IGxpa2UsIGJ1dCB3YW50IHRvIGNo
+YW5nZSB0aGUgbm90ZSBzZXF1ZW5jZSwgdXNlIHRoZSAiTG9jayBZIiBidXR0b24uIOKAqOKAqFJBTkRP
+TUlTReKAqOKAqFVzZSB0aGUgcmFuZG9taXNlIGJ1dHRvbiB0byBqdW1wIHRvIGEgcmFuZG9tIHBvaW50
+IG9uIHRoZSBncmlkLiDigKjigKhFWFRSQSBGRUFUVVJFU+KAqOKAqEFmdGVyIHlvdSBjb21wbGV0ZSB0
+aGUgdGltZWQgc2Vzc2lvbnMgYW5kIHRoZSBxdWVzdGlvbm5haXJlLCB5b3UgY2FuIHR1cm4gdGhlIHNs
+aWRlcnMgYW5kIHRoZSB6b29tZXIgb24vb2ZmIHVzaW5nIHRoZSB0YWJzIGF0IHRoZSBib3R0b20gb2Yg
+dGhlIHNjcmVlbi4gVGhlc2UgZnVydGhlciBmZWF0dXJlcyB3aWxsIGJlIGVuYWJsZWQ64oCo4oCoU01P
+T1RISU5H4oCo4oCoV2hlbiB5b3UgaGF2ZSBmaW5pc2hlZCB0aGUgZXhwZXJpbWVudCwgYSAic21vb3Ro
+IiBzd2l0Y2ggd2lsbCBhcHBlYXIuIFRoaXMgd2lsbCBpbnRlcnBvbGF0ZSB0aGUgZ3JpZCBzbyB0aGF0
+IHRoZSBzbGlkZXJzIGNoYW5nZSBtb3JlIHNtb290aGx5LiBOb3RlIHRoaXMgd2lsbCBicmVhayB0aGUg
+b25lIHRvIG9uZSBtYXBwaW5nIGJldHdlZW4gc2xpZGVycyBhbmQgc3VyZmFjZTogcHJldmlvdXNseSBz
+YXZlZCBwcmVzZXRzIHdpbGwgbm90IGFwcGVhciwgYW5kIGFueSBzYXZlZCBpbiB0aGlzIG1vZGUgd2ls
+bCB0ZW5kIHRvIGFwcGVhciBpbiBhIHNsaWdodGx5IGRpZmZlcmVudCBwb3NpdGlvbiB3aGVuIHNtb290
+aCBpcyB0dXJuZWQgb2ZmLg0NA</string>
 							<array class="NSMutableArray" key="NSAttributes">
 								<dictionary>
 									<object class="NSColor" key="NSColor">
@@ -119,7 +119,7 @@
 								</dictionary>
 							</array>
 							<object class="NSMutableData" key="NSAttributeInfo">
-								<bytes key="NS.bytes">4Q0AwAEBgQMAA</bytes>
+								<bytes key="NS.bytes">zQ0AwAEB+wIAA</bytes>
 							</object>
 						</object>
 						<bool key="IBUIEditable">NO</bool>
@@ -134,6 +134,7 @@
 						<string key="NSFrame">{{319, 941}, {130, 44}}</string>
 						<reference key="NSSuperview" ref="766721923"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
--- a/Question.m	Fri Apr 12 16:13:42 2013 +0100
+++ b/Question.m	Fri Apr 12 17:50:25 2013 +0100
@@ -15,7 +15,7 @@
 @synthesize answer = _answer; 
 
 static int theCount = 0;
-
+// WRONG
 -(id)initWithTextAndType:(NSString *)text:(QuestionType)type{
     self = [super init];
     if(self){
--- a/ServerComms.mm	Fri Apr 12 16:13:42 2013 +0100
+++ b/ServerComms.mm	Fri Apr 12 17:50:25 2013 +0100
@@ -20,7 +20,7 @@
     }
     return self;
 }
-
+//-------------------------------------------------------------------------------
 //  asynchronous one
 -(BOOL)doPostRequest:(NSString *)type withData:(NSString *)data{
     
@@ -149,7 +149,7 @@
         if([self.currentRequestType isEqualToString:@"questionnaire"]) eventLogger.questionnaireNotOK();
     }
 }
-
+//-------------------------------------------------------------------------------
 - (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
 
     NSLog(@"fail with error");
@@ -168,7 +168,7 @@
     self.requestInProgress = NO;
     // we won't know what kind of request method this was...
 }
-
+//-------------------------------------------------------------------------------
 - (void)connectionDidFinishLoading:(NSURLConnection *)connection {
     NSString *responseText = [[NSString alloc] initWithData:self.data encoding:NSUTF8StringEncoding];
     
@@ -179,7 +179,7 @@
     self.requestInProgress = NO;
 
 }
-
+//-------------------------------------------------------------------------------
 // Handle basic authentication challenge if needed
 - (void)connection:(NSURLConnection *)connection didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge {
     NSString *username = @"username";
@@ -198,5 +198,5 @@
     
 }
 */
-
+//-------------------------------------------------------------------------------
 @end
--- a/TopButtonViewController.h	Fri Apr 12 16:13:42 2013 +0100
+++ b/TopButtonViewController.h	Fri Apr 12 17:50:25 2013 +0100
@@ -37,5 +37,5 @@
 - (IBAction)helpPressed:(id)sender;
 - (IBAction)newUser:(id)sender;
 - (void)enableSmoothSwitch:(id)sender;
-
+-(void)unlockAll;
 @end
--- a/eventLogger.mm	Fri Apr 12 16:13:42 2013 +0100
+++ b/eventLogger.mm	Fri Apr 12 17:50:25 2013 +0100
@@ -180,7 +180,7 @@
     
     //((testApp *)ofGetAppPtr())->showIntro();
     //consentGiven = false;
-    ((testApp *)ofGetAppPtr())->justStart();
+    //((testApp *)ofGetAppPtr())->justStart();
     
     
 }
@@ -397,7 +397,7 @@
         previousEvent = newEvent;
         return;
     }
-    
+
     // if previous event is more than 300ms ago, or event type has changed, log both of them (lots of events on move+zoom combinations!!)
     int gap = newEvent.eventTime - previousEvent.eventTime;
     if(gap > 300){
@@ -433,13 +433,13 @@
     static lEvent previousEvent(EMPTY_EVENT); // initialised as whatever. hopefully won't log
     static int eventCounter = 0;
     
-    // if first event then log it. it won't be, but still.
+    // if first event then log it.
     if(theEvents.size() == 0){
         theEvents.push_back(newEvent);
         previousEvent = newEvent;
         return;
     }
-    
+
     // if previous event is more than 300ms ago log both of them 
     int gap = newEvent.eventTime - previousEvent.eventTime;
     if(gap > 300){