Ignore:
Timestamp:
11/29/10 11:34:59 (11 years ago)
Author:
sc
Message:

trunk/brainstorms/interface/puzzlebox_brainstorms_interface_design.ui:
trunk/brainstorms/Puzzlebox/Brainstorms/Interface_Design.py:

  • SVG image paths fixed

trunk/brainstorms/Puzzlebox/Brainstorms/Interface.py:

  • rc helicopters progress bars working
  • rc helicopter progress bars enable/disable working
  • control panel configuration settings working

trunk/brainstorms/Puzzlebox/Brainstorms/Configuration.py:
trunk/brainstorms/puzzlebox_brainstorms_configuration.ini:

  • motor port display order swapped
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/brainstorms/interface/puzzlebox_brainstorms_interface_design.ui

    r222 r224  
    35763576     <property name="icon"> 
    35773577      <iconset> 
    3578        <normaloff>../images/braintorms-throttle_up.svg</normaloff>../images/braintorms-throttle_up.svg</iconset> 
     3578       <normaloff>images/braintorms-throttle_up.svg</normaloff>images/braintorms-throttle_up.svg</iconset> 
    35793579     </property> 
    35803580     <property name="iconSize"> 
     
    36053605     <property name="icon"> 
    36063606      <iconset> 
    3607        <normaloff>../images/brainstorms-rudder-left.svg</normaloff>../images/brainstorms-rudder-left.svg</iconset> 
     3607       <normaloff>images/brainstorms-rudder-left.svg</normaloff>images/brainstorms-rudder-left.svg</iconset> 
    36083608     </property> 
    36093609     <property name="iconSize"> 
     
    36313631     <property name="icon"> 
    36323632      <iconset> 
    3633        <normaloff>../images/brainstorms-rudder-right.svg</normaloff>../images/brainstorms-rudder-right.svg</iconset> 
     3633       <normaloff>images/brainstorms-rudder-right.svg</normaloff>images/brainstorms-rudder-right.svg</iconset> 
    36343634     </property> 
    36353635     <property name="iconSize"> 
     
    36573657     <property name="icon"> 
    36583658      <iconset> 
    3659        <normaloff>../images/brainstorms-aileron_left.svg</normaloff>../images/brainstorms-aileron_left.svg</iconset> 
     3659       <normaloff>images/brainstorms-aileron_left.svg</normaloff>images/brainstorms-aileron_left.svg</iconset> 
    36603660     </property> 
    36613661     <property name="iconSize"> 
     
    36833683     <property name="icon"> 
    36843684      <iconset> 
    3685        <normaloff>../images/brainstorms-aileron_right.svg</normaloff>../images/brainstorms-aileron_right.svg</iconset> 
     3685       <normaloff>images/brainstorms-aileron_right.svg</normaloff>images/brainstorms-aileron_right.svg</iconset> 
    36863686     </property> 
    36873687     <property name="iconSize"> 
     
    37093709     <property name="icon"> 
    37103710      <iconset> 
    3711        <normaloff>../images/brainstorms-elevator_forward.svg</normaloff>../images/brainstorms-elevator_forward.svg</iconset> 
     3711       <normaloff>images/brainstorms-elevator_forward.svg</normaloff>images/brainstorms-elevator_forward.svg</iconset> 
    37123712     </property> 
    37133713     <property name="iconSize"> 
     
    38163816     <property name="icon"> 
    38173817      <iconset> 
    3818        <normaloff>../images/brainstorms-elevator_reverse.svg</normaloff>../images/brainstorms-elevator_reverse.svg</iconset> 
     3818       <normaloff>images/brainstorms-elevator_reverse.svg</normaloff>images/brainstorms-elevator_reverse.svg</iconset> 
    38193819     </property> 
    38203820     <property name="iconSize"> 
     
    40514051     <property name="icon"> 
    40524052      <iconset> 
    4053        <normaloff>../images/brainstorms-hover.svg</normaloff>../images/brainstorms-hover.svg</iconset> 
     4053       <normaloff>images/brainstorms-hover.svg</normaloff>images/brainstorms-hover.svg</iconset> 
    40544054     </property> 
    40554055     <property name="iconSize"> 
     
    40834083     <property name="icon"> 
    40844084      <iconset> 
    4085        <normaloff>../images/brainstorms-fly_forward.svg</normaloff>../images/brainstorms-fly_forward.svg</iconset> 
     4085       <normaloff>images/brainstorms-fly_forward.svg</normaloff>images/brainstorms-fly_forward.svg</iconset> 
    40864086     </property> 
    40874087     <property name="iconSize"> 
     
    41124112     <property name="icon"> 
    41134113      <iconset> 
    4114        <normaloff>../images/brainstorms-land_arrow.svg</normaloff>../images/brainstorms-land_arrow.svg</iconset> 
     4114       <normaloff>images/brainstorms-land_arrow.svg</normaloff>images/brainstorms-land_arrow.svg</iconset> 
    41154115     </property> 
    41164116     <property name="iconSize"> 
     
    44464446     </property> 
    44474447    </widget> 
    4448     <zorder>labelRCHelicopter</zorder> 
    4449     <zorder>textLabelTitleHelicopter</zorder> 
    4450     <zorder>comboBoxHelicopterPortSelect</zorder> 
    4451     <zorder>labelPuzzleboxHelicopter</zorder> 
    4452     <zorder>textLabelHelicopterStatus</zorder> 
    4453     <zorder>line6_19</zorder> 
    4454     <zorder>line3_4</zorder> 
    4455     <zorder>pushButtonHelicopterThrottle</zorder> 
    4456     <zorder>pushButtonHelicopterRudderLeft</zorder> 
    4457     <zorder>pushButtonHelicopterRudderRight</zorder> 
    4458     <zorder>pushButtonHelicopterAileronLeft</zorder> 
    4459     <zorder>pushButtonHelicopterAileronRight</zorder> 
    4460     <zorder>pushButtonHelicopterElevatorForward</zorder> 
    4461     <zorder>comboBoxHelicopterTransmitter</zorder> 
    4462     <zorder>textLabelHelicopterTransmitterType</zorder> 
    4463     <zorder>verticalSliderHelicopterThrottle</zorder> 
    4464     <zorder>line</zorder> 
    4465     <zorder>pushButtonHelicopterElevatorReverse</zorder> 
    4466     <zorder>labelHelicopterThrottle</zorder> 
    4467     <zorder>labelHelicopterElevator</zorder> 
    4468     <zorder>labelHelicopterRudder</zorder> 
    4469     <zorder>labelHelicopterAileron</zorder> 
    4470     <zorder>verticalSliderHelicopterElevatorForward</zorder> 
    4471     <zorder>verticalSliderHelicopterElevatorReverse</zorder> 
    4472     <zorder>horizontalSliderHelicopterRudderRight</zorder> 
    4473     <zorder>horizontalSliderHelicopterRudderLeft</zorder> 
    4474     <zorder>horizontalSliderHelicopterAileronRight</zorder> 
    4475     <zorder>horizontalSliderHelicopterAileronLeft</zorder> 
    4476     <zorder>line_2</zorder> 
    4477     <zorder>pushButtonHelicopterHover</zorder> 
    4478     <zorder>pushButtonHelicopterFlyForward</zorder> 
    4479     <zorder>pushButtonHelicopterLand</zorder> 
    4480     <zorder>labelHelicopterHover</zorder> 
    4481     <zorder>labelHelicopterFlyForward</zorder> 
    4482     <zorder>labelHelicopterLand</zorder> 
    4483     <zorder>progressBarHelicopterSpeed</zorder> 
    4484     <zorder>line6_13</zorder> 
    4485     <zorder>pushButtonHelicopterRelaxationEnable</zorder> 
    4486     <zorder>progressBarHelicopterRelaxation</zorder> 
    4487     <zorder>textLabelHelicopterSpeed</zorder> 
    4488     <zorder>progressBarHelicopterConcentration</zorder> 
    4489     <zorder>line6_14</zorder> 
    4490     <zorder>pushButtonHelicopterConcentrationEnable</zorder> 
    4491     <zorder>pushButtonHelicopterSpeedEnable</zorder> 
    4492     <zorder>textLabelHelicopterRelaxation</zorder> 
    4493     <zorder>textLabelHelicopterConcentration</zorder> 
    4494     <zorder>pushButtonNXTConnect_3</zorder> 
    4495     <zorder>pushButtonNXTSearch_2</zorder> 
    4496     <zorder>pushButtonHelicopterConnect</zorder> 
    4497     <zorder>pushButtonHelicopterSearch</zorder> 
    44984448   </widget> 
    44994449   <widget class="QWidget" name="tabControlPanel"> 
     
    49154865     </property> 
    49164866    </widget> 
    4917     <widget class="QLabel" name="labelRightMotorPort"> 
     4867    <widget class="QLabel" name="labelLeftMotorPort"> 
    49184868     <property name="geometry"> 
    49194869      <rect> 
     
    49254875     </property> 
    49264876     <property name="text"> 
    4927       <string>Right Motor Port</string> 
     4877      <string>Left Motor Port</string> 
    49284878     </property> 
    49294879     <property name="alignment"> 
     
    49314881     </property> 
    49324882    </widget> 
    4933     <widget class="QLineEdit" name="lineEditRightMotorPort"> 
     4883    <widget class="QLineEdit" name="lineEditLeftMotorPort"> 
    49344884     <property name="enabled"> 
    49354885      <bool>false</bool> 
     
    49504900     </property> 
    49514901    </widget> 
    4952     <widget class="QLabel" name="labelLeftMotorPort"> 
     4902    <widget class="QLabel" name="labelRightMotorPort"> 
    49534903     <property name="geometry"> 
    49544904      <rect> 
     
    49604910     </property> 
    49614911     <property name="text"> 
    4962       <string>Left Motor Port</string> 
     4912      <string>Right Motor Port</string> 
    49634913     </property> 
    49644914     <property name="alignment"> 
     
    49664916     </property> 
    49674917    </widget> 
    4968     <widget class="QLineEdit" name="lineEditLeftMotorPort"> 
     4918    <widget class="QLineEdit" name="lineEditRightMotorPort"> 
    49694919     <property name="enabled"> 
    49704920      <bool>false</bool> 
Note: See TracChangeset for help on using the changeset viewer.