Mercurial > hg > soniczoomios
changeset 36:a42903c61558
Added sliderview (not operational though)
| author | Robert Tubb <rt300@eecs.qmul.ac.uk> |
|---|---|
| date | Tue, 09 Apr 2013 13:22:28 +0100 |
| parents | 790939017078 |
| children | 8ed7522deaaa |
| files | PresetAlertViewController.mm Question.m QuestionnaireViewController.mm ServerComms.mm SliderViewController.h SliderViewController.mm SliderViewController.xib TopButtonViewController.h TopButtonViewController.mm TopButtonViewController.xib UsernameAlertViewController.mm eventLogger.mm hilbert.cpp testApp.h testApp.mm |
| diffstat | 15 files changed, 896 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/PresetAlertViewController.mm Mon Apr 08 17:23:13 2013 +0100 +++ b/PresetAlertViewController.mm Tue Apr 09 13:22:28 2013 +0100 @@ -39,7 +39,7 @@ alertTextField.placeholder = @"Preset Name"; [self.alert show]; self.alertShowing = YES; - [self.alert release]; + // [self.alert release]; } - (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex{
--- a/Question.m Mon Apr 08 17:23:13 2013 +0100 +++ b/Question.m Tue Apr 09 13:22:28 2013 +0100 @@ -43,6 +43,8 @@ // pseudo static variable if(type == AGREE_DISAGREE){ [Question setCount:NUM_CHOICES]; + + // potential leak return [[NSArray alloc] initWithObjects: @"Strongly agree",@"Agree", @"Neither agree nor disagree", @"Disagree",@"Strongly disagree", nil]; @@ -50,6 +52,7 @@ }else if(type == SLIDERS_ZOOMER){ [Question setCount:NUM_CHOICES]; + // potential leak return [[NSArray alloc] initWithObjects: @"definitely the Sliders", @"maybe the Sliders", @"Neither/Both equal", @"maybe the Zoomer", @"definitely the Zoomer", nil];
--- a/QuestionnaireViewController.mm Mon Apr 08 17:23:13 2013 +0100 +++ b/QuestionnaireViewController.mm Tue Apr 09 13:22:28 2013 +0100 @@ -207,7 +207,7 @@ // 1/3/13 removed q 6 and 15. now only 15 qs //---------------------------------------------------------------- - (void)populateQuestionArray{ - +// potential leak self.questionArray = [NSArray arrayWithObjects: [[Question alloc] initWithTextAndType:@"I am familiar with music software and sound synthesis.":AGREE_DISAGREE], [[Question alloc] initWithTextAndType:@"The best interface to get a feel for the possibilities of the synth was...":SLIDERS_ZOOMER],
--- a/ServerComms.mm Mon Apr 08 17:23:13 2013 +0100 +++ b/ServerComms.mm Tue Apr 09 13:22:28 2013 +0100 @@ -98,6 +98,7 @@ if([responseDataString isEqualToString:@"testConnection:OK"]){ eventLogger.testConnectionOK(); + [responseDataString release]; success = true; }else if([responseDataString isEqualToString:@"questionnaire:OK"]){ eventLogger.questionnaireOK(); @@ -136,6 +137,7 @@ if([responseDataString isEqualToString:@"testConnection:OK"]){ eventLogger.testConnectionOK(); + [responseDataString release]; }else if([responseDataString isEqualToString:@"questionnaire:OK"]){ eventLogger.questionnaireOK(); }else if([responseDataString isEqualToString:@"eventlog:OK"]){ @@ -172,6 +174,8 @@ // Do anything you want with it NSLog(@"response text: %@",responseText); + [responseText release]; + self.requestInProgress = NO; }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/SliderViewController.h Tue Apr 09 13:22:28 2013 +0100 @@ -0,0 +1,15 @@ +// +// SliderViewController.h +// sonicZoom +// +// Created by Robert Tubb on 01/02/2013. +// +// + +#import <UIKit/UIKit.h> + +@interface SliderViewController : UIViewController +@property (nonatomic, assign) id theOFAppRef; +-(IBAction)hide:(id)sender; +-(IBAction)show:(id)sender; +@end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/SliderViewController.mm Tue Apr 09 13:22:28 2013 +0100 @@ -0,0 +1,48 @@ +// +// SliderViewController.m +// sonicZoom +// +// Created by Robert Tubb on 01/02/2013. +// +// + +#import "SliderViewController.h" + +@interface SliderViewController () + +@end + +@implementation SliderViewController + +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil +{ + self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; + if (self) { + // Custom initialization + } + return self; +} + +- (void)viewDidLoad +{ + [super viewDidLoad]; + // Do any additional setup after loading the view from its nib. +} + +- (void)didReceiveMemoryWarning +{ + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +- (void)setAppRef:(id)theOFApp{ + self.theOFAppRef = theOFApp; + +} + +- (IBAction)show:(id)sender +{ + self.theOFAppRef = sender; + self.view.hidden = NO; +} +@end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/SliderViewController.xib Tue Apr 09 13:22:28 2013 +0100 @@ -0,0 +1,706 @@ +<?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>IBProxyObject</string> + <string>IBUILabel</string> + <string>IBUISlider</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="111649263"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{35, 52}, {81, 21}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView"/> + <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">Transpose</string> + <object class="NSColor" key="IBUITextColor" id="462707056"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MCAwIDAAA</bytes> + <string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string> + </object> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <object class="IBUIFontDescription" key="IBUIFontDescription" id="465806017"> + <int key="type">1</int> + <double key="pointSize">17</double> + </object> + <object class="NSFont" key="IBUIFont" id="395663854"> + <string key="NSName">Helvetica</string> + <double key="NSSize">17</double> + <int key="NSfFlags">16</int> + </object> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + </object> + <object class="IBUILabel" id="378389064"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{35, 111}, {62, 21}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView"/> + <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">1/4 note</string> + <reference key="IBUITextColor" ref="462707056"/> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <reference key="IBUIFontDescription" ref="465806017"/> + <reference key="IBUIFont" ref="395663854"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + </object> + <object class="IBUILabel" id="618289241"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{35, 171}, {62, 21}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView"/> + <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">1/6 note</string> + <reference key="IBUITextColor" ref="462707056"/> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <reference key="IBUIFontDescription" ref="465806017"/> + <reference key="IBUIFont" ref="395663854"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + </object> + <object class="IBUILabel" id="356420968"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{35, 228}, {62, 21}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView"/> + <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">1/7 note</string> + <reference key="IBUITextColor" ref="462707056"/> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <reference key="IBUIFontDescription" ref="465806017"/> + <reference key="IBUIFont" ref="395663854"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + </object> + <object class="IBUILabel" id="244340737"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{35, 288}, {62, 21}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView"/> + <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">1/8 note</string> + <reference key="IBUITextColor" ref="462707056"/> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <reference key="IBUIFontDescription" ref="465806017"/> + <reference key="IBUIFont" ref="395663854"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + </object> + <object class="IBUILabel" id="867320187"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{56, 16}, {188, 21}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="111649263"/> + <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">Note Pattern Oscillations</string> + <reference key="IBUITextColor" ref="462707056"/> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <reference key="IBUIFontDescription" ref="465806017"/> + <reference key="IBUIFont" ref="395663854"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + </object> + <object class="IBUILabel" id="459346847"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{470, 19}, {166, 21}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="765561490"/> + <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">Synth Sound Controls</string> + <reference key="IBUITextColor" ref="462707056"/> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <reference key="IBUIFontDescription" ref="465806017"/> + <reference key="IBUIFont" ref="395663854"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + </object> + <object class="IBUISlider" id="1033207780"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{421, 82}, {308, 23}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="495049070"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <bool key="IBUIOpaque">NO</bool> + <string key="targetRuntimeIdentifier">IBIPadFramework</string> + <float key="IBUIValue">0.5</float> + <float key="IBUIMaxValue">127</float> + <object class="NSColor" key="IBUIMinimumTrackTintColor" id="380680398"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MSAwIDAuMDExNzg4NjU2MTQAA</bytes> + </object> + </object> + <object class="IBUILabel" id="765561490"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{423, 52}, {78, 21}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="1033207780"/> + <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">Waveform</string> + <reference key="IBUITextColor" ref="462707056"/> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <reference key="IBUIFontDescription" ref="465806017"/> + <reference key="IBUIFont" ref="395663854"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + </object> + <object class="IBUISlider" id="632225376"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{421, 142}, {308, 23}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="19664376"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <bool key="IBUIOpaque">NO</bool> + <string key="targetRuntimeIdentifier">IBIPadFramework</string> + <float key="IBUIValue">0.5</float> + <float key="IBUIMaxValue">127</float> + <reference key="IBUIMinimumTrackTintColor" ref="380680398"/> + </object> + <object class="IBUILabel" id="495049070"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{423, 111}, {82, 21}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="632225376"/> + <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">FIlter Type</string> + <reference key="IBUITextColor" ref="462707056"/> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <reference key="IBUIFontDescription" ref="465806017"/> + <reference key="IBUIFont" ref="395663854"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + </object> + <object class="IBUISlider" id="715980642"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{421, 199}, {308, 23}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="156260818"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <bool key="IBUIOpaque">NO</bool> + <string key="targetRuntimeIdentifier">IBIPadFramework</string> + <float key="IBUIValue">0.5</float> + <float key="IBUIMaxValue">127</float> + <reference key="IBUIMinimumTrackTintColor" ref="380680398"/> + </object> + <object class="IBUILabel" id="19664376"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{423, 171}, {123, 21}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="715980642"/> + <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">Filter Frequency</string> + <reference key="IBUITextColor" ref="462707056"/> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <reference key="IBUIFontDescription" ref="465806017"/> + <reference key="IBUIFont" ref="395663854"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + </object> + <object class="IBUISlider" id="790035490"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{421, 259}, {308, 23}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="96720329"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <bool key="IBUIOpaque">NO</bool> + <string key="targetRuntimeIdentifier">IBIPadFramework</string> + <float key="IBUIValue">0.5</float> + <float key="IBUIMaxValue">127</float> + <reference key="IBUIMinimumTrackTintColor" ref="380680398"/> + </object> + <object class="IBUILabel" id="156260818"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{423, 230}, {71, 21}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="790035490"/> + <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">Envelope</string> + <reference key="IBUITextColor" ref="462707056"/> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <reference key="IBUIFontDescription" ref="465806017"/> + <reference key="IBUIFont" ref="395663854"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + </object> + <object class="IBUISlider" id="977717434"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{421, 321}, {308, 23}}</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> + <float key="IBUIValue">0.5</float> + <float key="IBUIMaxValue">127</float> + <reference key="IBUIMinimumTrackTintColor" ref="380680398"/> + </object> + <object class="IBUILabel" id="96720329"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{423, 288}, {86, 21}}</string> + <reference key="NSSuperview" ref="766721923"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="977717434"/> + <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">FM amount</string> + <reference key="IBUITextColor" ref="462707056"/> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">0</int> + <reference key="IBUIFontDescription" ref="465806017"/> + <reference key="IBUIFont" ref="395663854"/> + <bool key="IBUIAdjustsFontSizeToFit">NO</bool> + </object> + <object class="IBUISlider" id="588639842"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{33, 82}, {308, 23}}</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> + <float key="IBUIValue">0.5</float> + <float key="IBUIMaxValue">127</float> + <object class="NSColor" key="IBUIMinimumTrackTintColor" id="992255239"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MC4wMzAwMTkyNDA3MiAwLjMxNDIwOTgyMTQgMQA</bytes> + </object> + </object> + <object class="IBUISlider" id="889637720"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{33, 142}, {308, 23}}</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> + <float key="IBUIValue">0.5</float> + <float key="IBUIMaxValue">127</float> + <reference key="IBUIMinimumTrackTintColor" ref="992255239"/> + </object> + <object class="IBUISlider" id="51687800"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{33, 199}, {308, 23}}</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> + <float key="IBUIValue">0.5</float> + <float key="IBUIMaxValue">127</float> + <reference key="IBUIMinimumTrackTintColor" ref="992255239"/> + </object> + <object class="IBUISlider" id="260680075"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{33, 259}, {308, 23}}</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> + <float key="IBUIValue">0.5</float> + <float key="IBUIMaxValue">127</float> + <reference key="IBUIMinimumTrackTintColor" ref="992255239"/> + </object> + <object class="IBUISlider" id="200835061"> + <reference key="NSNextResponder" ref="766721923"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{33, 321}, {308, 23}}</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> + <float key="IBUIValue">0.5</float> + <float key="IBUIMaxValue">127</float> + <object class="NSColor" key="IBUIMinimumTrackTintColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MC4wMzAwMTkyNDA3MiAwLjMxNDIwOTgyMTQgMQA</bytes> + </object> + </object> + </array> + <string key="NSFrameSize">{768, 363}</string> + <reference key="NSSuperview"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="867320187"/> + <object class="NSColor" key="IBUIBackgroundColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MC40ODg0NzIzMTY2IDAuNDg4NDcyMzE2NiAwLjQ4ODQ3MjMxNjYAA</bytes> + </object> + <bool key="IBUIClearsContextBeforeDrawing">NO</bool> + <object class="IBUISimulatedSizeMetrics" key="IBUISimulatedDestinationMetrics"> + <string key="IBUISimulatedSizeMetricsClass">IBUISimulatedFreeformSizeMetricsSentinel</string> + <string key="IBUIDisplayName">Freeform</string> + </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> + </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"> + <reference ref="111649263"/> + <reference ref="867320187"/> + <reference ref="459346847"/> + <reference ref="1033207780"/> + <reference ref="765561490"/> + <reference ref="632225376"/> + <reference ref="495049070"/> + <reference ref="715980642"/> + <reference ref="19664376"/> + <reference ref="790035490"/> + <reference ref="156260818"/> + <reference ref="977717434"/> + <reference ref="96720329"/> + <reference ref="588639842"/> + <reference ref="889637720"/> + <reference ref="51687800"/> + <reference ref="260680075"/> + <reference ref="200835061"/> + <reference ref="378389064"/> + <reference ref="618289241"/> + <reference ref="356420968"/> + <reference ref="244340737"/> + </array> + <reference key="parent" ref="0"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">13</int> + <reference key="object" ref="111649263"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">18</int> + <reference key="object" ref="378389064"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">32</int> + <reference key="object" ref="618289241"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">34</int> + <reference key="object" ref="356420968"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">55</int> + <reference key="object" ref="244340737"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">72</int> + <reference key="object" ref="867320187"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">76</int> + <reference key="object" ref="459346847"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">81</int> + <reference key="object" ref="1033207780"/> + <array class="NSMutableArray" key="children"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">82</int> + <reference key="object" ref="765561490"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">83</int> + <reference key="object" ref="632225376"/> + <array class="NSMutableArray" key="children"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">84</int> + <reference key="object" ref="495049070"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">85</int> + <reference key="object" ref="715980642"/> + <array class="NSMutableArray" key="children"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">86</int> + <reference key="object" ref="19664376"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">87</int> + <reference key="object" ref="790035490"/> + <array class="NSMutableArray" key="children"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">88</int> + <reference key="object" ref="156260818"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">89</int> + <reference key="object" ref="977717434"/> + <array class="NSMutableArray" key="children"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">90</int> + <reference key="object" ref="96720329"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">234</int> + <reference key="object" ref="588639842"/> + <array class="NSMutableArray" key="children"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">235</int> + <reference key="object" ref="889637720"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">236</int> + <reference key="object" ref="51687800"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">237</int> + <reference key="object" ref="260680075"/> + <reference key="parent" ref="766721923"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">238</int> + <reference key="object" ref="200835061"/> + <reference key="parent" ref="766721923"/> + </object> + </array> + </object> + <dictionary class="NSMutableDictionary" key="flattenedProperties"> + <string key="-1.CustomClassName">SliderViewController</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="13.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="18.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="234.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="235.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="236.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="237.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="238.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="32.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="34.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="55.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="72.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="76.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="81.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="88.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="89.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">286</int> + </object> + <object class="IBClassDescriber" key="IBDocument.Classes"> + <array class="NSMutableArray" key="referencedPartialClassDescriptions"> + <object class="IBPartialClassDescription"> + <string key="className">SliderViewController</string> + <string key="superclassName">UIViewController</string> + <dictionary class="NSMutableDictionary" key="actions"> + <string key="hide:">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="show:"> + <string key="name">show:</string> + <string key="candidateClassName">id</string> + </object> + </dictionary> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">./Classes/SliderViewController.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> + <string key="IBCocoaTouchPluginVersion">1930</string> + </data> +</archive>
--- a/TopButtonViewController.h Mon Apr 08 17:23:13 2013 +0100 +++ b/TopButtonViewController.h Tue Apr 09 13:22:28 2013 +0100 @@ -17,6 +17,7 @@ @property (retain, nonatomic) IBOutlet UIBarButtonItem *pauseButton; @property (retain, strong, nonatomic) IBOutlet UIBarButtonItem *qButton; @property (retain, strong,nonatomic) IBOutlet UIBarButtonItem *newUserButton; +- (IBAction)nextSequence:(id)sender; -(IBAction)show:(id)sender; -(void)setAppRef:(id)theOFApp;
--- a/TopButtonViewController.mm Mon Apr 08 17:23:13 2013 +0100 +++ b/TopButtonViewController.mm Tue Apr 09 13:22:28 2013 +0100 @@ -34,15 +34,15 @@ // Do any additional setup after loading the view from its nib. self.playButton.enabled = true; self.pauseButton.enabled = false; - self.qButton.enabled = true; + self.qButton.enabled = false; self.newUserButton.enabled = true; //------------------------ // Get the reference to the current toolbar buttons - NSMutableArray *toolbarButtons = [self.toolbarItems mutableCopy]; + //NSMutableArray *toolbarButtons = [self.toolbarItems mutableCopy]; // This is how you remove the button from the toolbar and animate it - [toolbarButtons removeObject:self.qButton]; - [self setToolbarItems:toolbarButtons animated:YES]; + //[toolbarButtons removeObject:self.qButton]; + //[self setToolbarItems:toolbarButtons animated:YES]; // This is how you add the button to the toolbar and animate it /* @@ -130,6 +130,10 @@ ((testApp *)self.theOFAppRef)->setupNewUser(); } +- (IBAction)nextSequence:(id)sender { + ((testApp *)self.theOFAppRef)->nextSequence(); +} + - (IBAction)show:(id)sender { self.theOFAppRef = sender;
--- a/TopButtonViewController.xib Mon Apr 08 17:23:13 2013 +0100 +++ b/TopButtonViewController.xib Tue Apr 09 13:22:28 2013 +0100 @@ -81,6 +81,12 @@ <reference key="IBUIToolbar" ref="358683122"/> <int key="IBUISystemItemIdentifier">18</int> </object> + <object class="IBUIBarButtonItem" id="552018169"> + <string key="targetRuntimeIdentifier">IBIPadFramework</string> + <int key="IBUIStyle">1</int> + <reference key="IBUIToolbar" ref="358683122"/> + <int key="IBUISystemItemIdentifier">20</int> + </object> <object class="IBUIBarButtonItem" id="680653375"> <string key="targetRuntimeIdentifier">IBIPadFramework</string> <reference key="IBUIToolbar" ref="358683122"/> @@ -248,6 +254,14 @@ </object> <int key="connectionID">38</int> </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchEventConnection" key="connection"> + <string key="label">nextSequence:</string> + <reference key="source" ref="552018169"/> + <reference key="destination" ref="841351856"/> + </object> + <int key="connectionID">42</int> + </object> </array> <object class="IBMutableOrderedSet" key="objectRecords"> <array key="orderedObjects"> @@ -290,6 +304,7 @@ <reference ref="924591997"/> <reference ref="379344923"/> <reference ref="1052071507"/> + <reference ref="552018169"/> </array> <reference key="parent" ref="766721923"/> </object> @@ -353,6 +368,11 @@ <reference key="object" ref="319053509"/> <reference key="parent" ref="0"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">41</int> + <reference key="object" ref="552018169"/> + <reference key="parent" ref="358683122"/> + </object> </array> </object> <dictionary class="NSMutableDictionary" key="flattenedProperties"> @@ -372,6 +392,7 @@ <string key="35.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="40.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="41.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> </dictionary> @@ -379,7 +400,7 @@ <nil key="activeLocalization"/> <dictionary class="NSMutableDictionary" key="localizations"/> <nil key="sourceID"/> - <int key="maxID">40</int> + <int key="maxID">42</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <array class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -391,6 +412,7 @@ <string key="lockSequencePressed:">id</string> <string key="lockSynthPressed:">id</string> <string key="newUser:">id</string> + <string key="nextSequence:">id</string> <string key="pausePressed:">id</string> <string key="playPressed:">id</string> <string key="qPressed:">id</string> @@ -415,6 +437,10 @@ <string key="name">newUser:</string> <string key="candidateClassName">id</string> </object> + <object class="IBActionInfo" key="nextSequence:"> + <string key="name">nextSequence:</string> + <string key="candidateClassName">id</string> + </object> <object class="IBActionInfo" key="pausePressed:"> <string key="name">pausePressed:</string> <string key="candidateClassName">id</string>
--- a/UsernameAlertViewController.mm Mon Apr 08 17:23:13 2013 +0100 +++ b/UsernameAlertViewController.mm Tue Apr 09 13:22:28 2013 +0100 @@ -28,7 +28,7 @@ alertTextField.keyboardType = UIKeyboardTypeDefault; alertTextField.placeholder = @"Username"; [self.alert show]; - [self.alert release]; + //[self.alert release]; }
--- a/eventLogger.mm Mon Apr 08 17:23:13 2013 +0100 +++ b/eventLogger.mm Tue Apr 09 13:22:28 2013 +0100 @@ -229,6 +229,7 @@ //----------------------------- void EventLogger::questionnaireOK(){ questionnaireUploaded = true; + questionnaireComments = ""; } //----------------------------- void EventLogger::eventlogOK(){
--- a/hilbert.cpp Mon Apr 08 17:23:13 2013 +0100 +++ b/hilbert.cpp Tue Apr 09 13:22:28 2013 +0100 @@ -190,7 +190,7 @@ } // for loop thru bit levels - i=0; + for(int blev = N-1; blev >= 0; blev--){ // get next highest bits of index @@ -254,7 +254,7 @@ // for loop thru bit levels - i=0; + for(int blev = N-1; blev >= 0; blev--){ //% get next highest bit of param
--- a/testApp.h Mon Apr 08 17:23:13 2013 +0100 +++ b/testApp.h Tue Apr 09 13:22:28 2013 +0100 @@ -69,6 +69,8 @@ vector<int> sliderVals; vector<int> freqIndexes; + vector<vector <int> > sequences; + int currentSequence; int numActiveTouches; bool preventingMovePostScroll; @@ -118,6 +120,8 @@ void helpHidden(); // shortcut function for testing void justStart(); + void loadSequences(); + void nextSequence(); void setupBottomGui(); void bottomGuiEvent();
--- a/testApp.mm Mon Apr 08 17:23:13 2013 +0100 +++ b/testApp.mm Tue Apr 09 13:22:28 2013 +0100 @@ -23,6 +23,7 @@ ofBackground( 0, 0, 0 ); ofEnableAlphaBlending(); + currentSequence = 0; //ofEnableSmoothing(); // open an outgoing connection to HOST:PORT for OSC @@ -103,7 +104,7 @@ [helpViewController setAppRef:(id)this]; helpViewController.view.hidden = YES; - /* + sliderViewController = [[SliderViewController alloc] initWithNibName:@"SLiderViewController" bundle:nil]; [ofxiPhoneGetGLParentView() addSubview:sliderViewController.view]; @@ -111,8 +112,11 @@ [sliderViewController show:(id)this]; sliderViewController.view.frame = CGRectMake(0,getHeight()-43 - 363,getWidth(),44); - */ + + // load preset sequences + loadSequences(); + // initialise user logging stuff presetManager.startLoadAll(); tsc = [[TimedSessionController alloc] init]; @@ -130,10 +134,11 @@ // GO paused = false; - randomise(); // everyone starts from random position + randomise(); // everyone starts from random position (or where they left off??) ofxiPhoneExternalDisplay::mirrorOn(); + } @@ -409,8 +414,18 @@ } //-------------------------------------------------------------- +void testApp::nextSequence(){ + currentSequence++; + if(currentSequence >= sequences.size()){ + currentSequence = 0; + } + sendParametersToPD(); +} +//-------------------------------------------------------------- void testApp::sendParametersToPD(){ + // frequencer stuff to get 16 steps + /* vector<double> vals; @@ -420,14 +435,21 @@ } vector<double> steps = frequencer.freqMagEdit(freqIndexes, vals); + + */ + // send a list using the List object List seqSteps; seqSteps.addSymbol("seqSteps"); + if(currentSequence > sequences.size() || currentSequence < 0){ + cout << "ERROR: not a valid sequence index\n"; + } for(int i=0; i < 16; i++){ - seqSteps.addFloat(round(steps[i])); // rounding here?? + seqSteps.addFloat(round(sequences[currentSequence][i])); // rounding here?? } + core.pd.sendList("fromOF", seqSteps); sendOscShape(sliderVals[5]); @@ -1015,3 +1037,51 @@ sequenceFile << root; } //=-------------------------------------------------------------------- +void testApp::loadSequences(){ + + // read in sequence preset file + string jsonFile = ofxiPhoneGetDocumentsDirectory() + "pilot_sequences.json"; + + Json::Value root; + Json::Reader reader; + + ifstream theFile(jsonFile.c_str()); + stringstream fileText; + string line; + if(!theFile){ + cout<<"can't find sequence file: " << jsonFile.c_str() << "\n"; + return; + }else{ + + while(theFile){ + theFile >> line; + // cout << line << "\n"; // lots? + fileText << line; + } + + theFile.close(); + } + + bool parsingSuccessful = reader.parse( fileText.str(), root ); + + if ( !parsingSuccessful ) + { + // report to the user the failure and their locations in the document. + std::cout << "Failed to parse sequence JSON: \n" + << reader.getFormattedErrorMessages(); + return; + } + + // now put into variables + const Json::Value jseqs = root["sequences"]; + int N = jseqs.size(); + for(int i=0; i<N; i++){ + sequences.push_back(vector<int>()); + for(int j=0; j<jseqs[i].size(); j++){ + sequences.back().push_back(jseqs[i][j].asInt()); + } + } + // currentSequence + currentSequence = ofRandom(0,N); + +}