Mercurial > hg > soniczoomios
changeset 40:af06bb942d58
Commit Before reverting to beta release to generate dSYM.
| author | Robert Tubb <rt300@eecs.qmul.ac.uk> |
|---|---|
| date | Fri, 12 Apr 2013 16:13:42 +0100 |
| parents | df7c08faf541 |
| children | 79c129e500e1 |
| files | HelpViewController.xib TimedSessionController.h TopButtonViewController.xib eventLogger.h eventLogger.mm grid.mm testApp.mm |
| diffstat | 7 files changed, 8 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/HelpViewController.xib Thu Apr 11 16:56:21 2013 +0100 +++ b/HelpViewController.xib Fri Apr 12 16:13:42 2013 +0100 @@ -134,7 +134,6 @@ <string key="NSFrame">{{319, 941}, {130, 44}}</string> <reference key="NSSuperview" ref="766721923"/> <reference key="NSWindow"/> - <reference key="NSNextKeyView"/> <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="IBUIOpaque">NO</bool> <string key="targetRuntimeIdentifier">IBIPadFramework</string>
--- a/TimedSessionController.h Thu Apr 11 16:56:21 2013 +0100 +++ b/TimedSessionController.h Fri Apr 12 16:13:42 2013 +0100 @@ -5,7 +5,7 @@ // Created by Robert Tubb on 18/02/2013. // // -#define SECONDS_PER_INTERFACE 400 +#define SECONDS_PER_INTERFACE 300 #import <Foundation/Foundation.h>
--- a/TopButtonViewController.xib Thu Apr 11 16:56:21 2013 +0100 +++ b/TopButtonViewController.xib Fri Apr 12 16:13:42 2013 +0100 @@ -45,7 +45,7 @@ <object class="IBUISwitch" id="150228020"> <reference key="NSNextResponder" ref="358683122"/> <int key="NSvFlags">-2147483356</int> - <string key="NSFrame">{{92, 9}, {94, 27}}</string> + <string key="NSFrame">{{106, 9}, {94, 27}}</string> <reference key="NSSuperview" ref="358683122"/> <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="459236656"/> @@ -81,11 +81,6 @@ <reference key="IBUICustomView" ref="150228020"/> <reference key="IBUIToolbar" ref="358683122"/> </object> - <object class="IBUIBarButtonItem" id="174215053"> - <string key="targetRuntimeIdentifier">IBIPadFramework</string> - <reference key="IBUIToolbar" ref="358683122"/> - <int key="IBUISystemItemIdentifier">5</int> - </object> <object class="IBUIBarButtonItem" id="379344923"> <string key="targetRuntimeIdentifier">IBIPadFramework</string> <int key="IBUIStyle">1</int> @@ -407,7 +402,6 @@ <reference ref="552018169"/> <reference ref="996249183"/> <reference ref="1056681435"/> - <reference ref="174215053"/> </array> <reference key="parent" ref="766721923"/> </object> @@ -494,11 +488,6 @@ <reference key="object" ref="459236656"/> <reference key="parent" ref="766721923"/> </object> - <object class="IBObjectRecord"> - <int key="objectID">52</int> - <reference key="object" ref="174215053"/> - <reference key="parent" ref="358683122"/> - </object> </array> </object> <dictionary class="NSMutableDictionary" key="flattenedProperties"> @@ -523,7 +512,6 @@ <string key="45.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="46.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="52.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> </dictionary> <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
--- a/eventLogger.h Thu Apr 11 16:56:21 2013 +0100 +++ b/eventLogger.h Fri Apr 12 16:13:42 2013 +0100 @@ -30,7 +30,7 @@ #define EVENT_THIN_FACTOR 12 #define EVENT_LOG_FILENAME "log.json" -#define UPLOAD_CHUNK_SIZE 1000 +#define UPLOAD_CHUNK_SIZE 10 #define APP_CREATION_TIME 381429000000 // milliseconds to the time i wrote this wee blighter. saves digits #define SCROLL_TRAIL_LENGTH 200 #define PROGRAM_VERSION 0.5 // NOW USES NEW HILBERT CURVE. ALL OLD PRESETS WILL BE INVALID :(
--- a/eventLogger.mm Thu Apr 11 16:56:21 2013 +0100 +++ b/eventLogger.mm Fri Apr 12 16:13:42 2013 +0100 @@ -48,10 +48,6 @@ nextUploadQty = UPLOAD_CHUNK_SIZE; // amount of data uploaded is always more than UPLOAD_CHUNK_SIZE events } -//--------------------------------------------------------------------------- -// draw() - show path of last N scroll events - can be scrubbed along? -// -//--------------------------------------------------------------------------- void EventLogger::init(){ @@ -182,9 +178,9 @@ questionnaireCompleted = false; questionnaireUploaded = false; - ((testApp *)ofGetAppPtr())->showIntro(); + //((testApp *)ofGetAppPtr())->showIntro(); //consentGiven = false; - //((testApp *)ofGetAppPtr())->justStart(); + ((testApp *)ofGetAppPtr())->justStart(); } @@ -239,6 +235,8 @@ //----------------------------- void EventLogger::eventlogOK(){ // COMMENT THIS IF UPLAODING FROM IPAD TO XCODE + + // it's a bad idea to do this in another thread... theEvents.clear(); cout << "EVENT LOG UPLOAD SUCCESS\n"; nextUploadNumber++;
--- a/grid.mm Thu Apr 11 16:56:21 2013 +0100 +++ b/grid.mm Fri Apr 12 16:13:42 2013 +0100 @@ -564,13 +564,11 @@ // allow centre to be at limits if((topLeft.x + size.x*0.5) < 0.0){ - cout << "left Wall\n"; topLeft.x = 0.0 - size.x*0.5; centre.x = 0.0; } if(topLeft.y + size.y*0.5 < 0.0) { - cout << "top Wall\n"; topLeft.y = 0.0 - size.y*0.5; centre.y = 0.0; } @@ -579,12 +577,10 @@ // check max if(topLeft.x + size.x/2 > maxValue){ - cout << "right Wall\n"; topLeft.x = maxValue - size.x/2; centre.x = maxValue; } if(topLeft.y + size.y/2 > maxValue) { - cout << "bottom Wall\n"; topLeft.y = maxValue - size.y/2; centre.y = maxValue; }