Changeset 57848ad in orbit for iOS/Orbit/Orbit/controllers


Ignore:
Timestamp:
12/29/13 12:26:20 (9 years ago)
Author:
Steve Castellotti <sc@…>
Branches:
master, Servo
Children:
0a45bc8
Parents:
4a94f92
Message:
  • Labels connected to Storyboard
Location:
iOS/Orbit/Orbit/controllers
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • iOS/Orbit/Orbit/controllers/AdvancedViewController.h

    rd42b042 r57848ad  
    1414@interface AdvancedViewController : UIViewController 
    1515 
     16@property (nonatomic, retain) IBOutlet UIBarButtonItem *resetButton; 
    1617@property (nonatomic, retain) IBOutlet UILabel *throttlePercent; 
    1718@property (nonatomic, retain) IBOutlet UISlider *throttle; 
     
    2021@property (nonatomic, retain) IBOutlet UILabel *pitchPercent; 
    2122@property (nonatomic, retain) IBOutlet UISlider *pitch; 
    22 @property (nonatomic, retain) IBOutlet UIBarButtonItem *resetButton; 
     23@property (nonatomic, retain) IBOutlet UILabel *tiltSensorControl; 
    2324@property (nonatomic, retain) IBOutlet UISwitch *switchTiltSensorControl; 
     25@property (nonatomic, retain) IBOutlet UILabel *tiltSensorControlThrottle; 
    2426@property (nonatomic, retain) IBOutlet UISwitch *switchTiltSensorControlThrottle; 
     27 
     28- (IBAction) resetButtonPressed:(id)button; 
    2529 
    2630- (IBAction) pitchChanged:(id)sender; 
     
    2832- (IBAction) throttleChanged:(id)sender; 
    2933 
    30 - (IBAction) resetButtonPressed:(id)button; 
    31  
    32 //- (void)changeSwitchTiltSensorControl:(id)sender; 
    33 //- (void)changeSwitchTiltSensorControlThrottle:(id)sender; 
    3434- (IBAction)changeSwitchTiltSensorControl:(id)sender; 
    3535- (IBAction)changeSwitchTiltSensorControlThrottle:(id)sender; 
  • iOS/Orbit/Orbit/controllers/FlightViewController.h

    r6db346c r57848ad  
    1818} 
    1919 
     20@property (nonatomic, retain) IBOutlet UIBarButtonItem *connectButton; 
     21@property (nonatomic, retain) IBOutlet UIBarButtonItem *testButton; 
    2022@property (nonatomic, retain) IBOutlet UIProgressView *attention; 
    2123@property (nonatomic, retain) IBOutlet UILabel *attentionPercent; 
     
    2830@property (nonatomic, retain) IBOutlet UISlider *attentionThreshold; 
    2931@property (nonatomic, retain) IBOutlet UISlider *meditationThreshold; 
    30 @property (nonatomic, retain) IBOutlet UIBarButtonItem *connectButton; 
    31 @property (nonatomic, retain) IBOutlet UIBarButtonItem *testButton; 
    3232@property (nonatomic, retain) IBOutlet UIImageView *statusImage; 
     33@property (nonatomic, retain) IBOutlet UILabel *scoresDisplay; 
    3334 
    3435- (IBAction) connectButtonPressed:(id) sender; 
Note: See TracChangeset for help on using the changeset viewer.