Changeset 2246ba0 in orbit

Timestamp:

01/02/14 09:22:48 (8 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo

Children:

fc960da

Parents:

c1a500d

Message:

• historyAttention array tracking in SignalConverter?

Location:

iOS/Orbit/Orbit

Files:

• SignalConverter.h (modified) (1 diff)
• SignalConverter.m (modified) (3 diffs)
• controllers/FlightViewController.m (modified) (2 diffs)
• controllers/StatisticsViewController.h (modified) (1 diff)
• controllers/StatisticsViewController.m (modified) (6 diffs)

iOS/Orbit/Orbit/SignalConverter.h

@@ -32 +32 @@
 }
 
+//@property (nonatomic, retain) [NSArray arrayWithObjects:[NSNumber numberWithFloat:6.9]] *rawEEG;
+//Number[] rawEEG = new Number[512];
+
+//@property (nonatomic, retain) [NSArray arrayWithObjects:[NSNumber numberWithFloat:6.9]] *historyAttention;
+
+//@property (nonatomic, retain) NSArray *rawEEG;
+//@property (nonatomic, retain) NSArray *historyAttention;
+//@property (nonatomic, retain) NSArray *historyMeditation;
+
+//@property (nonatomic, retain) int historyAttention[30];
+//@property (nonatomic, retain) historyMeditation;
+
 @property (weak) id <SignalConverterDelegate> delegate;
 @property (nonatomic) float attentionThreshold;

iOS/Orbit/Orbit/SignalConverter.m

@@ -31 +31 @@
     int signalStrength, attentionLevel, meditationLevel; // the latest readings from the headset
     int yaw, throttle, pitch;
+    
+    int historyAttention[30];
+    int historyAttentionIndex;
+    int historyMeditation[30];
+    int historyMeditationIndex;
+    
+//    _historyAttention = [NSArray arrayWithObjects:[NSNumber numberWithFloat:6.9]];
+    
+
+    
 }
 
@@ -51 +61 @@
         pitch = 31;
         
+        historyAttentionIndex = 0;
+        historyMeditationIndex = 0;
+        
         // initialise the audio session - this should only be done once
         AudioSessionInitialize(NULL, NULL, NULL, NULL);
         AudioSessionSetActive(YES);
+        
+//        NSArray *tempFood = [[NSArray alloc] initWithArray:[self returnOtherArray]];
+//        NSArray *tempFood = [[NSArray alloc] arrayWithObjects:[NSNumber numberWithFloat:6.9]]];
+        
+//        _historyAttention = tempFood;
         
 #if USE_AUDIO_GENERATOR
@@ -110 +128 @@
     [self setAttentionLevel:(NSNumber *)[data valueForKey:ATTENTION_KEY]];
     [self setMeditationLevel:(NSNumber *)[data valueForKey:MEDITATION_KEY]];
+    
+    historyAttention[historyAttentionIndex] = attentionLevel;
+    historyMeditation[historyMeditationIndex] = meditationLevel;
+    
+    historyAttentionIndex = historyAttentionIndex + 1;
+    historyMeditationIndex = historyMeditationIndex + 1;
+    
+    if (historyAttentionIndex == 30) {
+        NSLog(@"Attention Array Full");
+        historyAttentionIndex = 0;
+        historyMeditationIndex = 0;
+        
+        for (int i=0; i<30; i++){
+            NSLog(@"%d: %d", i, historyAttention[i]);
+        }
+        
+    }
+    
 }
 

iOS/Orbit/Orbit/controllers/FlightViewController.m

@@ -15 +15 @@
 #import "SignalConverter.h"
 
+#import "StatisticsViewController.h"
+
 #define STATUS_DEFAULT 0
 #define STATUS_CONNECTING 1
@@ -187 +189 @@
    
    //   NSLog(@"Available fonts: %@", [UIFont familyNames]);
+   
+//   StatisticsViewController *statisticsViewController=[[StatisticsViewController alloc] init];
+//   [statisticsViewController.graphBottom reloadData];
    
    [signalConverter isAudioJackPlugged];

iOS/Orbit/Orbit/controllers/StatisticsViewController.h

@@ -22 +22 @@
 @property (nonatomic, strong) CPTGraphHostingView *hostViewBottom;
 
+@property CPTGraph *graphTop;
+@property CPTGraph *graphBottom;
+
+
+//-(void)reloadData;
+
 - (NSArray *)secondsInHistory;
 

iOS/Orbit/Orbit/controllers/StatisticsViewController.m

@@ -45 +45 @@
    [self configurePlots];
    [self configureAxes];
+   // Block for .5 seconds
+//   [NSThread sleepForTimeInterval:5];
+//   [self reloadData];
 }
 
@@ -76 +79 @@
         self.hostView.hostedGraph = graphTop;
    
-
+   
         // Bottom graph
         CPTGraph *graphBottom = [[CPTXYGraph alloc] initWithFrame:self.hostViewBottom.bounds];
@@ -216 +219 @@
         CPTMutableLineStyle *powerSymbolLineStyle = [CPTMutableLineStyle lineStyle];
         powerSymbolLineStyle.lineColor = powerColor;
-//      CPTPlotSymbol *powerSymbol = [CPTPlotSymbol ellipsePlotSymbol];
-//      powerSymbol.fill = [CPTFill fillWithColor:powerColor];
-//      powerSymbol.lineStyle = powerSymbolLineStyle;
-//      powerSymbol.size = CGSizeMake(3.0f, 3.0f);
-//      powerPlot.plotSymbol = powerSymbol;
+   //   CPTPlotSymbol *powerSymbol = [CPTPlotSymbol ellipsePlotSymbol];
+   //   powerSymbol.fill = [CPTFill fillWithColor:powerColor];
+   //   powerSymbol.lineStyle = powerSymbolLineStyle;
+   //   powerSymbol.size = CGSizeMake(3.0f, 3.0f);
+   //   powerPlot.plotSymbol = powerSymbol;
    
 }
@@ -335 +338 @@
         NSInteger majorIncrement = 100;
         NSInteger minorIncrement = 50;
-        CGFloat yMax = 700.0f;  // should determine dynamically based on max price
+        CGFloat yMax = 700.0f;  // should determine dynamically based on max value
         NSMutableSet *yLabels = [NSMutableSet set];
         NSMutableSet *yMajorLocations = [NSMutableSet set];
@@ -381 +384 @@
                         
                 case CPTScatterPlotFieldY:
-         //         return [NSDecimalNumber one];
          if (index < valueCount) {
-                                return [NSNumber numberWithUnsignedInteger:index];
+            //         return [NSDecimalNumber one];
+            //                          return [NSNumber numberWithUnsignedInteger:index];
+            return [[NSNumber alloc]initWithInt:(random() % 100)];
          }
          
@@ -389 +393 @@
         }
         return [NSDecimalNumber zero];
+}
+
+-(void)reloadData
+{
+   [self.graphTop reloadData];
+   [self.graphBottom reloadData];
 }