Ignore:
Timestamp:
01/02/14 07:07:05 (7 years ago)
Author:
Steve Castellotti <sc@…>
Branches:
master, Servo
Children:
2246ba0
Parents:
c6dde93
Message:
  • Statistics Tab and ViewController? added
  • Initial algorithm history and raw brainwaves
File:
1 edited

Legend:

Unmodified
Added
Removed
  • iOS/Orbit/Orbit/en.lproj/MainStoryboard.storyboard

    rc6dde93 rc1a500d  
    6060                <placeholder placeholderIdentifier="IBFirstResponder" id="7oi-5l-zN2" userLabel="First Responder" sceneMemberID="firstResponder"/> 
    6161            </objects> 
    62             <point key="canvasLocation" x="680" y="1192"/> 
     62            <point key="canvasLocation" x="680" y="1681"/> 
     63        </scene> 
     64        <!--Statistics View Controller - Statistics--> 
     65        <scene sceneID="2wK-cS-Lc7"> 
     66            <objects> 
     67                <viewController id="ewb-HD-SG5" customClass="StatisticsViewController" sceneMemberID="viewController"> 
     68                    <view key="view" contentMode="scaleToFill" id="QuZ-rc-WhN"> 
     69                        <rect key="frame" x="0.0" y="0.0" width="320" height="480"/> 
     70                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> 
     71                        <subviews> 
     72                            <navigationBar contentMode="scaleToFill" barStyle="black" id="IPO-TL-rLO"> 
     73                                <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> 
     74                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> 
     75                                <items> 
     76                                    <navigationItem title="Statistics" id="Xe1-O9-Frs"/> 
     77                                </items> 
     78                            </navigationBar> 
     79                        </subviews> 
     80                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> 
     81                    </view> 
     82                    <tabBarItem key="tabBarItem" title="Statistics" image="tab_advanced-30x30.png" id="9MD-xw-rQj"/> 
     83                    <simulatedTabBarMetrics key="simulatedBottomBarMetrics"/> 
     84                </viewController> 
     85                <placeholder placeholderIdentifier="IBFirstResponder" id="HwK-1n-X5u" userLabel="First Responder" sceneMemberID="firstResponder"/> 
     86            </objects> 
     87            <point key="canvasLocation" x="680" y="509"/> 
    6388        </scene> 
    6489        <!--Advanced View Controller - Advanced--> 
     
    303328                <placeholder placeholderIdentifier="IBFirstResponder" id="oN9-X2-GzT" userLabel="First Responder" sceneMemberID="firstResponder"/> 
    304329            </objects> 
    305             <point key="canvasLocation" x="680" y="603"/> 
     330            <point key="canvasLocation" x="680" y="1095"/> 
    306331        </scene> 
    307332        <!--Flight View Controller - Flight--> 
     
    437462                                    </progressView> 
    438463                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="0%" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ah9-c0-kCb" userLabel="Power %"> 
    439                                         <rect key="frame" x="266" y="47" width="40" height="18"/> 
     464                                        <rect key="frame" x="266.00000004881008" y="47" width="40" height="18"/> 
    440465                                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/> 
    441466                                        <fontDescription key="fontDescription" type="system" pointSize="14"/> 
     
    513538                <placeholder placeholderIdentifier="IBFirstResponder" id="2FE-fA-6q3" userLabel="First Responder" sceneMemberID="firstResponder"/> 
    514539            </objects> 
    515             <point key="canvasLocation" x="680" y="15"/> 
     540            <point key="canvasLocation" x="680" y="-81"/> 
    516541        </scene> 
    517542        <!--Tutorial View Controller - Welcome--> 
     
    549574                <placeholder placeholderIdentifier="IBFirstResponder" id="phY-I4-vyg" userLabel="First Responder" sceneMemberID="firstResponder"/> 
    550575            </objects> 
    551             <point key="canvasLocation" x="680" y="-651"/> 
     576            <point key="canvasLocation" x="680" y="-670"/> 
    552577        </scene> 
    553578        <!--Tab Bar Controller--> 
     
    564589                        <segue destination="Wc6-MU-jew" kind="relationship" relationship="viewControllers" id="RgU-De-HvK"/> 
    565590                        <segue destination="FNb-Lg-ILk" kind="relationship" relationship="viewControllers" id="qdp-16-orN"/> 
     591                        <segue destination="ewb-HD-SG5" kind="relationship" relationship="viewControllers" id="bnp-Vy-gvn"/> 
    566592                        <segue destination="GcO-3J-amz" kind="relationship" relationship="viewControllers" id="2mN-g9-3Pc"/> 
    567593                        <segue destination="rjE-lQ-n1C" kind="relationship" relationship="viewControllers" id="Qzp-bX-Vb5"/> 
Note: See TracChangeset for help on using the changeset viewer.