Changeset ba2b6ff in orbit


Ignore:
Timestamp:
08/26/13 05:25:20 (6 years ago)
Author:
Steve Castellotti <sc@…>
Branches:
master, Servo, Tab_Interface, pyramid
Children:
d31bab4
Parents:
a5b7548
Message:

UI:

  • Attention progress bar color set to red
  • Meditation progress bar color set to blue
  • Attention and Meditation slider background colors set to grey
  • Default Meditation setting to 0
  • Attention and Meditation sliders will have no effect on Hover power level when set to 0
Location:
iOS/Orbit
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • iOS/Orbit/Orbit/SignalConverter.m

    r8a0f920f rba2b6ff  
    231231- (float) currentPowerLevel 
    232232{ 
    233     float powerLevel = attentionPower[attentionLevel] + meditationPower[meditationLevel]; 
     233    
     234    float attentionScore = attentionPower[attentionLevel]; 
     235    float meditationScore = meditationPower[meditationLevel]; 
     236     
     237    if (attentionThreshold < 0.0) { 
     238        attentionScore = 0; 
     239    } 
     240     
     241    if (meditationThreshold == 0.0) { 
     242        meditationScore = 0; 
     243    } 
     244 
     245    float powerLevel = attentionScore + meditationScore; 
    234246    if (powerLevel > 1) { 
    235247        return 1.0; 
  • iOS/Orbit/Orbit/controllers/FlightViewController.m

    r8a0f920f rba2b6ff  
    3232{ 
    3333    [super viewDidLoad]; 
     34 
     35    attention.progressTintColor = [UIColor redColor]; 
     36    self.attentionThreshold.minimumTrackTintColor = [UIColor grayColor]; 
     37    meditation.progressTintColor = [UIColor blueColor]; 
     38    self.meditationThreshold.minimumTrackTintColor = [UIColor grayColor]; 
     39    self.meditationThreshold.value = 0; 
     40    
    3441    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate]; 
    3542    signalConverter = appDelegate.signalConverter; 
  • iOS/Orbit/Orbit/en.lproj/MainStoryboard.storyboard

    r8a0f920f rba2b6ff  
    11<?xml version="1.0" encoding="UTF-8" standalone="no"?> 
    2 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="11G63" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="T1J-Fd-fkz"> 
     2<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="T1J-Fd-fkz"> 
    33    <dependencies> 
    44        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> 
     
    468468        <image name="tutorial.png" width="20" height="20"/> 
    469469    </resources> 
    470     <classes> 
    471         <class className="AdvancedViewController" superclassName="UIViewController"> 
    472             <source key="sourceIdentifier" type="project" relativePath="./Classes/AdvancedViewController.h"/> 
    473             <relationships> 
    474                 <relationship kind="action" name="pitchChanged:"/> 
    475                 <relationship kind="action" name="resetButtonPressed:"/> 
    476                 <relationship kind="action" name="throttleChanged:"/> 
    477                 <relationship kind="action" name="yawChanged:"/> 
    478                 <relationship kind="outlet" name="pitch" candidateClass="UISlider"/> 
    479                 <relationship kind="outlet" name="pitchPercent" candidateClass="UILabel"/> 
    480                 <relationship kind="outlet" name="resetButton" candidateClass="UIBarButtonItem"/> 
    481                 <relationship kind="outlet" name="throttle" candidateClass="UISlider"/> 
    482                 <relationship kind="outlet" name="throttlePercent" candidateClass="UILabel"/> 
    483                 <relationship kind="outlet" name="yaw" candidateClass="UISlider"/> 
    484                 <relationship kind="outlet" name="yawPercent" candidateClass="UILabel"/> 
    485             </relationships> 
    486         </class> 
    487         <class className="FlightViewController" superclassName="UIViewController"> 
    488             <source key="sourceIdentifier" type="project" relativePath="./Classes/FlightViewController.h"/> 
    489             <relationships> 
    490                 <relationship kind="action" name="connectButtonPressed:"/> 
    491                 <relationship kind="action" name="testButtonPressed:"/> 
    492                 <relationship kind="outlet" name="attention" candidateClass="UIProgressView"/> 
    493                 <relationship kind="outlet" name="attentionPercent" candidateClass="UILabel"/> 
    494                 <relationship kind="outlet" name="attentionThreshold" candidateClass="UISlider"/> 
    495                 <relationship kind="outlet" name="connectButton" candidateClass="UIBarButtonItem"/> 
    496                 <relationship kind="outlet" name="meditation" candidateClass="UIProgressView"/> 
    497                 <relationship kind="outlet" name="meditationPercent" candidateClass="UILabel"/> 
    498                 <relationship kind="outlet" name="meditationThreshold" candidateClass="UISlider"/> 
    499                 <relationship kind="outlet" name="power" candidateClass="UIProgressView"/> 
    500                 <relationship kind="outlet" name="powerPercent" candidateClass="UILabel"/> 
    501                 <relationship kind="outlet" name="signal" candidateClass="UIProgressView"/> 
    502                 <relationship kind="outlet" name="signalPercent" candidateClass="UILabel"/> 
    503                 <relationship kind="outlet" name="status" candidateClass="UILabel"/> 
    504                 <relationship kind="outlet" name="statusImage" candidateClass="UIImageView"/> 
    505                 <relationship kind="outlet" name="testButton" candidateClass="UIBarButtonItem"/> 
    506             </relationships> 
    507         </class> 
    508         <class className="SupportViewController" superclassName="UIViewController"> 
    509             <source key="sourceIdentifier" type="project" relativePath="./Classes/SupportViewController.h"/> 
    510             <relationships> 
    511                 <relationship kind="action" name="retryButtonPressed:"/> 
    512                 <relationship kind="outlet" name="retryButton" candidateClass="UIButton"/> 
    513                 <relationship kind="outlet" name="status" candidateClass="UILabel"/> 
    514                 <relationship kind="outlet" name="webView" candidateClass="UIWebView"/> 
    515             </relationships> 
    516         </class> 
    517         <class className="TutorialViewController" superclassName="UIViewController"> 
    518             <source key="sourceIdentifier" type="project" relativePath="./Classes/TutorialViewController.h"/> 
    519             <relationships> 
    520                 <relationship kind="outlet" name="webView" candidateClass="UIWebView"/> 
    521             </relationships> 
    522         </class> 
    523     </classes> 
    524470    <simulatedMetricsContainer key="defaultSimulatedMetrics"> 
    525471        <simulatedStatusBarMetrics key="statusBar"/> 
  • iOS/Orbit/orbit.xcodeproj/project.pbxproj

    r47ed41d rba2b6ff  
    145145                288B4BC5178ED362007D588D /* SupportViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SupportViewController.m; path = controllers/SupportViewController.m; sourceTree = "<group>"; }; 
    146146                288B4BC7178F016F007D588D /* SignalConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignalConverter.h; sourceTree = "<group>"; }; 
    147                 288B4BC8178F016F007D588D /* SignalConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignalConverter.m; sourceTree = "<group>"; }; 
     147                288B4BC8178F016F007D588D /* SignalConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = SignalConverter.m; sourceTree = "<group>"; tabWidth = 3; usesTabs = 0; }; 
    148148                288B4BCA178F0842007D588D /* SignalConverterDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SignalConverterDelegate.h; sourceTree = "<group>"; }; 
    149149                289C7CCD178C36A9005C08EC /* TutorialViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TutorialViewController.h; path = controllers/TutorialViewController.h; sourceTree = "<group>"; }; 
Note: See TracChangeset for help on using the changeset viewer.