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/Puzzlebox/Brainstorms/Interface_Design.py

    r222 r224  
    33# Form implementation generated from reading ui file 'interface/puzzlebox_brainstorms_interface_design.ui' 
    44# 
    5 # Created: Sun Nov 28 15:57:37 2010 
     5# Created: Mon Nov 29 00:07:39 2010 
    66#      by: PyQt4 UI code generator 4.7.4 
    77# 
     
    11561156                self.pushButtonHelicopterThrottle.setText("") 
    11571157                icon7 = QtGui.QIcon() 
    1158                 icon7.addPixmap(QtGui.QPixmap("../images/braintorms-throttle_up.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) 
     1158                icon7.addPixmap(QtGui.QPixmap("images/braintorms-throttle_up.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) 
    11591159                self.pushButtonHelicopterThrottle.setIcon(icon7) 
    11601160                self.pushButtonHelicopterThrottle.setIconSize(QtCore.QSize(100, 120)) 
     
    11661166                self.pushButtonHelicopterRudderLeft.setText("") 
    11671167                icon8 = QtGui.QIcon() 
    1168                 icon8.addPixmap(QtGui.QPixmap("../images/brainstorms-rudder-left.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) 
     1168                icon8.addPixmap(QtGui.QPixmap("images/brainstorms-rudder-left.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) 
    11691169                self.pushButtonHelicopterRudderLeft.setIcon(icon8) 
    11701170                self.pushButtonHelicopterRudderLeft.setIconSize(QtCore.QSize(65, 65)) 
     
    11751175                self.pushButtonHelicopterRudderRight.setText("") 
    11761176                icon9 = QtGui.QIcon() 
    1177                 icon9.addPixmap(QtGui.QPixmap("../images/brainstorms-rudder-right.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) 
     1177                icon9.addPixmap(QtGui.QPixmap("images/brainstorms-rudder-right.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) 
    11781178                self.pushButtonHelicopterRudderRight.setIcon(icon9) 
    11791179                self.pushButtonHelicopterRudderRight.setIconSize(QtCore.QSize(65, 65)) 
     
    11841184                self.pushButtonHelicopterAileronLeft.setText("") 
    11851185                icon10 = QtGui.QIcon() 
    1186                 icon10.addPixmap(QtGui.QPixmap("../images/brainstorms-aileron_left.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) 
     1186                icon10.addPixmap(QtGui.QPixmap("images/brainstorms-aileron_left.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) 
    11871187                self.pushButtonHelicopterAileronLeft.setIcon(icon10) 
    11881188                self.pushButtonHelicopterAileronLeft.setIconSize(QtCore.QSize(80, 50)) 
     
    11931193                self.pushButtonHelicopterAileronRight.setText("") 
    11941194                icon11 = QtGui.QIcon() 
    1195                 icon11.addPixmap(QtGui.QPixmap("../images/brainstorms-aileron_right.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) 
     1195                icon11.addPixmap(QtGui.QPixmap("images/brainstorms-aileron_right.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) 
    11961196                self.pushButtonHelicopterAileronRight.setIcon(icon11) 
    11971197                self.pushButtonHelicopterAileronRight.setIconSize(QtCore.QSize(80, 50)) 
     
    12021202                self.pushButtonHelicopterElevatorForward.setText("") 
    12031203                icon12 = QtGui.QIcon() 
    1204                 icon12.addPixmap(QtGui.QPixmap("../images/brainstorms-elevator_forward.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) 
     1204                icon12.addPixmap(QtGui.QPixmap("images/brainstorms-elevator_forward.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) 
    12051205                self.pushButtonHelicopterElevatorForward.setIcon(icon12) 
    12061206                self.pushButtonHelicopterElevatorForward.setIconSize(QtCore.QSize(50, 80)) 
     
    12341234                self.pushButtonHelicopterElevatorReverse.setText("") 
    12351235                icon13 = QtGui.QIcon() 
    1236                 icon13.addPixmap(QtGui.QPixmap("../images/brainstorms-elevator_reverse.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) 
     1236                icon13.addPixmap(QtGui.QPixmap("images/brainstorms-elevator_reverse.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) 
    12371237                self.pushButtonHelicopterElevatorReverse.setIcon(icon13) 
    12381238                self.pushButtonHelicopterElevatorReverse.setIconSize(QtCore.QSize(45, 45)) 
     
    13061306                self.pushButtonHelicopterHover.setText("") 
    13071307                icon14 = QtGui.QIcon() 
    1308                 icon14.addPixmap(QtGui.QPixmap("../images/brainstorms-hover.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) 
     1308                icon14.addPixmap(QtGui.QPixmap("images/brainstorms-hover.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) 
    13091309                self.pushButtonHelicopterHover.setIcon(icon14) 
    13101310                self.pushButtonHelicopterHover.setIconSize(QtCore.QSize(40, 40)) 
     
    13171317                self.pushButtonHelicopterFlyForward.setText("") 
    13181318                icon15 = QtGui.QIcon() 
    1319                 icon15.addPixmap(QtGui.QPixmap("../images/brainstorms-fly_forward.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) 
     1319                icon15.addPixmap(QtGui.QPixmap("images/brainstorms-fly_forward.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) 
    13201320                self.pushButtonHelicopterFlyForward.setIcon(icon15) 
    13211321                self.pushButtonHelicopterFlyForward.setIconSize(QtCore.QSize(50, 50)) 
     
    13271327                self.pushButtonHelicopterLand.setText("") 
    13281328                icon16 = QtGui.QIcon() 
    1329                 icon16.addPixmap(QtGui.QPixmap("../images/brainstorms-land_arrow.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) 
     1329                icon16.addPixmap(QtGui.QPixmap("images/brainstorms-land_arrow.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) 
    13301330                self.pushButtonHelicopterLand.setIcon(icon16) 
    13311331                self.pushButtonHelicopterLand.setIconSize(QtCore.QSize(50, 50)) 
     
    15211521                self.labelLEGONXTConfiguration.setObjectName("labelLEGONXTConfiguration") 
    15221522                self.checkBoxMotorSpinReversed = QtGui.QCheckBox(self.tabControlPanel) 
     1523                self.checkBoxMotorSpinReversed.setEnabled(False) 
    15231524                self.checkBoxMotorSpinReversed.setGeometry(QtCore.QRect(580, 100, 171, 22)) 
    15241525                self.checkBoxMotorSpinReversed.setChecked(True) 
    15251526                self.checkBoxMotorSpinReversed.setObjectName("checkBoxMotorSpinReversed") 
     1527                self.labelLeftMotorPort = QtGui.QLabel(self.tabControlPanel) 
     1528                self.labelLeftMotorPort.setGeometry(QtCore.QRect(578, 39, 111, 21)) 
     1529                self.labelLeftMotorPort.setAlignment(QtCore.Qt.AlignJustify|QtCore.Qt.AlignVCenter) 
     1530                self.labelLeftMotorPort.setObjectName("labelLeftMotorPort") 
     1531                self.lineEditLeftMotorPort = QtGui.QLineEdit(self.tabControlPanel) 
     1532                self.lineEditLeftMotorPort.setEnabled(False) 
     1533                self.lineEditLeftMotorPort.setGeometry(QtCore.QRect(700, 35, 41, 27)) 
     1534                self.lineEditLeftMotorPort.setAlignment(QtCore.Qt.AlignCenter) 
     1535                self.lineEditLeftMotorPort.setObjectName("lineEditLeftMotorPort") 
    15261536                self.labelRightMotorPort = QtGui.QLabel(self.tabControlPanel) 
    1527                 self.labelRightMotorPort.setGeometry(QtCore.QRect(578, 39, 111, 21)) 
     1537                self.labelRightMotorPort.setGeometry(QtCore.QRect(578, 70, 111, 21)) 
    15281538                self.labelRightMotorPort.setAlignment(QtCore.Qt.AlignJustify|QtCore.Qt.AlignVCenter) 
    15291539                self.labelRightMotorPort.setObjectName("labelRightMotorPort") 
    15301540                self.lineEditRightMotorPort = QtGui.QLineEdit(self.tabControlPanel) 
    1531                 self.lineEditRightMotorPort.setEnabled(True) 
    1532                 self.lineEditRightMotorPort.setGeometry(QtCore.QRect(700, 35, 41, 27)) 
     1541                self.lineEditRightMotorPort.setEnabled(False) 
     1542                self.lineEditRightMotorPort.setGeometry(QtCore.QRect(700, 66, 41, 27)) 
    15331543                self.lineEditRightMotorPort.setAlignment(QtCore.Qt.AlignCenter) 
    15341544                self.lineEditRightMotorPort.setObjectName("lineEditRightMotorPort") 
    1535                 self.labelLeftMotorPort = QtGui.QLabel(self.tabControlPanel) 
    1536                 self.labelLeftMotorPort.setGeometry(QtCore.QRect(578, 70, 111, 21)) 
    1537                 self.labelLeftMotorPort.setAlignment(QtCore.Qt.AlignJustify|QtCore.Qt.AlignVCenter) 
    1538                 self.labelLeftMotorPort.setObjectName("labelLeftMotorPort") 
    1539                 self.lineEditLeftMotorPort = QtGui.QLineEdit(self.tabControlPanel) 
    1540                 self.lineEditLeftMotorPort.setEnabled(True) 
    1541                 self.lineEditLeftMotorPort.setGeometry(QtCore.QRect(700, 66, 41, 27)) 
    1542                 self.lineEditLeftMotorPort.setAlignment(QtCore.Qt.AlignCenter) 
    1543                 self.lineEditLeftMotorPort.setObjectName("lineEditLeftMotorPort") 
    15441545                self.lineEditThinkGearHost = QtGui.QLineEdit(self.tabControlPanel) 
    15451546                self.lineEditThinkGearHost.setGeometry(QtCore.QRect(51, 270, 121, 26)) 
     
    17701771                self.checkBoxMotorSpinReversed.setToolTip(QtGui.QApplication.translate("Form", "asdf", None, QtGui.QApplication.UnicodeUTF8)) 
    17711772                self.checkBoxMotorSpinReversed.setText(QtGui.QApplication.translate("Form", "Motor Spin Reversed", None, QtGui.QApplication.UnicodeUTF8)) 
     1773                self.labelLeftMotorPort.setText(QtGui.QApplication.translate("Form", "Left Motor Port", None, QtGui.QApplication.UnicodeUTF8)) 
     1774                self.lineEditLeftMotorPort.setText(QtGui.QApplication.translate("Form", "A", None, QtGui.QApplication.UnicodeUTF8)) 
    17721775                self.labelRightMotorPort.setText(QtGui.QApplication.translate("Form", "Right Motor Port", None, QtGui.QApplication.UnicodeUTF8)) 
    1773                 self.lineEditRightMotorPort.setText(QtGui.QApplication.translate("Form", "A", None, QtGui.QApplication.UnicodeUTF8)) 
    1774                 self.labelLeftMotorPort.setText(QtGui.QApplication.translate("Form", "Left Motor Port", None, QtGui.QApplication.UnicodeUTF8)) 
    1775                 self.lineEditLeftMotorPort.setText(QtGui.QApplication.translate("Form", "B", None, QtGui.QApplication.UnicodeUTF8)) 
     1776                self.lineEditRightMotorPort.setText(QtGui.QApplication.translate("Form", "B", None, QtGui.QApplication.UnicodeUTF8)) 
    17761777                self.lineEditThinkGearHost.setText(QtGui.QApplication.translate("Form", "N/A", None, QtGui.QApplication.UnicodeUTF8)) 
    17771778                self.textLabelThinkGearPort.setText(QtGui.QApplication.translate("Form", "<p align=\"center\">Port</p>", None, QtGui.QApplication.UnicodeUTF8)) 
Note: See TracChangeset for help on using the changeset viewer.