Changeset 57848ad in orbit


Ignore:
Timestamp:
12/29/13 12:26:20 (7 years ago)
Author:
Steve Castellotti <sc@…>
Branches:
master, Servo
Children:
0a45bc8
Parents:
4a94f92
Message:
  • Labels connected to Storyboard
Location:
iOS/Orbit/Orbit
Files:
3 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; 
  • iOS/Orbit/Orbit/en.lproj/MainStoryboard.storyboard

    rd5f1a91 r57848ad  
    200200                                        <nil key="highlightedColor"/> 
    201201                                    </label> 
    202                                     <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" id="JEY-La-U7l"> 
     202                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" id="JEY-La-U7l"> 
    203203                                        <rect key="frame" x="11" y="14" width="51" height="31"/> 
    204204                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> 
     
    232232                        <outlet property="switchTiltSensorControlThrottle" destination="RQl-ZZ-JJw" id="Cpu-Wm-Dxr"/> 
    233233                        <outlet property="throttle" destination="mKS-gr-qpn" id="O0G-49-cDf"/> 
     234                        <outlet property="tiltSensorControl" destination="Tv8-yP-KY5" id="sKf-Jh-7Fx"/> 
     235                        <outlet property="tiltSensorControlThrottle" destination="tJc-ay-Cff" id="gzv-XT-mXE"/> 
    234236                        <outlet property="yaw" destination="8k8-7Y-hWH" id="wuD-Vv-AEE"/> 
    235237                    </connections> 
     
    282284                                    </progressView> 
    283285                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="0%" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bZn-rG-svm" userLabel="Attention %"> 
    284                                         <rect key="frame" x="267.9999996506325" y="22" width="24" height="18"/> 
     286                                        <rect key="frame" x="267.99999949498567" y="22" width="24" height="18"/> 
    285287                                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/> 
    286288                                        <fontDescription key="fontDescription" type="system" pointSize="14"/> 
     
    352354                                    </progressView> 
    353355                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="0%" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="yYn-76-IoI" userLabel="Signal %"> 
    354                                         <rect key="frame" x="267.99999924152155" y="19" width="24" height="18"/> 
     356                                        <rect key="frame" x="267.99999906065557" y="19" width="24" height="18"/> 
    355357                                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/> 
    356358                                        <fontDescription key="fontDescription" type="system" pointSize="14"/> 
     
    371373                                    </progressView> 
    372374                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="0%" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ah9-c0-kCb" userLabel="Power %"> 
    373                                         <rect key="frame" x="267.99999924152155" y="47" width="24" height="18"/> 
     375                                        <rect key="frame" x="267.99999906065557" y="47" width="24" height="18"/> 
    374376                                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/> 
    375377                                        <fontDescription key="fontDescription" type="system" pointSize="14"/> 
     
    404406                                </userDefinedRuntimeAttributes> 
    405407                            </view> 
    406                             <view contentMode="scaleToFill" id="NjG-ud-uxt" userLabel="Meditation Background"> 
     408                            <view contentMode="scaleToFill" id="NjG-ud-uxt" userLabel="Scores Background"> 
    407409                                <rect key="frame" x="5" y="290" width="310" height="26"/> 
    408410                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/> 
     
    438440                        <outlet property="power" destination="KeR-cO-90u" id="wwM-U5-g6n"/> 
    439441                        <outlet property="powerPercent" destination="ah9-c0-kCb" id="IF6-xV-7Xf"/> 
     442                        <outlet property="scoresDisplay" destination="N4q-gC-eyc" id="zjs-4c-23X"/> 
    440443                        <outlet property="signal" destination="AuD-cU-2pt" id="uuu-hc-E2e"/> 
    441444                        <outlet property="signalPercent" destination="yYn-76-IoI" id="4Ei-JM-jZ1"/> 
Note: See TracChangeset for help on using the changeset viewer.