Mercurial > hg > soniczoomios
changeset 18:12e4156ae216
merge the fukker
| author | Robert Tubb <rt300@eecs.qmul.ac.uk> |
|---|---|
| date | Wed, 16 Jan 2013 19:06:51 +0000 |
| parents | 27314a86d71c (current diff) 6a9191f5b269 (diff) |
| children | 6d72049a480c |
| files | |
| diffstat | 7 files changed, 1087 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/QuestionnaireViewController.h Wed Jan 16 19:06:51 2013 +0000 @@ -0,0 +1,24 @@ +// +// QuestionnaireViewController.h +// oscSenderExample +// +// Created by Robert Tubb on 16/01/2013. +// +// + +#import <UIKit/UIKit.h> + +@interface QuestionnaireViewController : UIViewController +@property (retain, nonatomic) IBOutlet UISegmentedControl *answerPressed; +@property (retain, nonatomic) IBOutlet UILabel *questionText; + +//---------------------------------------------------------------- +-(IBAction)hide:(id)sender; +//---------------------------------------------------------------- +-(IBAction)show:(id)sender; +//---------------------------------------------------------------- +- (IBAction)nextQuestionPressed:(id)sender; + +-(void)populateQuestionArray; +@end +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/QuestionnaireViewController.m Wed Jan 16 19:06:51 2013 +0000 @@ -0,0 +1,116 @@ +// +// QuestionnaireViewController.m +// oscSenderExample +// +// Created by Robert Tubb on 16/01/2013. +// +// + +#import "QuestionnaireViewController.h" + +@interface QuestionnaireViewController () + // the "model" is an array of questions +@property (strong, nonatomic) NSArray * questionArray; +@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:" + +*/ + +@end + +@implementation QuestionnaireViewController + +//---------------------------------------------------------------- +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil +{ + self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; + if (self) { + // Custom initialization + + [self populateQuestionArray ]; + + + } + return self; +} +//---------------------------------------------------------------- +- (void)viewDidLoad +{ + [super viewDidLoad]; + // Do any additional setup after loading the view from its nib. + self.currentQuestionIndex = 0; + // load question 1 + [self loadQuestion:self.currentQuestionIndex]; +} +//---------------------------------------------------------------- +- (void)didReceiveMemoryWarning +{ + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} +//---------------------------------------------------------------- +- (void)dealloc { + [_answerPressed release]; + [_questionText release]; + [super dealloc]; +} +//---------------------------------------------------------------- +- (void)viewDidUnload { + [self setAnswerPressed:nil]; + [self setQuestionText:nil]; + [super viewDidUnload]; +} +//---------------------------------------------------------------- +- (IBAction)answerWasSelected:(id)sender { + // look at property? + +} + +//---------------------------------------------------------------- +-(IBAction)hide:(id)sender{ + self.view.hidden = YES; +} +//---------------------------------------------------------------- +-(IBAction)show:(id)sender{ + self.view.hidden = NO; +} +//---------------------------------------------------------------- + +- (IBAction)nextQuestionPressed:(id)sender { + // save answer ? no button did that hopefully + // if last question show thanks + + // else go to next + self.currentQuestionIndex++; + [self loadQuestion:self.currentQuestionIndex]; +} +//---------------------------------------------------------------- +- (void)loadQuestion:(NSInteger)questionIndex { + // populate text fields with question + self.questionText.text = [self.questionArray objectAtIndex:questionIndex]; + +} +//---------------------------------------------------------------- +- (void)populateQuestionArray{ + self.questionArray = [[NSArray alloc] initWithObjects:@"one", @"two", @"buckle", nil]; +} +//---------------------------------------------------------------- + +@end // end implementation \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/QuestionnaireViewController.xib Wed Jan 16 19:06:51 2013 +0000 @@ -0,0 +1,898 @@ +<?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> + <string key="IBDocument.SystemVersion">11G63</string> + <string key="IBDocument.InterfaceBuilderVersion">2844</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> + </object> + <array key="IBDocument.IntegratedClassDependencies"> + <string>IBNSLayoutConstraint</string> + <string>IBProxyObject</string> + <string>IBUIButton</string> + <string>IBUILabel</string> + <string>IBUISegmentedControl</string> + <string>IBUIView</string> + </array> + <array key="IBDocument.PluginDependencies"> + <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + </array> + <object class="NSMutableDictionary" key="IBDocument.Metadata"> + <string key="NS.key.0">PluginDependencyRecalculationVersion</string> + <integer value="1" key="NS.object.0"/> + </object> + <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> + <object class="IBProxyObject" id="841351856"> + <string key="IBProxiedObjectIdentifier">IBFilesOwner</string> + <string key="targetRuntimeIdentifier">IBIPadFramework</string> + </object> + <object class="IBProxyObject" id="606714003"> + <string key="IBProxiedObjectIdentifier">IBFirstResponder</string> + <string key="targetRuntimeIdentifier">IBIPadFramework</string> + </object> + <object class="IBUIView" id="766721923"> + <reference key="NSNextResponder"/> + <int key="NSvFlags">292</int> + <array class="NSMutableArray" key="NSSubviews"> + <object class="IBUILabel" id="783180915"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{118, 96}, {137, 53}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <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> + <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> + </object> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + </object> + <object class="IBUILabel" id="838658605"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{118, 178}, {533, 124}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="744737041"/> + <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> + <reference key="IBUITextColor" ref="326394288"/> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <int key="IBUINumberOfLines">3</int> + <object class="IBUIFontDescription" key="IBUIFontDescription"> + <int key="type">1</int> + <double key="pointSize">18</double> + </object> + <object class="NSFont" key="IBUIFont"> + <string key="NSName">Helvetica</string> + <double key="NSSize">18</double> + <int key="NSfFlags">16</int> + </object> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + <double key="preferredMaxLayoutWidth">533</double> + </object> + <object class="IBUIButton" id="960474577"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{530, 482}, {121, 44}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="871929113"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <bool key="IBUIOpaque">NO</bool> + <string key="targetRuntimeIdentifier">IBIPadFramework</string> + <int key="IBUIContentHorizontalAlignment">0</int> + <int key="IBUIContentVerticalAlignment">0</int> + <int key="IBUIButtonType">1</int> + <string key="IBUINormalTitle">Next Question</string> + <object class="NSColor" key="IBUIHighlightedTitleColor" id="1041582678"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MQA</bytes> + </object> + <object class="NSColor" key="IBUINormalTitleColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes> + </object> + <object class="NSColor" key="IBUINormalTitleShadowColor" id="907174598"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC41AA</bytes> + </object> + <object class="IBUIFontDescription" key="IBUIFontDescription" id="113804367"> + <int key="type">2</int> + <double key="pointSize">15</double> + </object> + <object class="NSFont" key="IBUIFont" id="830486844"> + <string key="NSName">Helvetica-Bold</string> + <double key="NSSize">15</double> + <int key="NSfFlags">16</int> + </object> + </object> + <object class="IBUIButton" id="356964106"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{118, 482}, {157, 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> + <int key="IBUIContentHorizontalAlignment">0</int> + <int key="IBUIContentVerticalAlignment">0</int> + <int key="IBUIButtonType">1</int> + <string key="IBUINormalTitle">Previous Question</string> + <reference key="IBUIHighlightedTitleColor" ref="1041582678"/> + <object class="NSColor" key="IBUINormalTitleColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes> + </object> + <reference key="IBUINormalTitleShadowColor" ref="907174598"/> + <reference key="IBUIFontDescription" ref="113804367"/> + <reference key="IBUIFont" ref="830486844"/> + </object> + <object class="IBUISegmentedControl" id="744737041"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{118, 347}, {533, 44}}</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> + <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> + </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> + </object> + <object class="IBUIButton" id="871929113"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{530, 897}, {121, 44}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <bool key="IBUIOpaque">NO</bool> + <string key="targetRuntimeIdentifier">IBIPadFramework</string> + <int key="IBUIContentHorizontalAlignment">0</int> + <int key="IBUIContentVerticalAlignment">0</int> + <int key="IBUIButtonType">1</int> + <string key="IBUINormalTitle">Finish</string> + <reference key="IBUIHighlightedTitleColor" ref="1041582678"/> + <object class="NSColor" key="IBUINormalTitleColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes> + </object> + <reference key="IBUINormalTitleShadowColor" ref="907174598"/> + <reference key="IBUIFontDescription" ref="113804367"/> + <reference key="IBUIFont" ref="830486844"/> + </object> + </array> + <string key="NSFrame">{{0, 20}, {768, 1004}}</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> + </object> + </object> + <bool key="IBUIClearsContextBeforeDrawing">NO</bool> + <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"> + <int key="IBUIStatusBarStyle">2</int> + </object> + <string key="targetRuntimeIdentifier">IBIPadFramework</string> + </object> + </array> + <object class="IBObjectContainer" key="IBDocument.Objects"> + <array class="NSMutableArray" key="connectionRecords"> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">view</string> + <reference key="source" ref="841351856"/> + <reference key="destination" ref="766721923"/> + </object> + <int key="connectionID">3</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">questionText</string> + <reference key="source" ref="841351856"/> + <reference key="destination" ref="838658605"/> + </object> + <int key="connectionID">41</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchEventConnection" key="connection"> + <string key="label">nextQuestionPressed:</string> + <reference key="source" ref="960474577"/> + <reference key="destination" ref="841351856"/> + <int key="IBEventType">7</int> + </object> + <int key="connectionID">40</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"/> + <int key="IBEventType">7</int> + </object> + <int key="connectionID">39</int> + </object> + </array> + <object class="IBMutableOrderedSet" key="objectRecords"> + <array key="orderedObjects"> + <object class="IBObjectRecord"> + <int key="objectID">0</int> + <array key="object" id="0"/> + <reference key="children" ref="1000"/> + <nil key="parent"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">-1</int> + <reference key="object" ref="841351856"/> + <reference key="parent" ref="0"/> + <string key="objectName">File's Owner</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">-2</int> + <reference key="object" ref="606714003"/> + <reference key="parent" ref="0"/> + </object> + <object class="IBObjectRecord"> + <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"/> + </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> + <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> + <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> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7</int> + <reference key="object" ref="356964106"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">8</int> + <reference key="object" ref="744737041"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">9</int> + <reference key="object" ref="871929113"/> + <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"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">18</int> + <reference key="object" ref="542523037"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">19</int> + <reference key="object" ref="735397257"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">20</int> + <reference key="object" ref="461663066"/> + <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"/> + <reference key="parent" ref="766721923"/> + </object> + </array> + </object> + <dictionary class="NSMutableDictionary" key="flattenedProperties"> + <string key="-1.CustomClassName">QuestionnaireViewController</string> + <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="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"/> + <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> + </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="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> + </object> + <object class="IBActionInfo" key="nextQuestionPressed:"> + <string key="name">nextQuestionPressed:</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> + </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> + </dictionary> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">./Classes/QuestionnaireViewController.h</string> + </object> + </object> + </array> + </object> + <int key="IBDocument.localizationMode">0</int> + <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:04:55 2013 +0000 +++ b/eventLogger.h Wed Jan 16 19:06:51 2013 +0000 @@ -25,7 +25,7 @@ #include "json.h" #import "iViewController.h" - +#import "QuestionnaireViewController.h" // can add but don't change ordering - this will invalidate logs enum leventType {SAVE_PRESET, @@ -106,32 +106,44 @@ class EventLogger{ public: + bool loggingEnabled; + bool internetConnectionOK; + unsigned int deviceID; // unique get something from hardware?? + unsigned int totalInteractionTime, sessionTime, sessionStartTime; + string userName; // not unique + + EventLogger(); + void init(); + void exitAndSave(); + void setUsername(const char *u); + void logEvent(const leventType& evtType,const TwoVector& centre = TwoVector(), const double& scale = 1.0, const int& sliderID = -1, const double& sliderVal = 0.0); + + +private: // what we need... /* time, type, value */ - bool loggingEnabled; - bool internetConnectionOK; + + vector<lEvent> theEvents; + QuestionnaireViewController * questionnaireViewController; + // values applicable to all events + + unsigned int nextUploadQty; + - // values applicable to all events - unsigned int deviceID; // unique get something from hardware?? - unsigned int totalInteractionTime, sessionTime, sessionStartTime; - string userName; // not unique - unsigned int nextUploadQty; - EventLogger(); - void init(); + bool testConnection(); - void setUsername(const char *u); - void logEvent(const leventType& evtType,const TwoVector& centre = TwoVector(), const double& scale = 1.0, const int& sliderID = -1, const double& sliderVal = 0.0); + void sendHttp(); void checkLogFile(); bool attemptUpload(); void firstEverAppOpen(); void readJsonToLog(const string &jsonFile); - void exitAndSave(); + Json::Value logsToJson(); void printAll(){ cout << "ALL LOGGED EVENTS!: \n";
--- a/eventLogger.mm Wed Jan 16 19:04:55 2013 +0000 +++ b/eventLogger.mm Wed Jan 16 19:06:51 2013 +0000 @@ -15,7 +15,13 @@ //--------------------------------------------------------------------------- EventLogger::EventLogger(){ + //QuestionnaireViewController * questionnaireViewController; + + questionnaireViewController = [[QuestionnaireViewController alloc] initWithNibName:@"QuestionnaireViewController" bundle:nil]; + + + loggingEnabled = true; internetConnectionOK = false; nextUploadQty = 5000; // amount of data uploaded is always more than 5000 events @@ -28,10 +34,11 @@ testConnection(); + [ofxiPhoneGetGLParentView() addSubview:questionnaireViewController.view]; } //--------------------------------------------------------------------------- bool EventLogger::testConnection(){ - string url = "http://127.0.0.1:8080/testservice/testConnection?testtext={%22yo%22=%22dude%22}"; + string url = "http://127.0.0.1:8080/testservice/testConnection?testtext={%22test%22=%22sometext%22}"; bool success = false; ofURLFileLoader fileLoader; ofHttpResponse resp; @@ -104,7 +111,18 @@ attemptUpload(); } // TODO if the total interaction time is greater than a certain amount && no questions answered - questionnaire time! + cout << "Total interaction time: " << totalInteractionTime << '\n'; + if(totalInteractionTime > 0){ + // questionnaireViewController.show; + [questionnaireViewController show:(id)this]; + + //IF THE VIEW IS HIDDEN LETS BRING IT BACK! + if( questionnaireViewController.view.hidden ){ + questionnaireViewController.view.hidden = NO; + } + + } // is there logged stuff that hasn't been uploaded yet? // don't actually need to load old ones unless uploading? or saving...
--- a/iViewController.h Wed Jan 16 19:04:55 2013 +0000 +++ b/iViewController.h Wed Jan 16 19:06:51 2013 +0000 @@ -11,12 +11,13 @@ #include "eventLogger.h" #include "presetManager.h" -@interface IViewController : NSObject <UIAlertViewDelegate> +@interface IViewController : NSObject <UIAlertViewDelegate> +//@property (weak, nonatomic) NSString * aString; -(void)showUserNamePrompt; - (void)showPresetNamePrompt; -- (void)showQuestionPrompt:(NSString *)question; +//- (void)showQuestionPrompt:(NSString *)question; @end
--- a/iViewController.mm Wed Jan 16 19:04:55 2013 +0000 +++ b/iViewController.mm Wed Jan 16 19:06:51 2013 +0000 @@ -44,7 +44,7 @@ [alert show]; [alert release]; } - +/* - (void)showQuestionPrompt:(NSString *)question{ UIAlertView * alert = [[UIAlertView alloc] initWithTitle:@"Save" message:@"Are you mad?" @@ -55,6 +55,7 @@ [alert show]; [alert release]; } + */ // shheet - only one delegate fnc // we're actually overriding alertViews function here?