Changeset 57848ad in orbit for iOS/Orbit

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

Files:

• controllers/AdvancedViewController.h (modified) (3 diffs)
• controllers/FlightViewController.h (modified) (2 diffs)
• en.lproj/MainStoryboard.storyboard (modified) (7 diffs)

iOS/Orbit/Orbit/controllers/AdvancedViewController.h

@@ -14 +14 @@
 @interface AdvancedViewController : UIViewController
 
+@property (nonatomic, retain) IBOutlet UIBarButtonItem *resetButton;
 @property (nonatomic, retain) IBOutlet UILabel *throttlePercent;
 @property (nonatomic, retain) IBOutlet UISlider *throttle;
@@ -20 +21 @@
 @property (nonatomic, retain) IBOutlet UILabel *pitchPercent;
 @property (nonatomic, retain) IBOutlet UISlider *pitch;
-@property (nonatomic, retain) IBOutlet UIBarButtonItem *resetButton;
+@property (nonatomic, retain) IBOutlet UILabel *tiltSensorControl;
 @property (nonatomic, retain) IBOutlet UISwitch *switchTiltSensorControl;
+@property (nonatomic, retain) IBOutlet UILabel *tiltSensorControlThrottle;
 @property (nonatomic, retain) IBOutlet UISwitch *switchTiltSensorControlThrottle;
+
+- (IBAction) resetButtonPressed:(id)button;
 
 - (IBAction) pitchChanged:(id)sender;
@@ -28 +32 @@
 - (IBAction) throttleChanged:(id)sender;
 
-- (IBAction) resetButtonPressed:(id)button;
-
-//- (void)changeSwitchTiltSensorControl:(id)sender;
-//- (void)changeSwitchTiltSensorControlThrottle:(id)sender;
 - (IBAction)changeSwitchTiltSensorControl:(id)sender;
 - (IBAction)changeSwitchTiltSensorControlThrottle:(id)sender;

iOS/Orbit/Orbit/controllers/FlightViewController.h

@@ -18 +18 @@
 }
 
+@property (nonatomic, retain) IBOutlet UIBarButtonItem *connectButton;
+@property (nonatomic, retain) IBOutlet UIBarButtonItem *testButton;
 @property (nonatomic, retain) IBOutlet UIProgressView *attention;
 @property (nonatomic, retain) IBOutlet UILabel *attentionPercent;
@@ -28 +30 @@
 @property (nonatomic, retain) IBOutlet UISlider *attentionThreshold;
 @property (nonatomic, retain) IBOutlet UISlider *meditationThreshold;
-@property (nonatomic, retain) IBOutlet UIBarButtonItem *connectButton;
-@property (nonatomic, retain) IBOutlet UIBarButtonItem *testButton;
 @property (nonatomic, retain) IBOutlet UIImageView *statusImage;
+@property (nonatomic, retain) IBOutlet UILabel *scoresDisplay;
 
 - (IBAction) connectButtonPressed:(id) sender;

iOS/Orbit/Orbit/en.lproj/MainStoryboard.storyboard

@@ -200 +200 @@
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" id="JEY-La-U7l">
+                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" id="JEY-La-U7l">
                                         <rect key="frame" x="11" y="14" width="51" height="31"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -232 +232 @@
                         <outlet property="switchTiltSensorControlThrottle" destination="RQl-ZZ-JJw" id="Cpu-Wm-Dxr"/>
                         <outlet property="throttle" destination="mKS-gr-qpn" id="O0G-49-cDf"/>
+                        <outlet property="tiltSensorControl" destination="Tv8-yP-KY5" id="sKf-Jh-7Fx"/>
+                        <outlet property="tiltSensorControlThrottle" destination="tJc-ay-Cff" id="gzv-XT-mXE"/>
                         <outlet property="yaw" destination="8k8-7Y-hWH" id="wuD-Vv-AEE"/>
                     </connections>
@@ -282 +284 @@
                                     </progressView>
                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="0%" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bZn-rG-svm" userLabel="Attention %">
-                                        <rect key="frame" x="267.9999996506325" y="22" width="24" height="18"/>
+                                        <rect key="frame" x="267.99999949498567" y="22" width="24" height="18"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -352 +354 @@
                                     </progressView>
                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="0%" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="yYn-76-IoI" userLabel="Signal %">
-                                        <rect key="frame" x="267.99999924152155" y="19" width="24" height="18"/>
+                                        <rect key="frame" x="267.99999906065557" y="19" width="24" height="18"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -371 +373 @@
                                     </progressView>
                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="0%" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ah9-c0-kCb" userLabel="Power %">
-                                        <rect key="frame" x="267.99999924152155" y="47" width="24" height="18"/>
+                                        <rect key="frame" x="267.99999906065557" y="47" width="24" height="18"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -404 +406 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
-                            <view contentMode="scaleToFill" id="NjG-ud-uxt" userLabel="Meditation Background">
+                            <view contentMode="scaleToFill" id="NjG-ud-uxt" userLabel="Scores Background">
                                 <rect key="frame" x="5" y="290" width="310" height="26"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
@@ -438 +440 @@
                         <outlet property="power" destination="KeR-cO-90u" id="wwM-U5-g6n"/>
                         <outlet property="powerPercent" destination="ah9-c0-kCb" id="IF6-xV-7Xf"/>
+                        <outlet property="scoresDisplay" destination="N4q-gC-eyc" id="zjs-4c-23X"/>
                         <outlet property="signal" destination="AuD-cU-2pt" id="uuu-hc-E2e"/>
                         <outlet property="signalPercent" destination="yYn-76-IoI" id="4Ei-JM-jZ1"/>