- Timestamp:
- 10/22/13 12:23:31 (9 years ago)
- Branches:
- master, Servo
- Children:
- f1b6f6e
- Parents:
- 86f2f30
- Location:
- iOS/Orbit
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
iOS/Orbit/Orbit/SignalConverter.m
r37ca4e8 re59da66 255 255 #pragma mark internal processing methods 256 256 257 // calculate the total power level to output through the headphones, a value between zero and 1. 258 // this is the attention signal level and meditation signal level added together 257 // Calculate power for throttle. In theory this can be tied to the amount of throttle 258 // to set based on how far based the trigger thresholds attention and meditation are 259 // currently measured 259 260 - (float) currentPowerLevel 260 261 { … … 272 273 273 274 float powerLevel = attentionScore + meditationScore; 274 if (powerLevel > 1) { 275 276 // For now just set Power to 100% if helicopter should be flying 277 // if (powerLevel > 1) { 278 if (powerLevel > 0) { 275 279 return 1.0; 276 280 } -
iOS/Orbit/Orbit/en.lproj/MainStoryboard.storyboard
r86f2f30 re59da66 263 263 </progressView> 264 264 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="0%" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bZn-rG-svm" userLabel="Attention %"> 265 <rect key="frame" x="26 8" y="22" width="24" height="18"/>265 <rect key="frame" x="267.99999999999994" y="22" width="24" height="18"/> 266 266 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/> 267 267 <fontDescription key="fontDescription" type="system" pointSize="14"/> … … 282 282 </view> 283 283 <view contentMode="scaleToFill" id="6bR-ua-0jV" userLabel="Meditation Background"> 284 <rect key="frame" x="5" y="128" width="310 " height="72"/>284 <rect key="frame" x="5" y="128" width="310.00000000000006" height="72"/> 285 285 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/> 286 286 <subviews> 287 287 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Meditation" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="HD9-dt-40K"> 288 <rect key="frame" x="6" y="5" width="72.0000000000000 14" height="20"/>288 <rect key="frame" x="6" y="5" width="72.000000000000043" height="20"/> 289 289 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/> 290 290 <fontDescription key="fontDescription" type="system" pointSize="14"/> … … 298 298 </progressView> 299 299 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="0%" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Rhw-9S-ZP1" userLabel="Meditation %"> 300 <rect key="frame" x="268" y="22" width="24 " height="18"/>300 <rect key="frame" x="268" y="22" width="24.000000000000075" height="18"/> 301 301 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/> 302 302 <fontDescription key="fontDescription" type="system" pointSize="14"/> … … 317 317 </view> 318 318 <view contentMode="scaleToFill" id="DEF-SC-IYQ" userLabel="Signal Background"> 319 <rect key="frame" x="5" y="210 " width="310" height="72"/>319 <rect key="frame" x="5" y="210.00000000000003" width="310" height="72"/> 320 320 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/> 321 321 <subviews> … … 333 333 </progressView> 334 334 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="0%" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="yYn-76-IoI" userLabel="Signal %"> 335 <rect key="frame" x="268" y="18" width="24" height="18"/>336 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>337 <fontDescription key="fontDescription" type="system" pointSize="14"/>338 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>339 <nil key="highlightedColor"/>335 <rect key="frame" x="268" y="18" width="24" height="18"/> 336 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/> 337 <fontDescription key="fontDescription" type="system" pointSize="14"/> 338 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> 339 <nil key="highlightedColor"/> 340 340 </label> 341 341 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Power" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="oUh-1C-0bs"> … … 352 352 </progressView> 353 353 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="0%" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ah9-c0-kCb" userLabel="Power %"> 354 <rect key="frame" x="268" y="42" width="24" height="18"/>355 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>356 <fontDescription key="fontDescription" type="system" pointSize="14"/>357 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>358 <nil key="highlightedColor"/>354 <rect key="frame" x="268" y="42" width="24" height="18"/> 355 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/> 356 <fontDescription key="fontDescription" type="system" pointSize="14"/> 357 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> 358 <nil key="highlightedColor"/> 359 359 </label> 360 360 </subviews>
Note: See TracChangeset
for help on using the changeset viewer.