Mercurial > hg > soniczoomios
changeset 15:e45c3e631d20
View fiddling
author | Robert Tubb <rt300@eecs.qmul.ac.uk> |
---|---|
date | Thu, 17 Jan 2013 13:01:19 +0000 |
parents | 6a9191f5b269 |
children | fb2ef16dd013 |
files | QuestionnaireViewController.h QuestionnaireViewController.m QuestionnaireViewController.xib eventLogger.h iViewController.mm testApp.mm |
diffstat | 6 files changed, 305 insertions(+), 522 deletions(-) [+] |
line wrap: on
line diff
--- a/QuestionnaireViewController.h Wed Jan 16 19:03:51 2013 +0000 +++ b/QuestionnaireViewController.h Thu Jan 17 13:01:19 2013 +0000 @@ -9,8 +9,9 @@ #import <UIKit/UIKit.h> @interface QuestionnaireViewController : UIViewController -@property (retain, nonatomic) IBOutlet UISegmentedControl *answerPressed; + @property (retain, nonatomic) IBOutlet UILabel *questionText; +@property (retain, nonatomic) IBOutlet UILabel *titleText; //---------------------------------------------------------------- -(IBAction)hide:(id)sender; @@ -18,6 +19,7 @@ -(IBAction)show:(id)sender; //---------------------------------------------------------------- - (IBAction)nextQuestionPressed:(id)sender; +- (IBAction)previousQuestionPressed:(id)sender; -(void)populateQuestionArray; @end
--- a/QuestionnaireViewController.m Wed Jan 16 19:03:51 2013 +0000 +++ b/QuestionnaireViewController.m Thu Jan 17 13:01:19 2013 +0000 @@ -14,22 +14,7 @@ @property (strong, nonatomic) NSArray * answerArray; @property (nonatomic) NSInteger currentQuestionIndex; /* -@"I am familiar with music software and synthesisers." -@"The best way to get a feel for the possibilities of the synth was with:" -@"Interesting sounds could be discovered more quickly as a result of using:" -@"A sound could be fine tuned more easily using:" -@"The correspondence between the sliders and the grid was understandable." -@"The interface that felt more familiar was:" -@"Scrolling a greater distance the zoom grid seemed to correspond to larger difference in the sound." -@"The ability to see other presets on the grid was useful." -@"The range of sounds was too limited to be able to judge the eventual usefulness of the interface." -@"The interface better for generating new ideas was" -@"The interface better for live performance would be:" - @"A specific type of sound could be found more quickly using:" - @"I felt more in control when using:" -@"The Zoomer was an improvement on just using the randomiser." -@"The combination of Zoomer and Sliders was more useful than either individually." -@"Overall, I preferred using:" + */ @@ -67,14 +52,16 @@ } //---------------------------------------------------------------- - (void)dealloc { - [_answerPressed release]; + [_questionText release]; + [_titleText release]; [super dealloc]; } //---------------------------------------------------------------- - (void)viewDidUnload { [self setAnswerPressed:nil]; [self setQuestionText:nil]; + [self setTitleText:nil]; [super viewDidUnload]; } //---------------------------------------------------------------- @@ -95,21 +82,76 @@ - (IBAction)nextQuestionPressed:(id)sender { // save answer ? no button did that hopefully + // if last question show thanks - // else go to next self.currentQuestionIndex++; + if(self.currentQuestionIndex >= [self.questionArray count]){ + [self showThanks]; + }else{ + [self loadQuestion:self.currentQuestionIndex]; + + } +} + +- (IBAction)previousQuestionPressed:(id)sender { + self.currentQuestionIndex--; + if(self.currentQuestionIndex < 0){ + // nothing + self.currentQuestionIndex = 0; + }else{ + [self loadQuestion:self.currentQuestionIndex]; + } +} +//---------------------------------------------------------------- + +- (void)showThanks{ + // hide next question button + // hide selector + self.titleText.text = @"Thank you!"; + + self.questionText.text = @"Thanks for helping science help you. Visit the study website to keep abreast of exciting events."; +} +/* +- (IBAction)previousQuestionPressed:(id)sender { + self.currentQuestionIndex--; + if(self.currentQuestionIndex > [self.questionArray count]){ + [self showThanks]; + } [self loadQuestion:self.currentQuestionIndex]; } + */ //---------------------------------------------------------------- - (void)loadQuestion:(NSInteger)questionIndex { // populate text fields with question + NSString *qtitle; + qtitle = [@"Question " stringByAppendingFormat:@"%d",questionIndex+1]; + self.titleText.text = qtitle; + self.questionText.text = [self.questionArray objectAtIndex:questionIndex]; + // if question already answered show that } //---------------------------------------------------------------- - (void)populateQuestionArray{ - self.questionArray = [[NSArray alloc] initWithObjects:@"one", @"two", @"buckle", nil]; + self.questionArray = [[NSArray alloc] initWithObjects: + @"I am familiar with music software and synthesisers.", + @"The best way to get a feel for the possibilities of the synth was with:", + @"Interesting sounds could be discovered more quickly as a result of using:", + @"A sound could be fine tuned more easily using:", + @"The correspondence between the sliders and the grid was understandable.", + @"The interface that felt more familiar was:", + @"Scrolling a greater distance the zoom grid seemed to correspond to larger difference in the sound.", + @"The ability to see other presets on the grid was useful.", + @"The range of sounds was too limited to be able to judge the eventual usefulness of the interface.", + @"The interface better for generating new ideas was", + @"The interface better for live performance would be:", + @"A specific type of sound could be found more quickly using:", + @"I felt more in control when using:", + @"The Zoomer was an improvement on just using a randomiser.", + @"The combination of Zoomer and Sliders was more useful than either individually.", + @"Overall, I preferred using:", + nil]; } //----------------------------------------------------------------
--- a/QuestionnaireViewController.xib Wed Jan 16 19:03:51 2013 +0000 +++ b/QuestionnaireViewController.xib Thu Jan 17 13:01:19 2013 +0000 @@ -11,7 +11,6 @@ <string key="NS.object.0">1930</string> </object> <array key="IBDocument.IntegratedClassDependencies"> - <string>IBNSLayoutConstraint</string> <string>IBProxyObject</string> <string>IBUIButton</string> <string>IBUILabel</string> @@ -51,27 +50,24 @@ <int key="IBUIContentMode">7</int> <bool key="IBUIUserInteractionEnabled">NO</bool> <string key="targetRuntimeIdentifier">IBIPadFramework</string> - <bool key="IBUIUsesAttributedText">YES</bool> - <object class="NSAttributedString" key="IBUIAttributedText"> - <string key="NSString">Question 1</string> - <dictionary key="NSAttributes"> - <object class="NSColor" key="NSColor" id="326394288"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MCAwIDAAA</bytes> - <string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string> - </object> - <object class="NSFont" key="NSFont"> - <string key="NSName">Helvetica</string> - <double key="NSSize">25</double> - <int key="NSfFlags">16</int> - </object> - <object class="NSMutableParagraphStyle" key="NSParagraphStyle"> - <nil key="NSTabStops"/> - </object> - </dictionary> + <string key="IBUIText">Question 1</string> + <object class="NSColor" key="IBUITextColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MCAwLjg3MTEwNjY5ODMgMQA</bytes> </object> <nil key="IBUIHighlightedColor"/> <int key="IBUIBaselineAdjustment">0</int> + <object class="IBUIFontDescription" key="IBUIFontDescription"> + <string key="name">Helvetica</string> + <string key="family">Helvetica</string> + <int key="traits">0</int> + <double key="pointSize">27</double> + </object> + <object class="NSFont" key="IBUIFont"> + <string key="NSName">Helvetica</string> + <double key="NSSize">27</double> + <int key="NSfFlags">16</int> + </object> <bool key="IBUIAdjustsFontSizeToFit">NO</bool> </object> <object class="IBUILabel" id="838658605"> @@ -88,7 +84,10 @@ <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> - <reference key="IBUITextColor" ref="326394288"/> + <object class="NSColor" key="IBUITextColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MCAwLjg3MTEwNjY5ODMgMQA</bytes> + </object> <nil key="IBUIHighlightedColor"/> <int key="IBUIBaselineAdjustment">0</int> <int key="IBUINumberOfLines">3</int> @@ -169,18 +168,18 @@ <string key="NSFrame">{{118, 347}, {533, 44}}</string> <reference key="NSSuperview" ref="766721923"/> <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="356964106"/> + <reference key="NSNextKeyView" ref="547100810"/> <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="IBUIOpaque">NO</bool> <string key="targetRuntimeIdentifier">IBIPadFramework</string> <int key="IBNumberOfSegments">5</int> <int key="IBSelectedSegmentIndex">0</int> <array key="IBSegmentTitles"> - <string>No</string> - <string>Disagree</string> - <string>Neither</string> - <string>Agree</string> - <string>Well Agree</string> + <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"/> @@ -233,21 +232,168 @@ <reference key="IBUIFontDescription" ref="113804367"/> <reference key="IBUIFont" ref="830486844"/> </object> + <object class="IBUILabel" id="547100810"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{118, 398}, {106, 49}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="1020792119"/> + <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" id="326394288"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MCAwIDAAA</bytes> + <string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string> + </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="604671235"> + <int key="type">1</int> + <double key="pointSize">17</double> + </object> + <object class="NSFont" key="IBUIFont" id="764629662"> + <string key="NSName">Helvetica</string> + <double key="NSSize">17</double> + <int key="NSfFlags">16</int> + </object> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + <double key="preferredMaxLayoutWidth">106</double> + </object> + <object class="IBUILabel" id="1020792119"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{224, 398}, {106, 49}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="593355119"/> + <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> + <reference key="IBUITextColor" ref="326394288"/> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <int key="IBUINumberOfLines">2</int> + <int key="IBUITextAlignment">1</int> + <reference key="IBUIFontDescription" ref="604671235"/> + <reference key="IBUIFont" ref="764629662"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + <double key="preferredMaxLayoutWidth">106</double> + </object> + <object class="IBUILabel" id="593355119"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{331, 398}, {106, 49}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="1027404905"/> + <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> + <reference key="IBUITextColor" ref="326394288"/> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <int key="IBUINumberOfLines">2</int> + <int key="IBUITextAlignment">1</int> + <reference key="IBUIFontDescription" ref="604671235"/> + <reference key="IBUIFont" ref="764629662"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + <double key="preferredMaxLayoutWidth">106</double> + </object> + <object class="IBUILabel" id="1027404905"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{438, 398}, {106, 49}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="384625478"/> + <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> + <reference key="IBUITextColor" ref="326394288"/> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <int key="IBUINumberOfLines">2</int> + <int key="IBUITextAlignment">1</int> + <reference key="IBUIFontDescription" ref="604671235"/> + <reference key="IBUIFont" ref="764629662"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + <double key="preferredMaxLayoutWidth">106</double> + </object> + <object class="IBUILabel" id="384625478"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{537, 398}, {106, 49}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="356964106"/> + <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> + <reference key="IBUITextColor" ref="326394288"/> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <int key="IBUINumberOfLines">2</int> + <int key="IBUITextAlignment">1</int> + <reference key="IBUIFontDescription" ref="604671235"/> + <reference key="IBUIFont" ref="764629662"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + <double key="preferredMaxLayoutWidth">106</double> + </object> </array> - <string key="NSFrame">{{0, 20}, {768, 1004}}</string> + <string key="NSFrameSize">{1024, 768}</string> <reference key="NSSuperview"/> <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="783180915"/> <object class="NSColor" key="IBUIBackgroundColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MQA</bytes> - <object class="NSColorSpace" key="NSCustomColorSpace"> - <int key="NSID">2</int> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MCAwIDAAA</bytes> + </object> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClearsContextBeforeDrawing">NO</bool> + <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics"> + <int key="IBUIInterfaceOrientation">3</int> + <int key="interfaceOrientation">3</int> + </object> + <object class="IBUIScreenMetrics" key="IBUISimulatedDestinationMetrics"> + <string key="IBUISimulatedSizeMetricsClass">IBUIScreenMetrics</string> + <object class="NSMutableDictionary" key="IBUINormalizedOrientationToSizeMap"> + <bool key="EncodedWithXMLCoder">YES</bool> + <array key="dict.sortedKeys"> + <integer value="1"/> + <integer value="3"/> + </array> + <array key="dict.values"> + <string>{768, 1024}</string> + <string>{1024, 768}</string> + </array> </object> - </object> - <bool key="IBUIClearsContextBeforeDrawing">NO</bool> - <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"> - <int key="IBUIStatusBarStyle">2</int> + <string key="IBUITargetRuntime">IBIPadFramework</string> + <string key="IBUIDisplayName">iPad Full Screen</string> + <int key="IBUIType">1</int> </object> <string key="targetRuntimeIdentifier">IBIPadFramework</string> </object> @@ -271,6 +417,14 @@ <int key="connectionID">41</int> </object> <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">titleText</string> + <reference key="source" ref="841351856"/> + <reference key="destination" ref="783180915"/> + </object> + <int key="connectionID">42</int> + </object> + <object class="IBConnectionRecord"> <object class="IBCocoaTouchEventConnection" key="connection"> <string key="label">nextQuestionPressed:</string> <reference key="source" ref="960474577"/> @@ -281,6 +435,15 @@ </object> <object class="IBConnectionRecord"> <object class="IBCocoaTouchEventConnection" key="connection"> + <string key="label">previousQuestionPressed:</string> + <reference key="source" ref="356964106"/> + <reference key="destination" ref="841351856"/> + <int key="IBEventType">7</int> + </object> + <int key="connectionID">50</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchEventConnection" key="connection"> <string key="label">hide:</string> <reference key="source" ref="871929113"/> <reference key="destination" ref="841351856"/> @@ -312,338 +475,36 @@ <int key="objectID">2</int> <reference key="object" ref="766721923"/> <array class="NSMutableArray" key="children"> - <object class="IBNSLayoutConstraint" id="805570680"> - <reference key="firstItem" ref="766721923"/> - <int key="firstAttribute">4</int> - <int key="relation">0</int> - <reference key="secondItem" ref="871929113"/> - <int key="secondAttribute">4</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">64</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="766721923"/> - <int key="scoringType">3</int> - <float key="scoringTypeFloat">9</float> - <int key="contentType">3</int> - </object> - <object class="IBNSLayoutConstraint" id="461663066"> - <reference key="firstItem" ref="871929113"/> - <int key="firstAttribute">5</int> - <int key="relation">0</int> - <reference key="secondItem" ref="960474577"/> - <int key="secondAttribute">5</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">0.0</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="766721923"/> - <int key="scoringType">6</int> - <float key="scoringTypeFloat">24</float> - <int key="contentType">2</int> - </object> - <object class="IBNSLayoutConstraint" id="735397257"> - <reference key="firstItem" ref="960474577"/> - <int key="firstAttribute">6</int> - <int key="relation">0</int> - <reference key="secondItem" ref="871929113"/> - <int key="secondAttribute">6</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">0.0</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="766721923"/> - <int key="scoringType">6</int> - <float key="scoringTypeFloat">24</float> - <int key="contentType">2</int> - </object> - <object class="IBNSLayoutConstraint" id="542523037"> - <reference key="firstItem" ref="960474577"/> - <int key="firstAttribute">6</int> - <int key="relation">0</int> - <reference key="secondItem" ref="744737041"/> - <int key="secondAttribute">6</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">0.0</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="766721923"/> - <int key="scoringType">6</int> - <float key="scoringTypeFloat">24</float> - <int key="contentType">2</int> - </object> - <object class="IBNSLayoutConstraint" id="172265991"> - <reference key="firstItem" ref="356964106"/> - <int key="firstAttribute">3</int> - <int key="relation">0</int> - <reference key="secondItem" ref="766721923"/> - <int key="secondAttribute">3</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">482</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="766721923"/> - <int key="scoringType">3</int> - <float key="scoringTypeFloat">9</float> - <int key="contentType">3</int> - </object> - <object class="IBNSLayoutConstraint" id="766609984"> - <reference key="firstItem" ref="356964106"/> - <int key="firstAttribute">11</int> - <int key="relation">0</int> - <reference key="secondItem" ref="960474577"/> - <int key="secondAttribute">11</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">0.0</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="766721923"/> - <int key="scoringType">6</int> - <float key="scoringTypeFloat">24</float> - <int key="contentType">2</int> - </object> - <object class="IBNSLayoutConstraint" id="463444405"> - <reference key="firstItem" ref="356964106"/> - <int key="firstAttribute">5</int> - <int key="relation">0</int> - <reference key="secondItem" ref="744737041"/> - <int key="secondAttribute">5</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">0.0</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="766721923"/> - <int key="scoringType">6</int> - <float key="scoringTypeFloat">24</float> - <int key="contentType">2</int> - </object> - <object class="IBNSLayoutConstraint" id="866488337"> - <reference key="firstItem" ref="744737041"/> - <int key="firstAttribute">3</int> - <int key="relation">0</int> - <reference key="secondItem" ref="766721923"/> - <int key="secondAttribute">3</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">347</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="766721923"/> - <int key="scoringType">3</int> - <float key="scoringTypeFloat">9</float> - <int key="contentType">3</int> - </object> - <object class="IBNSLayoutConstraint" id="437685606"> - <reference key="firstItem" ref="744737041"/> - <int key="firstAttribute">9</int> - <int key="relation">0</int> - <reference key="secondItem" ref="766721923"/> - <int key="secondAttribute">9</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">0.0</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="766721923"/> - <int key="scoringType">5</int> - <float key="scoringTypeFloat">22</float> - <int key="contentType">2</int> - </object> - <object class="IBNSLayoutConstraint" id="415387596"> - <reference key="firstItem" ref="838658605"/> - <int key="firstAttribute">3</int> - <int key="relation">0</int> - <reference key="secondItem" ref="766721923"/> - <int key="secondAttribute">3</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">178</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="766721923"/> - <int key="scoringType">3</int> - <float key="scoringTypeFloat">9</float> - <int key="contentType">3</int> - </object> - <object class="IBNSLayoutConstraint" id="763131342"> - <reference key="firstItem" ref="838658605"/> - <int key="firstAttribute">5</int> - <int key="relation">0</int> - <reference key="secondItem" ref="783180915"/> - <int key="secondAttribute">5</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">0.0</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="766721923"/> - <int key="scoringType">6</int> - <float key="scoringTypeFloat">24</float> - <int key="contentType">2</int> - </object> - <object class="IBNSLayoutConstraint" id="537489831"> - <reference key="firstItem" ref="838658605"/> - <int key="firstAttribute">6</int> - <int key="relation">0</int> - <reference key="secondItem" ref="744737041"/> - <int key="secondAttribute">6</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">0.0</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="766721923"/> - <int key="scoringType">6</int> - <float key="scoringTypeFloat">24</float> - <int key="contentType">2</int> - </object> - <object class="IBNSLayoutConstraint" id="515438312"> - <reference key="firstItem" ref="838658605"/> - <int key="firstAttribute">5</int> - <int key="relation">0</int> - <reference key="secondItem" ref="744737041"/> - <int key="secondAttribute">5</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">0.0</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="766721923"/> - <int key="scoringType">6</int> - <float key="scoringTypeFloat">24</float> - <int key="contentType">2</int> - </object> - <object class="IBNSLayoutConstraint" id="380175422"> - <reference key="firstItem" ref="783180915"/> - <int key="firstAttribute">3</int> - <int key="relation">0</int> - <reference key="secondItem" ref="766721923"/> - <int key="secondAttribute">3</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">96</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="766721923"/> - <int key="scoringType">3</int> - <float key="scoringTypeFloat">9</float> - <int key="contentType">3</int> - </object> <reference ref="783180915"/> <reference ref="838658605"/> <reference ref="960474577"/> <reference ref="356964106"/> <reference ref="744737041"/> <reference ref="871929113"/> + <reference ref="547100810"/> + <reference ref="593355119"/> + <reference ref="1020792119"/> + <reference ref="1027404905"/> + <reference ref="384625478"/> </array> <reference key="parent" ref="0"/> </object> <object class="IBObjectRecord"> <int key="objectID">4</int> <reference key="object" ref="783180915"/> - <array class="NSMutableArray" key="children"> - <object class="IBNSLayoutConstraint" id="905731262"> - <reference key="firstItem" ref="783180915"/> - <int key="firstAttribute">7</int> - <int key="relation">0</int> - <nil key="secondItem"/> - <int key="secondAttribute">0</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">137</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="783180915"/> - <int key="scoringType">3</int> - <float key="scoringTypeFloat">9</float> - <int key="contentType">1</int> - </object> - <object class="IBNSLayoutConstraint" id="1011064262"> - <reference key="firstItem" ref="783180915"/> - <int key="firstAttribute">8</int> - <int key="relation">0</int> - <nil key="secondItem"/> - <int key="secondAttribute">0</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">53</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="783180915"/> - <int key="scoringType">3</int> - <float key="scoringTypeFloat">9</float> - <int key="contentType">1</int> - </object> - </array> + <array class="NSMutableArray" key="children"/> <reference key="parent" ref="766721923"/> </object> <object class="IBObjectRecord"> <int key="objectID">5</int> <reference key="object" ref="838658605"/> - <array class="NSMutableArray" key="children"> - <object class="IBNSLayoutConstraint" id="627407815"> - <reference key="firstItem" ref="838658605"/> - <int key="firstAttribute">7</int> - <int key="relation">0</int> - <nil key="secondItem"/> - <int key="secondAttribute">0</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">533</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="838658605"/> - <int key="scoringType">3</int> - <float key="scoringTypeFloat">9</float> - <int key="contentType">1</int> - </object> - <object class="IBNSLayoutConstraint" id="897576161"> - <reference key="firstItem" ref="838658605"/> - <int key="firstAttribute">8</int> - <int key="relation">0</int> - <nil key="secondItem"/> - <int key="secondAttribute">0</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">124</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="838658605"/> - <int key="scoringType">3</int> - <float key="scoringTypeFloat">9</float> - <int key="contentType">1</int> - </object> - </array> + <array class="NSMutableArray" key="children"/> <reference key="parent" ref="766721923"/> </object> <object class="IBObjectRecord"> <int key="objectID">6</int> <reference key="object" ref="960474577"/> - <array class="NSMutableArray" key="children"> - <object class="IBNSLayoutConstraint" id="717344165"> - <reference key="firstItem" ref="960474577"/> - <int key="firstAttribute">7</int> - <int key="relation">0</int> - <nil key="secondItem"/> - <int key="secondAttribute">0</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">121</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="960474577"/> - <int key="scoringType">3</int> - <float key="scoringTypeFloat">9</float> - <int key="contentType">1</int> - </object> - </array> + <array class="NSMutableArray" key="children"/> <reference key="parent" ref="766721923"/> </object> <object class="IBObjectRecord"> @@ -662,98 +523,28 @@ <reference key="parent" ref="766721923"/> </object> <object class="IBObjectRecord"> - <int key="objectID">10</int> - <reference key="object" ref="717344165"/> - <reference key="parent" ref="960474577"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">11</int> - <reference key="object" ref="627407815"/> - <reference key="parent" ref="838658605"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">12</int> - <reference key="object" ref="897576161"/> - <reference key="parent" ref="838658605"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">13</int> - <reference key="object" ref="905731262"/> - <reference key="parent" ref="783180915"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">14</int> - <reference key="object" ref="1011064262"/> - <reference key="parent" ref="783180915"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">16</int> - <reference key="object" ref="515438312"/> + <int key="objectID">45</int> + <reference key="object" ref="547100810"/> <reference key="parent" ref="766721923"/> </object> <object class="IBObjectRecord"> - <int key="objectID">18</int> - <reference key="object" ref="542523037"/> + <int key="objectID">46</int> + <reference key="object" ref="1020792119"/> <reference key="parent" ref="766721923"/> </object> <object class="IBObjectRecord"> - <int key="objectID">19</int> - <reference key="object" ref="735397257"/> + <int key="objectID">47</int> + <reference key="object" ref="593355119"/> <reference key="parent" ref="766721923"/> </object> <object class="IBObjectRecord"> - <int key="objectID">20</int> - <reference key="object" ref="461663066"/> + <int key="objectID">48</int> + <reference key="object" ref="1027404905"/> <reference key="parent" ref="766721923"/> </object> <object class="IBObjectRecord"> - <int key="objectID">21</int> - <reference key="object" ref="537489831"/> - <reference key="parent" ref="766721923"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">24</int> - <reference key="object" ref="763131342"/> - <reference key="parent" ref="766721923"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">26</int> - <reference key="object" ref="463444405"/> - <reference key="parent" ref="766721923"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">29</int> - <reference key="object" ref="766609984"/> - <reference key="parent" ref="766721923"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">30</int> - <reference key="object" ref="380175422"/> - <reference key="parent" ref="766721923"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">31</int> - <reference key="object" ref="805570680"/> - <reference key="parent" ref="766721923"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">32</int> - <reference key="object" ref="437685606"/> - <reference key="parent" ref="766721923"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">33</int> - <reference key="object" ref="866488337"/> - <reference key="parent" ref="766721923"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">34</int> - <reference key="object" ref="415387596"/> - <reference key="parent" ref="766721923"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">35</int> - <reference key="object" ref="172265991"/> + <int key="objectID">49</int> + <reference key="object" ref="384625478"/> <reference key="parent" ref="766721923"/> </object> </array> @@ -763,97 +554,38 @@ <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="-2.CustomClassName">UIResponder</string> <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="10.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="12.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="13.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="14.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="16.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="18.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="19.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <array class="NSMutableArray" key="2.IBViewMetadataConstraints"> - <reference ref="380175422"/> - <reference ref="515438312"/> - <reference ref="537489831"/> - <reference ref="763131342"/> - <reference ref="415387596"/> - <reference ref="437685606"/> - <reference ref="866488337"/> - <reference ref="463444405"/> - <reference ref="766609984"/> - <reference ref="172265991"/> - <reference ref="542523037"/> - <reference ref="735397257"/> - <reference ref="461663066"/> - <reference ref="805570680"/> - </array> - <string key="20.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="21.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="24.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="26.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="29.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="30.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="31.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="32.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="33.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="34.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="35.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <array key="4.IBViewMetadataConstraints"> - <reference ref="905731262"/> - <reference ref="1011064262"/> - </array> - <boolean value="NO" key="4.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> + <string key="45.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="46.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="47.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="48.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="49.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <array key="5.IBViewMetadataConstraints"> - <reference ref="627407815"/> - <reference ref="897576161"/> - </array> - <boolean value="NO" key="5.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <array class="NSMutableArray" key="6.IBViewMetadataConstraints"> - <reference ref="717344165"/> - </array> - <boolean value="NO" key="6.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <boolean value="NO" key="7.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <boolean value="NO" key="8.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> - <integer value="0" key="8.IUISegmentedControlInspectorSelectedSegmentMetadataKey"/> + <integer value="4" key="8.IUISegmentedControlInspectorSelectedSegmentMetadataKey"/> <string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <boolean value="NO" key="9.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> </dictionary> <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/> <nil key="activeLocalization"/> <dictionary class="NSMutableDictionary" key="localizations"/> <nil key="sourceID"/> - <int key="maxID">41</int> + <int key="maxID">50</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <array class="NSMutableArray" key="referencedPartialClassDescriptions"> <object class="IBPartialClassDescription"> - <string key="className">NSLayoutConstraint</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">./Classes/NSLayoutConstraint.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">QuestionnaireViewController</string> <string key="superclassName">UIViewController</string> <dictionary class="NSMutableDictionary" key="actions"> - <string key="answerWasSelected:">id</string> <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="answerWasSelected:"> - <string key="name">answerWasSelected:</string> - <string key="candidateClassName">id</string> - </object> <object class="IBActionInfo" key="hide:"> <string key="name">hide:</string> <string key="candidateClassName">id</string> @@ -862,24 +594,28 @@ <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="answerPressed">UISegmentedControl</string> <string key="questionText">UILabel</string> + <string key="titleText">UILabel</string> </dictionary> <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName"> - <object class="IBToOneOutletInfo" key="answerPressed"> - <string key="name">answerPressed</string> - <string key="candidateClassName">UISegmentedControl</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> @@ -892,7 +628,6 @@ <string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <int key="IBDocument.defaultPropertyAccessControl">3</int> - <bool key="IBDocument.UseAutolayout">YES</bool> <string key="IBCocoaTouchPluginVersion">1930</string> </data> </archive>
--- a/eventLogger.h Wed Jan 16 19:03:51 2013 +0000 +++ b/eventLogger.h Thu Jan 17 13:01:19 2013 +0000 @@ -66,6 +66,8 @@ sliderID = jevt["sliderID"].asInt(); eventTime = jevt["eventTime"].asLargestInt(); + // TODO what happens if we try to read one that isn't there? + } Json::Value eventToJson(){ Json::Value jevt;
--- a/iViewController.mm Wed Jan 16 19:03:51 2013 +0000 +++ b/iViewController.mm Thu Jan 17 13:01:19 2013 +0000 @@ -87,6 +87,7 @@ } + - (BOOL)alertViewShouldEnableFirstOtherButton:(UIAlertView *)alertView { UITextField *textField = [alertView textFieldAtIndex:0];
--- a/testApp.mm Wed Jan 16 19:03:51 2013 +0000 +++ b/testApp.mm Thu Jan 17 13:01:19 2013 +0000 @@ -60,8 +60,8 @@ ofxiPhoneDeviceType device = ofxiPhoneGetDeviceType(); cout << "Device: " << device << '\n'; - ofxiPhoneSetOrientation( OF_ORIENTATION_DEFAULT ); // TODO orientation CRAP - + //ofxiPhoneSetOrientation( OF_ORIENTATION_DEFAULT ); // TODO orientation CRAP + ofxiPhoneSetOrientation( OF_ORIENTATION_90_RIGHT ); //NSString * q = @"Why the hell did you do that? Are you mad?"; //[iViewController showQuestionPrompt:q]; @@ -550,14 +550,15 @@ //-------------------------------------------------------------- void testApp::deviceOrientationChanged(int newOrientation){ + /* cout << "orientation: " << newOrientation; - //keyboard->updateOrientation(); // takes ages , only applies to text box + if(newOrientation == 4){ ofxiPhoneSetOrientation( OF_ORIENTATION_90_RIGHT ); }else if(newOrientation == 3){ ofxiPhoneSetOrientation( OF_ORIENTATION_90_LEFT ); } - + */ }