Mercurial > hg > soniczoomios
changeset 31:23ef179c3748
Ben / Christian 0.2
| author | Robert Tubb <rt300@eecs.qmul.ac.uk> |
|---|---|
| date | Fri, 01 Mar 2013 13:28:45 +0000 |
| parents | c0a6f7c66719 |
| children | ab7c86d0f3d8 |
| files | IntroViewController.xib PresetAlertViewController.h PresetAlertViewController.mm Question.m QuestionnaireViewController.h QuestionnaireViewController.mm QuestionnaireViewController.xib ServerComms.mm TimedSessionController.h TimedSessionController.mm UsernameAlertViewController.h UsernameAlertViewController.mm eventLogger.h eventLogger.mm presetManager.h presetManager.mm |
| diffstat | 16 files changed, 776 insertions(+), 279 deletions(-) [+] |
line wrap: on
line diff
--- a/IntroViewController.xib Wed Feb 27 11:39:07 2013 +0000 +++ b/IntroViewController.xib Fri Mar 01 13:28:45 2013 +0000 @@ -88,46 +88,46 @@ <object class="NSMutableString" key="IBUIText"> <bytes key="NS.bytes">V2VsY29tZSB0byB0aGUgIlNvbmljIFpvb20iLiBUaGlzIGlzIGEgUXVlZW4gTWFyeSBVbml2ZXJzaXR5 IFBoRCByZXNlYXJjaCBwcm9qZWN0IGFpbWVkIGF0IGZpbmRpbmcgb3V0IGhvdyBwZW9wbGUgZXhwbG9y -ZSB0aGUgc3BhY2Ugb2Ygc291bmQgc3ludGhlc2lzIHBhcmFtZXRlcnMuIA0NSW4gdGhpcyBhcHAgdGhl -cmUgYXJlIGp1c3QgMTAgcGFyYW1ldGVycyDigJMgNSBmb3IgdGhlIHNlcXVlbmNlciBwYXR0ZXJuIGdl -bmVyYXRvciBhbmQgNSBmb3IgYSBiYXNpYyBGTS9zdWJ0cmFjdGl2ZSBzeW50aGVzaXplci4gSG93ZXZl -ciwgZXZlbiB3aXRoIG9ubHkgMTAgcGFyYW1ldGVycyB0aGUgYW1vdW50IG9mIGRpZmZlcmVudCBzb3Vu -ZHMgdG8gZXhwbG9yZSBpcyB2YXN0OiBpbiBmYWN0IHRoZXJlIGFyZSBqdXN0IG92ZXIgYSBiaWxsaW9u -IHRyaWxsaW9uIGRpc3RpbmN0IHNldHRpbmdzISBXZSBhaW0gdG8gbG9vayBhdCB3aGF0IHBhdGhzIHBl -b3BsZSB0YWtlIGluIHRoaXMgaHVnZSBzcGFjZSwgd2hhdCBwb2ludHMgdGhleSBsaWtlIGFuZCBkaXNs -aWtlLCBhbmQgdXNlIHRoZSBkYXRhIHRvIGNyZWF0ZSBzeW50aHMgdGhhdCBhcmUgZWFzaWVyIHRvIG5h -dmlnYXRlLCBhbmQgaG9wZWZ1bGx5IGVuY291cmFnZSBjcmVhdGl2aXR5Lg0NVGhlcmUgYXJlIHR3byBp -bnRlcmZhY2VzIHByZXNlbnRlZCBoZXJlLiBUaGUgZmlyc3QgaXMgb25lIHlvdSB3aWxsIHByb2JhYmx5 -IGJlIHVzZWQgdG8gaWYgeW91IGFyZSBhIG11c2ljaWFuOiAxMCBzbGlkZXJzIGZvciBlYWNoIG9mIHRo -ZSBwYXJhbWV0ZXJzLiBUaGUgc2Vjb25kIGlzIHNvbWV3aGF0IG5ldzogZXZlcnkgb25lIG9mIHRoZSBi -aWxsaW9uIHRyaWxsaW9uIHBvaW50cyBoYXMgYmVlbiBtYXBwZWQgdG8gYSAyRCBzdXJmYWNlLiBCdXQg -YmFzaWNhbGx5LCB0aGUgZnVydGhlciB5b3UgdHJhdmVsIGFsb25nIHRoaXMgMkQgc3VyZmFjZSwgdGhl -IG1vcmUgZGlmZmVyZW50IHRoZSBzb3VuZCB3aWxsIGJlY29tZS4NDVVwIGRvd24gbW92ZW1lbnQgY29u -dHJvbHMgdGhlIHN5bnRoIHRpbWJyZSwgbGVmdCByaWdodCBjb250cm9scyB0aGUgc2VxdWVuY2VyLiBX -aGVuIHlvdSBjbGljayDigJxzYXZlIHByZXNldOKAnSB5b3Ugd2lsbCBkcm9wIGEgcGluIG9udG8gdGhl -IHN1cmZhY2UsIGFuZCB5b3UgY2FuIHJldmlzaXQgdGhpcyBwb2ludCBhdCBhbnl0aW1lIGJ5IHNjcm9s -bGluZyB0byBpdC4gVGhpbmsgb2YgaXQgbGlrZSBhICJHb29nbGUgTWFwcyIgZm9yIHN5bnRoIHNvdW5k -cy4uLg0NWW91IGNhbiB1c2UgYSBwaW5jaCBnZXN0dXJlIHRvIHpvb20gaW4gYW5kIG91dCBvZiB0aGUg -c3VyZmFjZS4gWm9vbWluZyBpbiB3aWxsIGVuYWJsZSB5b3UgdG8gZXhwbG9yZSBzbWFsbGVyIGxvY2Fs -aXRpZXMgb2YgdGhlIHNvdW5kIHNwYWNlLiBab29taW5nIG91dCB3aWxsIGdpdmUgeW91IGEgYmlnZ2Vy -IHBlcnNwZWN0aXZlLCBidXQgb2YgY291cnNlIHRoZSBzb3VuZCB3aWxsIGJlY29tZSBmYXIgbW9yZSBy -YW5kb20gYW5kIHVuY29udHJvbGxhYmxlIGFzIHlvdSBtb3ZlIGJpZ2dlciBkaXN0YW5jZXMuDQ1XaGF0 -IHdlIGFyZSBhc2tpbmcgeW91LCB0aGUgcGFydGljaXBhbnQsIHRvIGRvIGlzIHVzZSB0aGUgem9vbWVy -LCB0aGUgc2xpZGVycyBhbmQgYSBjb21iaW5hdGlvbiBvZiBib3RoIGZvciA2IG1pbnV0ZXMgZWFjaCwg -YW5kIHNhdmUgYW55IHNvdW5kcyB0aGF0IHlvdSBsaWtlLiBBbHNvIGNoZWNrIG91dCB0aGUgInJhbmRv -bWlzZSIgYW5kICJsb2NrIiBidXR0b25zLiBBZnRlciB0aGlzIGEgc2hvcnQgcXVlc3Rpb25uYWlyZSB3 -aWxsIGFwcGVhciB0aGF0IHdpbGwgaGVscCB1cyBhc3Nlc3MgdGhlIGludGVyZmFjZSBmdXJ0aGVyLiBB -ZnRlciB0aGF0LCBwbGVhc2UgZmVlbCBmcmVlIHRvIHVzZSBpdCBzb21lIG1vcmU6IHRoZSBtb3JlIGRh -dGEgd2UgZ2V0IHRoZSBiZXR0ZXIuIEZ1cnRoZXIgZXhjaXRpbmcgZmVhdHVyZXMgYXJlIHBsYW5uZWQg -Zm9yIHRoaXMgYXBwLCBzbyBwbGVhc2Ugd2F0Y2ggb3V0IGZvciB1cGRhdGVzLg0NTk9URTogWW91ciBh -Y3Rpb25zIHdpbGwgYmUgbG9nZ2VkLCBhbmQgc2VudCB0byBhIHNlY3VyZSBzZXJ2ZXIgaGVyZSBhdCBR -dWVlbiBNYXJ5IFVuaXZlcnNpdHkuICBIb3dldmVyIG5vIHBlcnNvbmFsIGRhdGEgKG5hbWUsIGVtYWls -IGV0Yy4pIHdpbGwgYmUgY29sbGVjdGVkLCBhc3NvY2lhdGVkIHdpdGggdGhpcyBJRCBvciBzdG9yZWQg -aW4gdGhlIGRhdGFiYXNlLiBJdCBpcyBoaWdobHkgcmVjb21tZW5kZWQgdGhhdCB5b3UgYXJlIGNvbm5l -Y3RlZCB0byBXaUZpIGludGVybmV0IHdoaWxzdCB1c2luZyB0aGlzIEFwcCwgb3RoZXJ3aXNlIHRoZSBs -b2cgZGF0YSB3aWxsIHRha2UgdXAgc3BhY2Ugb24geW91ciBkZXZpY2UuDVRvIGNvbnNlbnQgdG8gdGhp -cyBwbGVhc2UgcHJlc3MgIkFncmVlIiBiZWxvdy4gVG8gZGVjbGluZSBqdXN0IGV4aXQgdGhlIGFwcC4N -A</bytes> +ZSBzb3VuZCBzeW50aGVzaXMgcGFyYW1ldGVycy4gDQ1JbiB0aGlzIGFwcCB0aGVyZSBhcmUganVzdCAx +MCBwYXJhbWV0ZXJzIOKAkyA1IGZvciB0aGUgbm90ZSBwYXR0ZXJuIGdlbmVyYXRvciBhbmQgNSBmb3Ig +YSBzb21ld2hhdCBiYXNpYyBGTS9zdWJ0cmFjdGl2ZSBzeW50aGVzaXplci4gSG93ZXZlciwgZXZlbiB3 +aXRoIG9ubHkgMTAgcGFyYW1ldGVycyB0aGUgYW1vdW50IG9mIGRpZmZlcmVudCBzb3VuZHMgdG8gZXhw +bG9yZSBpcyB2YXN0OiBpbiBmYWN0IHRoZXJlIGFyZSBqdXN0IG92ZXIgYSBiaWxsaW9uIHRyaWxsaW9u +IGRpc3RpbmN0IHNldHRpbmdzISBXZSBhaW0gdG8gbG9vayBhdCB3aGF0IHBhdGhzIHBlb3BsZSB0YWtl +IGluIHRoaXMgaHVnZSBzcGFjZSwgd2hhdCBwb2ludHMgdGhleSBsaWtlIGFuZCBkaXNsaWtlLCBhbmQg +dXNlIHRoZSBkYXRhIHRvIGNyZWF0ZSBzeW50aHMgdGhhdCBhcmUgZWFzaWVyIHRvIG5hdmlnYXRlLCBh +bmQgaG9wZWZ1bGx5IGVuY291cmFnZSBjcmVhdGl2aXR5Lg0NVGhlcmUgYXJlIHR3byBpbnRlcmZhY2Vz +IHByZXNlbnRlZCBoZXJlLiBUaGUgZmlyc3QgaXMgb25lIHlvdSB3aWxsIHByb2JhYmx5IGJlIHVzZWQg +dG8gaWYgeW91IGFyZSBhIG11c2ljaWFuOiAxMCBzbGlkZXJzIGZvciBlYWNoIG9mIHRoZSBwYXJhbWV0 +ZXJzLiBUaGUgc2Vjb25kIGlzIHNvbWV3aGF0IG5ldzogZXZlcnkgb25lIG9mIHRoZSBiaWxsaW9uIHRy +aWxsaW9uIHBvaW50cyBoYXMgYmVlbiBtYXBwZWQgdG8gYSAyRCBzdXJmYWNlLiBCdXQgYmFzaWNhbGx5 +LCB0aGUgZnVydGhlciB5b3UgdHJhdmVsIGFsb25nIHRoaXMgMkQgc3VyZmFjZSwgdGhlIG1vcmUgZGlm +ZmVyZW50IHRoZSBzb3VuZCB3aWxsIGJlY29tZS4NDVVwIGRvd24gbW92ZW1lbnQgY29udHJvbHMgdGhl +IHN5bnRoIHRpbWJyZSwgbGVmdCByaWdodCBjb250cm9scyB0aGUgc2VxdWVuY2VyLiBXaGVuIHlvdSBj +bGljayDigJxzYXZlIHByZXNldOKAnSB5b3Ugd2lsbCBkcm9wIGEgcGluIG9udG8gdGhlIHN1cmZhY2Us +IGFuZCB5b3UgY2FuIHJldmlzaXQgdGhpcyBwb2ludCBhdCBhbnl0aW1lIGJ5IHNjcm9sbGluZyB0byBp +dC4gVGhpbmsgb2YgaXQgbGlrZSBhICJHb29nbGUgTWFwcyIgZm9yIHN5bnRoIHNvdW5kcy4uLg0NWW91 +IGNhbiB1c2UgYSBwaW5jaCBnZXN0dXJlIHRvIHpvb20gaW4gYW5kIG91dCBvZiB0aGUgc3VyZmFjZS4g +SW4gdGhpcyB3YXksIHlvdSBjYW4gZXhwbG9yZSB0aGUgIm5laWdoYm91cmhvb2QiIG9mIGEgcGFydGlj +dWxhciBzb3VuZC4gWm9vbWluZyBpbiB3aWxsIGVuYWJsZSB5b3UgdG8gZXhwbG9yZSBzbWFsbGVyIGxv +Y2FsaXRpZXMgb2YgdGhlIHNvdW5kIHNwYWNlLiBab29taW5nIG91dCB3aWxsIGdpdmUgeW91IGEgYmln +Z2VyIHBlcnNwZWN0aXZlLCBidXQgb2YgY291cnNlIHRoZSB0cmFuc2l0aW9ucyB3aWxsIGJlY29tZSBt +b3JlIHN1ZGRlbiBhbmQgcmFuZG9tIGFzIHlvdSBtb3ZlIGJpZ2dlciBkaXN0YW5jZXMuDQ1XaGF0IHdl +IGFyZSBhc2tpbmcgeW91LCB0aGUgcGFydGljaXBhbnQsIHRvIGRvIGlzIHVzZSB0aGUgem9vbWVyLCB0 +aGUgc2xpZGVycyBhbmQgYSBjb21iaW5hdGlvbiBvZiBib3RoIGZvciA1IG1pbnV0ZXMgZWFjaCwgYW5k +IHNhdmUgYW55IHNvdW5kcyB0aGF0IHlvdSBsaWtlLiBBbHNvIGNoZWNrIG91dCB0aGUgInJhbmRvbWlz +ZSIgYW5kICJsb2NrIiBidXR0b25zLiBBZnRlciB0aGlzIGEgc2hvcnQgcXVlc3Rpb25uYWlyZSB3aWxs +IGFwcGVhciB0aGF0IHdpbGwgaGVscCB1cyBhc3Nlc3MgdGhlIGludGVyZmFjZSBmdXJ0aGVyLiBBZnRl +ciB0aGF0LCBwbGVhc2UgZmVlbCBmcmVlIHRvIHVzZSBpdCBzb21lIG1vcmU6IHRoZSBtb3JlIGRhdGEg +d2UgZ2V0IHRoZSBiZXR0ZXIuIEZ1cnRoZXIgZXhjaXRpbmcgZmVhdHVyZXMgYXJlIHBsYW5uZWQgZm9y +IHRoaXMgYXBwLCBzbyBwbGVhc2Ugd2F0Y2ggb3V0IGZvciB1cGRhdGVzLg0NTk9URTogWW91ciBhY3Rp +b25zIHdpbGwgYmUgbG9nZ2VkLCBhbmQgc2VudCB0byBhIHNlY3VyZSBzZXJ2ZXIgaGVyZSBhdCBRdWVl +biBNYXJ5IFVuaXZlcnNpdHkuICBIb3dldmVyIG5vIHBlcnNvbmFsIGRhdGEgKG5hbWUsIGVtYWlsIGV0 +Yy4pIHdpbGwgYmUgY29sbGVjdGVkLCBhc3NvY2lhdGVkIHdpdGggdGhpcyBJRCBvciBzdG9yZWQgaW4g +dGhlIGRhdGFiYXNlLiBJdCBpcyBoaWdobHkgcmVjb21tZW5kZWQgdGhhdCB5b3UgYXJlIGNvbm5lY3Rl +ZCB0byBXaUZpIGludGVybmV0IHdoaWxzdCB1c2luZyB0aGlzIEFwcCwgb3RoZXJ3aXNlIHRoZSBsb2cg +ZGF0YSB3aWxsIHRha2UgdXAgc3BhY2Ugb24geW91ciBkZXZpY2UuDVRvIGNvbnNlbnQgdG8gdGhpcyBw +bGVhc2UgcHJlc3MgIkFncmVlIiBiZWxvdy4gVG8gZGVjbGluZSBqdXN0IGV4aXQgdGhlIGFwcC4NA</bytes> </object> <object class="NSColor" key="IBUITextColor"> <int key="NSColorSpace">1</int>
--- a/PresetAlertViewController.h Wed Feb 27 11:39:07 2013 +0000 +++ b/PresetAlertViewController.h Fri Mar 01 13:28:45 2013 +0000 @@ -10,9 +10,9 @@ -@interface PresetAlertViewController : NSObject <UIAlertViewDelegate> +@interface PresetAlertViewController : NSObject <UIAlertViewDelegate,UITextFieldDelegate> @property BOOL alertShowing; - (void)showPresetNamePrompt; - +@property (strong,nonatomic) UIAlertView * alert; @end
--- a/PresetAlertViewController.mm Wed Feb 27 11:39:07 2013 +0000 +++ b/PresetAlertViewController.mm Fri Mar 01 13:28:45 2013 +0000 @@ -6,6 +6,7 @@ // // #include "presetManager.h" +#include "testApp.h" #import "PresetAlertViewController.h" @@ -26,18 +27,19 @@ } - (void)showPresetNamePrompt{ - UIAlertView * alert = [[UIAlertView alloc] initWithTitle:@"Save" + self.alert = [[UIAlertView alloc] initWithTitle:@"Save" message:@"Enter preset name:" delegate:self cancelButtonTitle:@"Cancel" otherButtonTitles:@"Enter",nil]; - alert.alertViewStyle = UIAlertViewStylePlainTextInput; - UITextField * alertTextField = [alert textFieldAtIndex:0]; + self.alert.alertViewStyle = UIAlertViewStylePlainTextInput; + UITextField * alertTextField = [self.alert textFieldAtIndex:0]; + [alertTextField setDelegate:self]; alertTextField.keyboardType = UIKeyboardTypeDefault; alertTextField.placeholder = @"Preset Name"; - [alert show]; + [self.alert show]; self.alertShowing = YES; - [alert release]; + [self.alert release]; } - (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex{ @@ -56,12 +58,33 @@ }else if([[[alertView textFieldAtIndex:0] text] isEqualToString:@"printall"]){ presetManager.printAll(); eventLogger.printAll(); + }else if([[[alertView textFieldAtIndex:0] text] isEqualToString:@"questionnaire"]){ + ((testApp *)ofGetAppPtr())->interfaceSelected(3); + }else{ presetManager.addPreset([[[alertView textFieldAtIndex:0] text] cStringUsingEncoding:NSASCIIStringEncoding]); } } } +-(BOOL)textFieldShouldReturn:(UITextField *)textField{ + // save it + self.alertShowing = NO; + if([[[self.alert textFieldAtIndex:0] text] isEqualToString:@"newuser"]){ + // call new user stufff + eventLogger.newUser(); + }else if([[[self.alert textFieldAtIndex:0] text] isEqualToString:@"printall"]){ + presetManager.printAll(); + eventLogger.printAll(); + }else if([[[self.alert textFieldAtIndex:0] text] isEqualToString:@"questionnaire"]){ + ((testApp *)ofGetAppPtr())->interfaceSelected(3); + + }else{ + presetManager.addPreset([[[self.alert textFieldAtIndex:0] text] cStringUsingEncoding:NSASCIIStringEncoding]); + } + [self.alert dismissWithClickedButtonIndex:self.alert.firstOtherButtonIndex animated:YES]; + return YES; +} - (BOOL)alertViewShouldEnableFirstOtherButton:(UIAlertView *)alertView {
--- a/Question.m Wed Feb 27 11:39:07 2013 +0000 +++ b/Question.m Fri Mar 01 13:28:45 2013 +0000 @@ -51,7 +51,7 @@ }else if(type == SLIDERS_ZOOMER){ [Question setCount:NUM_CHOICES]; return [[NSArray alloc] initWithObjects: - @"definitely the Sliders", @"maybe the Sliders", @"neither", + @"definitely the Sliders", @"maybe the Sliders", @"Neither/Both equal", @"maybe the Zoomer", @"definitely the Zoomer", nil]; }else{ return nil;
--- a/QuestionnaireViewController.h Wed Feb 27 11:39:07 2013 +0000 +++ b/QuestionnaireViewController.h Fri Mar 01 13:28:45 2013 +0000 @@ -27,8 +27,14 @@ @property (strong, nonatomic) IBOutlet UIPickerView *picker; @property (retain, nonatomic) IBOutlet UITextView *commentText; +@property (retain, nonatomic) IBOutlet UISegmentedControl *numberChooser; +@property (retain, nonatomic) IBOutlet UIView *interfacePreferenceOptions; +@property (retain, nonatomic) IBOutlet UIView *lickertOptions; +@property (retain, nonatomic) IBOutlet UILabel *pleaseAnswer; //---------------------------------------------------------------- +- (IBAction)answerChosen:(id)sender; + -(IBAction)hide:(id)sender; -(IBAction)show:(id)sender; - (IBAction)nextQuestionPressed:(id)sender;
--- a/QuestionnaireViewController.mm Wed Feb 27 11:39:07 2013 +0000 +++ b/QuestionnaireViewController.mm Fri Mar 01 13:28:45 2013 +0000 @@ -62,6 +62,10 @@ self.previousButton.hidden = YES; // dont bother self.commentText.hidden = YES; self.finishButton.hidden = YES; + self.nextButton.hidden = YES; + + self.lickertOptions.hidden = NO; + self.interfacePreferenceOptions.hidden = YES; } //---------------------------------------------------------------- - (void)didReceiveMemoryWarning @@ -78,6 +82,10 @@ [_nextButton release]; [_previousButton release]; [_commentText release]; + [_numberChooser release]; + [_interfacePreferenceOptions release]; + [_lickertOptions release]; + [_pleaseAnswer release]; [super dealloc]; } //---------------------------------------------------------------- @@ -88,6 +96,10 @@ [self setNextButton:nil]; [self setPreviousButton:nil]; [self setCommentText:nil]; + [self setNumberChooser:nil]; + [self setInterfacePreferenceOptions:nil]; + [self setLickertOptions:nil]; + [self setPleaseAnswer:nil]; [super viewDidUnload]; } //---------------------------------------------------------------- @@ -152,8 +164,11 @@ self.previousButton.hidden = YES; self.finishButton.hidden = NO; + self.lickertOptions.hidden = YES; + self.interfacePreferenceOptions.hidden = YES; + self.titleText.text = @"Thank you!"; - + self.numberChooser.hidden = YES; self.commentText.hidden = NO; self.questionText.text = @"Thanks for helping science help you. Feel free to add further comments in the text box below, and then press 'finish' to go back and use the app, unhassled."; @@ -173,9 +188,17 @@ // refresh picker view content [picker reloadComponent:0]; - - NSLog(@"Prev answer answerInt %d", curQ.answer); + // show correct option number labels + if(curQ.questionType == AGREE_DISAGREE){ + self.lickertOptions.hidden = NO; + self.interfacePreferenceOptions.hidden = YES; + }else if(curQ.questionType == SLIDERS_ZOOMER){ + self.lickertOptions.hidden = YES; + self.interfacePreferenceOptions.hidden = NO; + } + + //NSLog(@"Prev answer answerInt %d", curQ.answer); [picker selectRow:2 inComponent:0 animated:YES]; } @@ -263,6 +286,27 @@ [self hide:self ]; return NO; } +- (IBAction)answerChosen:(id)sender { + self.pleaseAnswer.hidden = YES; + UISegmentedControl *seg = (UISegmentedControl *)sender; + Question *curQ = [questionArray objectAtIndex:self.currentQuestionIndex]; + // set question answerArray + curQ.answer = seg.selectedSegmentIndex; + + // chek wot we just rote + + NSLog(@"Answer: %d",curQ.answer); + + // automatically go next q + self.currentQuestionIndex++; + if(self.currentQuestionIndex >= [self.questionArray count]){ + [self showThanks]; + }else{ + [self loadQuestion:self.currentQuestionIndex]; + + } + +} @end // end implementation //---------------------------------------------------------------- //----------------------------------------------------------------
--- a/QuestionnaireViewController.xib Wed Feb 27 11:39:07 2013 +0000 +++ b/QuestionnaireViewController.xib Fri Mar 01 13:28:45 2013 +0000 @@ -1,20 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="8.00"> <data> - <int key="IBDocument.SystemTarget">1536</int> + <int key="IBDocument.SystemTarget">1552</int> <string key="IBDocument.SystemVersion">11G63</string> - <string key="IBDocument.InterfaceBuilderVersion">2844</string> + <string key="IBDocument.InterfaceBuilderVersion">3084</string> <string key="IBDocument.AppKitVersion">1138.51</string> <string key="IBDocument.HIToolboxVersion">569.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="NS.object.0">1930</string> + <string key="NS.object.0">2083</string> </object> <array key="IBDocument.IntegratedClassDependencies"> <string>IBProxyObject</string> <string>IBUIButton</string> <string>IBUILabel</string> <string>IBUIPickerView</string> + <string>IBUISegmentedControl</string> <string>IBUITextView</string> <string>IBUIView</string> </array> @@ -43,7 +44,7 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{324, 706}, {121, 44}}</string> <reference key="NSSuperview" ref="766721923"/> - <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="960474577"/> <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="IBUIOpaque">NO</bool> <string key="targetRuntimeIdentifier">IBIPadFramework</string> @@ -76,10 +77,9 @@ <object class="IBUILabel" id="783180915"> <reference key="NSNextResponder" ref="766721923"/> <int key="NSvFlags">292</int> - <string key="NSFrame">{{212, 226}, {212, 53}}</string> + <string key="NSFrame">{{143, 220}, {275, 53}}</string> <reference key="NSSuperview" ref="766721923"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="838658605"/> + <reference key="NSNextKeyView" ref="692955189"/> <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="IBUIOpaque">NO</bool> <bool key="IBUIClipsSubviews">YES</bool> @@ -97,11 +97,11 @@ <string key="name">Helvetica</string> <string key="family">Helvetica</string> <int key="traits">0</int> - <double key="pointSize">27</double> + <double key="pointSize">31</double> </object> <object class="NSFont" key="IBUIFont"> <string key="NSName">Helvetica</string> - <double key="NSSize">27</double> + <double key="NSSize">31</double> <int key="NSfFlags">16</int> </object> <bool key="IBUIAdjustsFontSizeToFit">NO</bool> @@ -109,43 +109,41 @@ <object class="IBUILabel" id="838658605"> <reference key="NSNextResponder" ref="766721923"/> <int key="NSvFlags">292</int> - <string key="NSFrame">{{212, 276}, {334, 125}}</string> + <string key="NSFrame">{{144, 281}, {472, 138}}</string> <reference key="NSSuperview" ref="766721923"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="791686696"/> + <reference key="NSNextKeyView" ref="660724550"/> <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="IBUIOpaque">NO</bool> <bool key="IBUIClipsSubviews">YES</bool> <int key="IBUIContentMode">7</int> <bool key="IBUIUserInteractionEnabled">NO</bool> <string key="targetRuntimeIdentifier">IBIPadFramework</string> - <string key="IBUIText">What did you think about all this crazy stuff that happened when you were using the thing that was going on before? </string> + <string key="IBUIText">Questions:</string> <object class="NSColor" key="IBUITextColor"> <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MCAwLjg3MTEwNjY5ODMgMQA</bytes> + <bytes key="NSRGB">MC45Mjc2NzQyNjcgMC45MjIwNTE5OTg4IDAuOTMzMjk2NTM1MwA</bytes> </object> <nil key="IBUIHighlightedColor"/> <int key="IBUIBaselineAdjustment">0</int> <int key="IBUINumberOfLines">4</int> <object class="IBUIFontDescription" key="IBUIFontDescription"> <int key="type">1</int> - <double key="pointSize">18</double> + <double key="pointSize">22</double> </object> <object class="NSFont" key="IBUIFont"> <string key="NSName">Helvetica</string> - <double key="NSSize">18</double> + <double key="NSSize">22</double> <int key="NSfFlags">16</int> </object> <bool key="IBUIAdjustsFontSizeToFit">NO</bool> - <double key="preferredMaxLayoutWidth">334</double> + <double key="preferredMaxLayoutWidth">472</double> </object> <object class="IBUIButton" id="960474577"> <reference key="NSNextResponder" ref="766721923"/> <int key="NSvFlags">292</int> <string key="NSFrame">{{425, 706}, {121, 44}}</string> <reference key="NSSuperview" ref="766721923"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="871929113"/> + <reference key="NSNextKeyView" ref="791686696"/> <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="IBUIOpaque">NO</bool> <string key="targetRuntimeIdentifier">IBIPadFramework</string> @@ -167,8 +165,7 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{212, 706}, {157, 44}}</string> <reference key="NSSuperview" ref="766721923"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="960474577"/> + <reference key="NSNextKeyView" ref="871929113"/> <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="IBUIOpaque">NO</bool> <string key="targetRuntimeIdentifier">IBIPadFramework</string> @@ -188,11 +185,9 @@ </object> <object class="IBUIPickerView" id="791686696"> <reference key="NSNextResponder" ref="766721923"/> - <int key="NSvFlags">290</int> - <string key="NSFrame">{{212, 409}, {334, 216}}</string> + <int key="NSvFlags">-2147483358</int> + <string key="NSFrame">{{413, 788}, {334, 216}}</string> <reference key="NSSuperview" ref="766721923"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="960632081"/> <string key="NSReuseIdentifierKey">_NS:9</string> <string key="targetRuntimeIdentifier">IBIPadFramework</string> <bool key="IBUIShowsSelectionIndicator">YES</bool> @@ -200,9 +195,8 @@ <object class="IBUITextView" id="960632081"> <reference key="NSNextResponder" ref="766721923"/> <int key="NSvFlags">292</int> - <string key="NSFrame">{{212, 409}, {334, 230}}</string> + <string key="NSFrame">{{212, 468}, {334, 230}}</string> <reference key="NSSuperview" ref="766721923"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="356964106"/> <string key="NSReuseIdentifierKey">_NS:9</string> <object class="NSColor" key="IBUIBackgroundColor"> @@ -228,11 +222,390 @@ <int key="NSfFlags">16</int> </object> </object> + <object class="IBUISegmentedControl" id="660724550"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{51, 533}, {667, 44}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSNextKeyView" ref="960632081"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <bool key="IBUIOpaque">NO</bool> + <string key="targetRuntimeIdentifier">IBIPadFramework</string> + <int key="IBNumberOfSegments">5</int> + <array key="IBSegmentTitles"> + <string>1</string> + <string>2</string> + <string>3</string> + <string>4</string> + <string>5</string> + </array> + <array class="NSMutableArray" key="IBSegmentWidths"> + <real value="0.0"/> + <real value="0.0"/> + <real value="0.0"/> + <real value="0.0"/> + <real value="0.0"/> + </array> + <array class="NSMutableArray" key="IBSegmentEnabledStates"> + <boolean value="YES"/> + <boolean value="YES"/> + <boolean value="YES"/> + <boolean value="YES"/> + <boolean value="YES"/> + </array> + <array class="NSMutableArray" key="IBSegmentContentOffsets"> + <string>{0, 0}</string> + <string>{0, 0}</string> + <string>{0, 0}</string> + <string>{0, 0}</string> + <string>{0, 0}</string> + </array> + <array class="NSMutableArray" key="IBSegmentImages"> + <object class="NSNull" id="4"/> + <reference ref="4"/> + <reference ref="4"/> + <reference ref="4"/> + <reference ref="4"/> + </array> + <bool key="IBMomentary">YES</bool> + </object> + <object class="IBUIView" id="638395666"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">-2147483356</int> + <array class="NSMutableArray" key="NSSubviews"> + <object class="IBUILabel" id="316486170"> + <reference key="NSNextResponder" ref="638395666"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{7, 29}, {132, 69}}</string> + <reference key="NSSuperview" ref="638395666"/> + <reference key="NSNextKeyView" ref="340544853"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClipsSubviews">YES</bool> + <int key="IBUIContentMode">7</int> + <bool key="IBUIUserInteractionEnabled">NO</bool> + <string key="targetRuntimeIdentifier">IBIPadFramework</string> + <string key="IBUIText">Definitely the sliders</string> + <object class="NSColor" key="IBUITextColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MSAxIDEAA</bytes> + <object class="NSColorSpace" key="NSCustomColorSpace" id="765822392"> + <int key="NSID">1</int> + </object> + </object> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <int key="IBUINumberOfLines">2</int> + <int key="IBUITextAlignment">1</int> + <object class="IBUIFontDescription" key="IBUIFontDescription" id="973990875"> + <int key="type">1</int> + <double key="pointSize">17</double> + </object> + <object class="NSFont" key="IBUIFont" id="471794535"> + <string key="NSName">Helvetica</string> + <double key="NSSize">17</double> + <int key="NSfFlags">16</int> + </object> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + <double key="preferredMaxLayoutWidth">132</double> + </object> + <object class="IBUILabel" id="340544853"> + <reference key="NSNextResponder" ref="638395666"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{139, 29}, {132, 69}}</string> + <reference key="NSSuperview" ref="638395666"/> + <reference key="NSNextKeyView" ref="674807401"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClipsSubviews">YES</bool> + <int key="IBUIContentMode">7</int> + <bool key="IBUIUserInteractionEnabled">NO</bool> + <string key="targetRuntimeIdentifier">IBIPadFramework</string> + <string key="IBUIText">Maybe the sliders</string> + <object class="NSColor" key="IBUITextColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MSAxIDEAA</bytes> + <reference key="NSCustomColorSpace" ref="765822392"/> + </object> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <int key="IBUINumberOfLines">2</int> + <int key="IBUITextAlignment">1</int> + <reference key="IBUIFontDescription" ref="973990875"/> + <reference key="IBUIFont" ref="471794535"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + <double key="preferredMaxLayoutWidth">132</double> + </object> + <object class="IBUILabel" id="674807401"> + <reference key="NSNextResponder" ref="638395666"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{267, 29}, {132, 69}}</string> + <reference key="NSSuperview" ref="638395666"/> + <reference key="NSNextKeyView" ref="85392105"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClipsSubviews">YES</bool> + <int key="IBUIContentMode">7</int> + <bool key="IBUIUserInteractionEnabled">NO</bool> + <string key="targetRuntimeIdentifier">IBIPadFramework</string> + <string key="IBUIText">Neither / both equal</string> + <object class="NSColor" key="IBUITextColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MSAxIDEAA</bytes> + <reference key="NSCustomColorSpace" ref="765822392"/> + </object> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <int key="IBUINumberOfLines">2</int> + <int key="IBUITextAlignment">1</int> + <reference key="IBUIFontDescription" ref="973990875"/> + <reference key="IBUIFont" ref="471794535"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + <double key="preferredMaxLayoutWidth">132</double> + </object> + <object class="IBUILabel" id="85392105"> + <reference key="NSNextResponder" ref="638395666"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{399, 29}, {132, 69}}</string> + <reference key="NSSuperview" ref="638395666"/> + <reference key="NSNextKeyView" ref="36668958"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClipsSubviews">YES</bool> + <int key="IBUIContentMode">7</int> + <bool key="IBUIUserInteractionEnabled">NO</bool> + <string key="targetRuntimeIdentifier">IBIPadFramework</string> + <string key="IBUIText">Maybe the Zoomer</string> + <object class="NSColor" key="IBUITextColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MSAxIDEAA</bytes> + <reference key="NSCustomColorSpace" ref="765822392"/> + </object> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <int key="IBUINumberOfLines">2</int> + <int key="IBUITextAlignment">1</int> + <reference key="IBUIFontDescription" ref="973990875"/> + <reference key="IBUIFont" ref="471794535"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + <double key="preferredMaxLayoutWidth">132</double> + </object> + <object class="IBUILabel" id="36668958"> + <reference key="NSNextResponder" ref="638395666"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{535, 29}, {132, 69}}</string> + <reference key="NSSuperview" ref="638395666"/> + <reference key="NSNextKeyView" ref="838658605"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClipsSubviews">YES</bool> + <int key="IBUIContentMode">7</int> + <bool key="IBUIUserInteractionEnabled">NO</bool> + <string key="targetRuntimeIdentifier">IBIPadFramework</string> + <string key="IBUIText">Definitely the Zoomer</string> + <object class="NSColor" key="IBUITextColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MSAxIDEAA</bytes> + <reference key="NSCustomColorSpace" ref="765822392"/> + </object> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <int key="IBUINumberOfLines">2</int> + <int key="IBUITextAlignment">1</int> + <reference key="IBUIFontDescription" ref="973990875"/> + <reference key="IBUIFont" ref="471794535"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + <double key="preferredMaxLayoutWidth">132</double> + </object> + </array> + <string key="NSFrame">{{51, 416}, {667, 118}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSNextKeyView" ref="316486170"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <object class="NSColor" key="IBUIBackgroundColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MC4yNzY0OTQ1NjUyIDAuMjc2NDk0NTY1MiAwLjI3NjQ5NDU2NTIAA</bytes> + </object> + <string key="targetRuntimeIdentifier">IBIPadFramework</string> + </object> + <object class="IBUIView" id="692955189"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">-2147483356</int> + <array class="NSMutableArray" key="NSSubviews"> + <object class="IBUILabel" id="353586444"> + <reference key="NSNextResponder" ref="692955189"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{7, 29}, {132, 69}}</string> + <reference key="NSSuperview" ref="692955189"/> + <reference key="NSNextKeyView" ref="790263268"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClipsSubviews">YES</bool> + <int key="IBUIContentMode">7</int> + <bool key="IBUIUserInteractionEnabled">NO</bool> + <string key="targetRuntimeIdentifier">IBIPadFramework</string> + <string key="IBUIText">Strongly disagree</string> + <object class="NSColor" key="IBUITextColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MSAxIDEAA</bytes> + <reference key="NSCustomColorSpace" ref="765822392"/> + </object> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <int key="IBUINumberOfLines">2</int> + <int key="IBUITextAlignment">1</int> + <reference key="IBUIFontDescription" ref="973990875"/> + <reference key="IBUIFont" ref="471794535"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + <double key="preferredMaxLayoutWidth">132</double> + </object> + <object class="IBUILabel" id="790263268"> + <reference key="NSNextResponder" ref="692955189"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{139, 29}, {132, 69}}</string> + <reference key="NSSuperview" ref="692955189"/> + <reference key="NSNextKeyView" ref="355647270"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClipsSubviews">YES</bool> + <int key="IBUIContentMode">7</int> + <bool key="IBUIUserInteractionEnabled">NO</bool> + <string key="targetRuntimeIdentifier">IBIPadFramework</string> + <string key="IBUIText">Disagree</string> + <object class="NSColor" key="IBUITextColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MSAxIDEAA</bytes> + <reference key="NSCustomColorSpace" ref="765822392"/> + </object> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <int key="IBUINumberOfLines">2</int> + <int key="IBUITextAlignment">1</int> + <reference key="IBUIFontDescription" ref="973990875"/> + <reference key="IBUIFont" ref="471794535"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + <double key="preferredMaxLayoutWidth">132</double> + </object> + <object class="IBUILabel" id="355647270"> + <reference key="NSNextResponder" ref="692955189"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{267, 29}, {132, 69}}</string> + <reference key="NSSuperview" ref="692955189"/> + <reference key="NSNextKeyView" ref="404206660"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClipsSubviews">YES</bool> + <int key="IBUIContentMode">7</int> + <bool key="IBUIUserInteractionEnabled">NO</bool> + <string key="targetRuntimeIdentifier">IBIPadFramework</string> + <string key="IBUIText">Neither agree nor disagree</string> + <object class="NSColor" key="IBUITextColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MSAxIDEAA</bytes> + <reference key="NSCustomColorSpace" ref="765822392"/> + </object> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <int key="IBUINumberOfLines">2</int> + <int key="IBUITextAlignment">1</int> + <reference key="IBUIFontDescription" ref="973990875"/> + <reference key="IBUIFont" ref="471794535"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + <double key="preferredMaxLayoutWidth">132</double> + </object> + <object class="IBUILabel" id="404206660"> + <reference key="NSNextResponder" ref="692955189"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{399, 29}, {132, 69}}</string> + <reference key="NSSuperview" ref="692955189"/> + <reference key="NSNextKeyView" ref="78723594"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClipsSubviews">YES</bool> + <int key="IBUIContentMode">7</int> + <bool key="IBUIUserInteractionEnabled">NO</bool> + <string key="targetRuntimeIdentifier">IBIPadFramework</string> + <string key="IBUIText">Agree</string> + <object class="NSColor" key="IBUITextColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MSAxIDEAA</bytes> + <reference key="NSCustomColorSpace" ref="765822392"/> + </object> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <int key="IBUINumberOfLines">2</int> + <int key="IBUITextAlignment">1</int> + <reference key="IBUIFontDescription" ref="973990875"/> + <reference key="IBUIFont" ref="471794535"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + <double key="preferredMaxLayoutWidth">132</double> + </object> + <object class="IBUILabel" id="78723594"> + <reference key="NSNextResponder" ref="692955189"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{535, 29}, {132, 69}}</string> + <reference key="NSSuperview" ref="692955189"/> + <reference key="NSNextKeyView" ref="638395666"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClipsSubviews">YES</bool> + <int key="IBUIContentMode">7</int> + <bool key="IBUIUserInteractionEnabled">NO</bool> + <string key="targetRuntimeIdentifier">IBIPadFramework</string> + <string key="IBUIText">Strongly agree</string> + <object class="NSColor" key="IBUITextColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MSAxIDEAA</bytes> + <reference key="NSCustomColorSpace" ref="765822392"/> + </object> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <int key="IBUINumberOfLines">2</int> + <int key="IBUITextAlignment">1</int> + <reference key="IBUIFontDescription" ref="973990875"/> + <reference key="IBUIFont" ref="471794535"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + <double key="preferredMaxLayoutWidth">132</double> + </object> + </array> + <string key="NSFrame">{{50, 416}, {667, 118}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSNextKeyView" ref="353586444"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <object class="NSColor" key="IBUIBackgroundColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MC4yNzY0OTQ1NjUyIDAuMjc2NDk0NTY1MiAwLjI3NjQ5NDU2NTIAA</bytes> + </object> + <string key="targetRuntimeIdentifier">IBIPadFramework</string> + </object> + <object class="IBUILabel" id="831894070"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{143, 104}, {434, 21}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSNextKeyView" ref="783180915"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClipsSubviews">YES</bool> + <int key="IBUIContentMode">7</int> + <bool key="IBUIUserInteractionEnabled">NO</bool> + <string key="targetRuntimeIdentifier">IBIPadFramework</string> + <string key="IBUIText">Thanks very much. Now please answer a few questions...</string> + <object class="NSColor" key="IBUITextColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MSAxIDEAA</bytes> + <reference key="NSCustomColorSpace" ref="765822392"/> + </object> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <reference key="IBUIFontDescription" ref="973990875"/> + <reference key="IBUIFont" ref="471794535"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + </object> </array> <string key="NSFrameSize">{768, 1024}</string> <reference key="NSSuperview"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="783180915"/> + <reference key="NSNextKeyView" ref="831894070"/> <object class="NSColor" key="IBUIBackgroundColor"> <int key="NSColorSpace">1</int> <bytes key="NSRGB">MCAwIDAAA</bytes> @@ -326,6 +699,38 @@ <int key="connectionID">64</int> </object> <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">numberChooser</string> + <reference key="source" ref="841351856"/> + <reference key="destination" ref="660724550"/> + </object> + <int key="connectionID">72</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">interfacePreferenceOptions</string> + <reference key="source" ref="841351856"/> + <reference key="destination" ref="638395666"/> + </object> + <int key="connectionID">81</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">lickertOptions</string> + <reference key="source" ref="841351856"/> + <reference key="destination" ref="692955189"/> + </object> + <int key="connectionID">88</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">pleaseAnswer</string> + <reference key="source" ref="841351856"/> + <reference key="destination" ref="831894070"/> + </object> + <int key="connectionID">91</int> + </object> + <object class="IBConnectionRecord"> <object class="IBCocoaTouchEventConnection" key="connection"> <string key="label">nextQuestionPressed:</string> <reference key="source" ref="960474577"/> @@ -368,6 +773,15 @@ </object> <int key="connectionID">58</int> </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchEventConnection" key="connection"> + <string key="label">answerChosen:</string> + <reference key="source" ref="660724550"/> + <reference key="destination" ref="841351856"/> + <int key="IBEventType">13</int> + </object> + <int key="connectionID">89</int> + </object> </array> <object class="IBMutableOrderedSet" key="objectRecords"> <array key="orderedObjects"> @@ -392,13 +806,17 @@ <int key="objectID">2</int> <reference key="object" ref="766721923"/> <array class="NSMutableArray" key="children"> - <reference ref="783180915"/> - <reference ref="838658605"/> - <reference ref="791686696"/> - <reference ref="960632081"/> <reference ref="356964106"/> <reference ref="960474577"/> <reference ref="871929113"/> + <reference ref="791686696"/> + <reference ref="660724550"/> + <reference ref="638395666"/> + <reference ref="692955189"/> + <reference ref="960632081"/> + <reference ref="838658605"/> + <reference ref="783180915"/> + <reference ref="831894070"/> </array> <reference key="parent" ref="0"/> </object> @@ -440,6 +858,90 @@ <reference key="object" ref="960632081"/> <reference key="parent" ref="766721923"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">71</int> + <reference key="object" ref="660724550"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">75</int> + <reference key="object" ref="638395666"/> + <array class="NSMutableArray" key="children"> + <reference ref="340544853"/> + <reference ref="316486170"/> + <reference ref="674807401"/> + <reference ref="85392105"/> + <reference ref="36668958"/> + </array> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">76</int> + <reference key="object" ref="316486170"/> + <reference key="parent" ref="638395666"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">77</int> + <reference key="object" ref="340544853"/> + <reference key="parent" ref="638395666"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">78</int> + <reference key="object" ref="674807401"/> + <reference key="parent" ref="638395666"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">79</int> + <reference key="object" ref="85392105"/> + <reference key="parent" ref="638395666"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">80</int> + <reference key="object" ref="36668958"/> + <reference key="parent" ref="638395666"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">82</int> + <reference key="object" ref="692955189"/> + <array class="NSMutableArray" key="children"> + <reference ref="78723594"/> + <reference ref="404206660"/> + <reference ref="355647270"/> + <reference ref="353586444"/> + <reference ref="790263268"/> + </array> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">87</int> + <reference key="object" ref="790263268"/> + <reference key="parent" ref="692955189"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">86</int> + <reference key="object" ref="353586444"/> + <reference key="parent" ref="692955189"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">85</int> + <reference key="object" ref="355647270"/> + <reference key="parent" ref="692955189"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">84</int> + <reference key="object" ref="404206660"/> + <reference key="parent" ref="692955189"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">83</int> + <reference key="object" ref="78723594"/> + <reference key="parent" ref="692955189"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">90</int> + <reference key="object" ref="831894070"/> + <reference key="parent" ref="766721923"/> + </object> </array> </object> <dictionary class="NSMutableDictionary" key="flattenedProperties"> @@ -454,93 +956,34 @@ <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="63.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="71.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <integer value="0" key="71.IUISegmentedControlInspectorSelectedSegmentMetadataKey"/> + <string key="75.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="76.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="77.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="78.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="79.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="80.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="82.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="83.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="84.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="85.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="86.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="87.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="90.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> </dictionary> <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/> <nil key="activeLocalization"/> <dictionary class="NSMutableDictionary" key="localizations"/> <nil key="sourceID"/> - <int key="maxID">64</int> + <int key="maxID">91</int> </object> - <object class="IBClassDescriber" key="IBDocument.Classes"> - <array class="NSMutableArray" key="referencedPartialClassDescriptions"> - <object class="IBPartialClassDescription"> - <string key="className">QuestionnaireViewController</string> - <string key="superclassName">UIViewController</string> - <dictionary class="NSMutableDictionary" key="actions"> - <string key="hide:">id</string> - <string key="nextQuestionPressed:">id</string> - <string key="previousQuestionPressed:">id</string> - <string key="show:">id</string> - </dictionary> - <dictionary class="NSMutableDictionary" key="actionInfosByName"> - <object class="IBActionInfo" key="hide:"> - <string key="name">hide:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo" key="nextQuestionPressed:"> - <string key="name">nextQuestionPressed:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo" key="previousQuestionPressed:"> - <string key="name">previousQuestionPressed:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo" key="show:"> - <string key="name">show:</string> - <string key="candidateClassName">id</string> - </object> - </dictionary> - <dictionary class="NSMutableDictionary" key="outlets"> - <string key="commentText">UITextView</string> - <string key="finishButton">UIButton</string> - <string key="nextButton">UIButton</string> - <string key="picker">UIPickerView</string> - <string key="previousButton">UIButton</string> - <string key="questionText">UILabel</string> - <string key="titleText">UILabel</string> - </dictionary> - <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName"> - <object class="IBToOneOutletInfo" key="commentText"> - <string key="name">commentText</string> - <string key="candidateClassName">UITextView</string> - </object> - <object class="IBToOneOutletInfo" key="finishButton"> - <string key="name">finishButton</string> - <string key="candidateClassName">UIButton</string> - </object> - <object class="IBToOneOutletInfo" key="nextButton"> - <string key="name">nextButton</string> - <string key="candidateClassName">UIButton</string> - </object> - <object class="IBToOneOutletInfo" key="picker"> - <string key="name">picker</string> - <string key="candidateClassName">UIPickerView</string> - </object> - <object class="IBToOneOutletInfo" key="previousButton"> - <string key="name">previousButton</string> - <string key="candidateClassName">UIButton</string> - </object> - <object class="IBToOneOutletInfo" key="questionText"> - <string key="name">questionText</string> - <string key="candidateClassName">UILabel</string> - </object> - <object class="IBToOneOutletInfo" key="titleText"> - <string key="name">titleText</string> - <string key="candidateClassName">UILabel</string> - </object> - </dictionary> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">./Classes/QuestionnaireViewController.h</string> - </object> - </object> - </array> - </object> + <object class="IBClassDescriber" key="IBDocument.Classes"/> <int key="IBDocument.localizationMode">0</int> <string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <int key="IBDocument.defaultPropertyAccessControl">3</int> - <string key="IBCocoaTouchPluginVersion">1930</string> + <string key="IBCocoaTouchPluginVersion">2083</string> </data> </archive>
--- a/ServerComms.mm Wed Feb 27 11:39:07 2013 +0000 +++ b/ServerComms.mm Fri Mar 01 13:28:45 2013 +0000 @@ -13,7 +13,13 @@ @implementation ServerComms // - +-(id)init{ + self = [super init]; + if(self != nil){ + self.requestInProgress = NO; + } + return self; +} // asynchronous one -(BOOL)doPostRequest:(NSString *)type withData:(NSString *)data{ @@ -25,7 +31,7 @@ NSString *localServerURL = @"http://127.0.0.1:8080/testservice/"; NSString *webServerURL = @"http://www.isophonics.net/datacollector/"; - NSString *urls = [webServerURL stringByAppendingString:type]; + NSString *urls = [localServerURL stringByAppendingString:type]; NSURL *url = [NSURL URLWithString:urls]; @@ -59,7 +65,7 @@ NSString *localServerURL = @"http://127.0.0.1:8080/testservice/"; NSString *webServerURL = @"http://www.isophonics.net/datacollector/"; - NSString *urls = [webServerURL stringByAppendingString:type]; + NSString *urls = [localServerURL stringByAppendingString:type]; NSURL *url = [NSURL URLWithString:urls]; @@ -102,6 +108,9 @@ success = true; }else{ success = false; + if([type isEqualToString:@"testConnection"]) eventLogger.testConnectionNotOK(); + if([type isEqualToString:@"eventlog"]) eventLogger.eventlogNotOK(); + if([type isEqualToString:@"questionnaire"]) eventLogger.questionnaireNotOK(); } // else check error?? @@ -121,7 +130,7 @@ NSString *responseDataString = [[NSString alloc] initWithData:d encoding:NSUTF8StringEncoding]; //NSString* responseDataString = [NSString stringWithUTF8String: ]; - NSLog(@"didRecieveDta %@", responseDataString); + NSLog(@" %@ didRecieveData %@",self.currentRequestType, responseDataString); [self.data appendData:d]; if([responseDataString isEqualToString:@"testConnection:OK"]){ @@ -132,23 +141,28 @@ }else if([responseDataString isEqualToString:@"eventlog:OK"]){ // call eventLogger eventlogUploadOK eventLogger.eventlogOK(); + }else{ + if([self.currentRequestType isEqualToString:@"testConnection"]) eventLogger.testConnectionNotOK(); + if([self.currentRequestType isEqualToString:@"eventlog"]) eventLogger.eventlogNotOK(); + if([self.currentRequestType isEqualToString:@"questionnaire"]) eventLogger.questionnaireNotOK(); } - // or? - /* - if([self.currentRequestType isEqualToString:@"testConnection"){ - - } - */ } - (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error { - UIAlertView * av = [ [UIAlertView alloc] initWithTitle:NSLocalizedString(@"Error", @"") - message:[error localizedDescription] - delegate:nil - cancelButtonTitle:NSLocalizedString(@"OK", @"") - otherButtonTitles:nil ]; - [av show]; + NSLog(@"fail with error"); + if([self.currentRequestType isEqualToString:@"testConnection"]) { + UIAlertView * av = [ [UIAlertView alloc] initWithTitle:NSLocalizedString(@"Sorry", @"") + message:[error localizedDescription] + delegate:nil + cancelButtonTitle:NSLocalizedString(@"OK", @"") + otherButtonTitles:nil ]; + [av show]; + eventLogger.testConnectionNotOK(); + + } + if([self.currentRequestType isEqualToString:@"eventlog"]) eventLogger.eventlogNotOK(); + if([self.currentRequestType isEqualToString:@"questionnaire"]) eventLogger.questionnaireNotOK(); self.requestInProgress = NO; // we won't know what kind of request method this was... }
--- a/TimedSessionController.h Wed Feb 27 11:39:07 2013 +0000 +++ b/TimedSessionController.h Fri Mar 01 13:28:45 2013 +0000 @@ -5,7 +5,7 @@ // Created by Robert Tubb on 18/02/2013. // // -#define SECONDS_PER_INTERFACE 300 +#define SECONDS_PER_INTERFACE 1 #import <Foundation/Foundation.h>
--- a/TimedSessionController.mm Wed Feb 27 11:39:07 2013 +0000 +++ b/TimedSessionController.mm Fri Mar 01 13:28:45 2013 +0000 @@ -27,8 +27,6 @@ - (void)setAppRef:(id)theOFApp{ self.theOFAppRef = theOFApp; theOrder = arc4random() % 6; - NSLog(@"the order: %d", theOrder); - scount = 0; } -(void)startTimer{ @@ -61,7 +59,13 @@ }else{ themessage = [alertMessages objectAtIndex:3 ]; } - UIAlertView * alert = [[UIAlertView alloc] initWithTitle:@"Thanks!" + NSString * topmsg; + if(scount == 0){ + topmsg = @"OK"; + }else{ + topmsg = @"Thanks!"; + } + UIAlertView * alert = [[UIAlertView alloc] initWithTitle:topmsg message:themessage delegate:self cancelButtonTitle:@"Continue" @@ -69,6 +73,7 @@ alert.alertViewStyle = UIAlertViewStyleDefault; [alert show]; [alert release]; + }
--- a/UsernameAlertViewController.h Wed Feb 27 11:39:07 2013 +0000 +++ b/UsernameAlertViewController.h Fri Mar 01 13:28:45 2013 +0000 @@ -8,8 +8,9 @@ #import <Foundation/Foundation.h> -@interface UsernameAlertViewController : NSObject <UIAlertViewDelegate> +@interface UsernameAlertViewController : NSObject <UIAlertViewDelegate, UITextFieldDelegate> +@property (strong,nonatomic) UIAlertView * alert; -(void)showUserNamePrompt; @end
--- a/UsernameAlertViewController.mm Wed Feb 27 11:39:07 2013 +0000 +++ b/UsernameAlertViewController.mm Fri Mar 01 13:28:45 2013 +0000 @@ -17,17 +17,18 @@ -(void)showUserNamePrompt{ - UIAlertView * alert = [[UIAlertView alloc] initWithTitle:@"Hello!" + self.alert = [[UIAlertView alloc] initWithTitle:@"Hello!" message:@"Please enter your name:" delegate:self cancelButtonTitle:@"Continue" otherButtonTitles:nil]; - alert.alertViewStyle = UIAlertViewStylePlainTextInput; - UITextField * alertTextField = [alert textFieldAtIndex:0]; + self.alert.alertViewStyle = UIAlertViewStylePlainTextInput; + UITextField * alertTextField = [self.alert textFieldAtIndex:0]; + [alertTextField setDelegate:self]; alertTextField.keyboardType = UIKeyboardTypeDefault; alertTextField.placeholder = @"Username"; - [alert show]; - [alert release]; + [self.alert show]; + [self.alert release]; } @@ -46,6 +47,20 @@ } +-(BOOL)textFieldShouldReturn:(UITextField *)textField{ + + NSLog(@"Entered: %@",[[self.alert textFieldAtIndex:0] text]); + NSString *userName = [[self.alert textFieldAtIndex:0] text]; + if ([userName isEqualToString:@""]){ + [self showUserNamePrompt]; + + }else{ + eventLogger.setUsername([userName cStringUsingEncoding:NSASCIIStringEncoding]); + + } + [self.alert dismissWithClickedButtonIndex:self.alert.firstOtherButtonIndex animated:YES]; + return YES; +} - (BOOL)alertViewShouldEnableFirstOtherButton:(UIAlertView *)alertView {
--- a/eventLogger.h Wed Feb 27 11:39:07 2013 +0000 +++ b/eventLogger.h Fri Mar 01 13:28:45 2013 +0000 @@ -31,12 +31,11 @@ #define EVENT_LOG_FILENAME "log.json" //#define LOGGING_SERVER_URL "http://www.isophonics.net/datacollector/" #define LOGGING_SERVER_URL "http://127.0.0.1:8080/testservice/" -#define UPLOAD_CHUNK_SIZE 20 +#define UPLOAD_CHUNK_SIZE 2000 -#define QUESTIONNAIRE_ENABLE_TIME 100000 // milliseconds -#define APP_CREATION_TIME 381429000000 // milliseconds to the time i wrote this wee blighter saves digits +#define APP_CREATION_TIME 381429000000 // milliseconds to the time i wrote this wee blighter. saves digits -#define PROGRAM_VERSION 0.1 // IMPORTANT TOCHNAGE! +#define PROGRAM_VERSION 0.2 // IMPORTANT TOCHNAGE! // can add but don't change ordering - this will invalidate logs enum leventType {SAVE_PRESET, // 0 @@ -58,7 +57,8 @@ SYNTH_LOCKED, // 16 PLAY_PRESSED, // 17 PAUSE_PRESSED, // 18 - HELP_PRESSED}; // 19 + HELP_PRESSED, // 19 + QUESTIONNAIRE_COMPLETED}; // 20 //--------------------------------------------------------------------------- @@ -142,16 +142,21 @@ public: int nextUploadNumber; bool loggingEnabled; + bool logUploadInProgress; bool serverConnectionOK; bool consentGiven; bool questionnaireCompleted; bool questionnaireUploaded; + unsigned int deviceID; unsigned int totalInteractionTime, savedInteractionTime, sessionTime, sessionStartTime; string userName; // not unique +// constr EventLogger(); + +// public methods: void init(); void exitAndSave(); void setUsername(const char *u); @@ -169,10 +174,7 @@ void printAll(); private: - - int currentHTTPRequestID; - - + vector<lEvent> theEvents; void thinnedLogEvent(lEvent nextEvent); @@ -186,7 +188,7 @@ vector<int> questionnaireAnswers; int interfaceOrder; - +// private methods void checkLogFile(); void deleteLogs(); // new user bool uploadEventLog(bool async);
--- a/eventLogger.mm Wed Feb 27 11:39:07 2013 +0000 +++ b/eventLogger.mm Fri Mar 01 13:28:45 2013 +0000 @@ -13,14 +13,12 @@ //--------------------------------------------------------------------------- EventLogger::EventLogger(){ - //QuestionnaireViewController * questionnaireViewController; - consentGiven = true; // unless told otherwise by introView + consentGiven = true; // unless told otherwise firstAppOpen loggingEnabled = true; serverConnectionOK = false; questionnaireCompleted = false; questionnaireUploaded = false; - currentHTTPRequestID = -1; logUploadInProgress = false; ofxiPhoneDeviceType iOSdeviceType = ofxiPhoneGetDeviceType(); cout << "Device: " << iOSdeviceType << '\n'; @@ -37,15 +35,21 @@ checkExistingLogFile(ofxiPhoneGetDocumentsDirectory() + EVENT_LOG_FILENAME); sessionStartTime = ofGetSystemTime(); + + logEvent(APP_STARTED); + + serverComms = [[ServerComms alloc] init]; testConnection(); - logEvent(APP_STARTED); - - NSString *jsondata; - jsondata=@"{\"test\":\"test\""; - serverComms = [[ServerComms alloc] init]; - +} +//--------------------------------------------------------------------------- +bool EventLogger::testConnection(){ + Json::Value root; + root["x"] = "y"; + cout << "testConnection\n"; + sendToServer("testConnection", root, true); + } //--------------------------------------------------------------------------- // this reads the persistent log file , checks if we've used the app before and @@ -164,13 +168,14 @@ questionnaireAnswers = answers; questionnaireComments = userComments; uploadQuestionnaire(); + logEvent(QUESTIONNAIRE_COMPLETED); } //--------------------------------------------------------------------------- void EventLogger::uploadQuestionnaire(){ // show indicator cout << "^^^^^^^^ UPLOADING QUESTIONNAIRE ^^^^^^^^ \n"; - + cout << questionnaireToJson() << "\n"; sendToServer("questionnaire", questionnaireToJson(), true); } @@ -203,6 +208,7 @@ } //----------------------------- void EventLogger::eventlogOK(){ + // IF UPLAODING FROM IPAD TO XCODE //theEvents.clear(); cout << "EVENT LOG UPLOAD SUCCESS\n"; nextUploadNumber++; @@ -230,72 +236,8 @@ // alert? } -/* -void EventLogger::urlResponse(ofHttpResponse & response){ - cout << "gotHTTPRequestStatus\n"; - cout << "HTTP REQUEST NAME " << response.request.name << "\n"; - cout << "HTTP STATUS " << response.status << "\n"; - cout << "HTTP ERROR " << response.error << "\n"; - cout << "HTTP DATA " << response.data << "\n"; // ofBuffer - - bool sent; - stringstream respStr; - respStr << response.data; - - if (response.status == 200){ - if(respStr.str() == "OK"){ - - sent = true; - }else{ - // not ok - // problem serverside - sent = false; - } - }else{ - - sent = false; - // SHOW AN ALERT TO USER? - } - // now do request specific stuff - if(response.request.name == "eventlog"){ - if(!sent){ - // try later - nextUploadQty += UPLOAD_CHUNK_SIZE; - }else{ - - // if success - clear memory - theEvents.clear(); - cout << "UPLOAD SUCCESS\n"; - nextUploadNumber++; - } - logUploadInProgress = false; - }else if(response.request.name == "questionnaire"){ - if(sent){ - questionnaireUploaded = true; - }else{ - questionnaireUploaded = false; // will try next time... when? - } - }else if(response.request.name == "testConnection"){ - - if (sent){ - cout << "^^^^^^^^ server connection OK ^^^^^^^^ \n"; - serverConnectionOK = true; - }else{ - serverConnectionOK = false; - cout << "server connection ERROR \n"; - } - } -} - */ -//--------------------------------------------------------------------------- -bool EventLogger::testConnection(){ - Json::Value root; - root["test"] = "test"; - sendToServer("testConnection", root, true); - -} //--------------------------------------------------------------------------- bool EventLogger::uploadEventLog(bool async){ @@ -311,6 +253,7 @@ }else{ // if success - clear memory + // IF UPLAODING FROM IPAD TO XCODE COMMENT OUT //theEvents.clear(); cout << "UPLOAD SUCCESS\n"; nextUploadNumber++; @@ -364,11 +307,11 @@ return; } - // if previous event is more than 300ms ago, or event type has changed, log both of them + // 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 || newEvent.eventType != previousEvent.eventType){ // if prev event not logged, log it - if((*theEvents.end()).eventTime != previousEvent.eventTime){ + if(theEvents.back().eventTime != previousEvent.eventTime){ theEvents.push_back(previousEvent); } theEvents.push_back(newEvent); @@ -468,8 +411,8 @@ // save user details string fname = ofxiPhoneGetDocumentsDirectory() + EVENT_LOG_FILENAME; - // try to upload TODO (no - might hang and prevent exit???) - // do it async because event list needs to be cleared to prevent saving on device + // try to upload + // do it sync because event list needs to be cleared to prevent saving on device uploadEventLog(false); // write to file
--- a/presetManager.h Wed Feb 27 11:39:07 2013 +0000 +++ b/presetManager.h Fri Mar 01 13:28:45 2013 +0000 @@ -28,8 +28,6 @@ #import "presetAlertViewController.h" - - //--------------------------------------------------------------------------- class Preset{ public:
--- a/presetManager.mm Wed Feb 27 11:39:07 2013 +0000 +++ b/presetManager.mm Fri Mar 01 13:28:45 2013 +0000 @@ -176,6 +176,7 @@ presetAlertShowing = false; // check for same name vector<Preset *>::iterator iter; + /* for(iter = thePresets.begin(); iter < thePresets.end(); iter++){ if ((*iter)->name == name){ cout << " Preset by that name exists\n"; @@ -184,14 +185,16 @@ return -1; } } + if(name == ""){ cout << "Please name preset\n"; return -2; } - // yuk shouldn't have to know about eventlogger and grid view... + */ + // hmm shouldn't have to know about eventlogger and grid view... thePresets.push_back(new Preset(theGridView.getCoord(), name,nextID, eventLogger.userName, eventLogger.deviceID)); - + eventLogger.logEvent(SAVE_PRESET, theGridView.getCoord()); // poke grid view to get it to show details theGridView.snapCheck(); // if ok