zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Adjustments to QGroundControl to suit small displays

QGC4.4
pixhawk 15 years ago
parent
ee7ae9ba92
commit
46a2a7cf79
9 changed files with 146 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 39
      images/style-mission.css
  2. 27
      src/ui/DebugConsole.ui
  3. 8
      src/ui/MainWindow.cc
  4. 4
      src/ui/ParameterInterface.ui
  5. 18
      src/ui/QGCSensorSettingsWidget.ui
  6. 76
      src/ui/UASControl.ui
  7. 11
      src/ui/UASInfo.ui
  8. 6
      src/ui/UASView.ui
  9. 2
      src/ui/linechart/LinechartWidget.cc

39
images/style-mission.css
Unescape View File

@ -77,10 +77,43 @@ border: 1px solid #777777;
color: #DDDDDF; color: #DDDDDF;
} }
QMainWindow::separator {
background: #090909;
width: 2px; /* when vertical */
height: 2px; /* when horizontal */
}
QMainWindow::separator:hover {
background: white;
}
QDockWidget { QDockWidget {
font: bold; border: 1px solid #32345E;
border: 1px solid #32345E; /* titlebar-close-icon: url(close.png);
} titlebar-normal-icon: url(undock.png);*/
}
QDockWidget::title {
text-align: left; /* align the text to the left */
background: lightgray;
padding-left: 5px;
}
QDockWidget::close-button, QDockWidget::float-button {
border: 1px solid transparent;
background: darkgray;
padding: 0px;
}
QDockWidget::close-button:hover, QDockWidget::float-button:hover {
background: gray;
}
QDockWidget::close-button:pressed, QDockWidget::float-button:pressed {
padding: 1px -1px -1px 1px;
}
QDockWidget::close-button, QDockWidget::float-button { QDockWidget::close-button, QDockWidget::float-button {
background-color: #181820; background-color: #181820;

27
src/ui/DebugConsole.ui
Unescape View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>435</width> <width>402</width>
<height>185</height> <height>185</height>
</rect> </rect>
</property> </property>
@ -77,14 +77,24 @@
<string>Enable auto hold to lower the CPU consumption</string> <string>Enable auto hold to lower the CPU consumption</string>
</property> </property>
<property name="text"> <property name="text">
<string>Auto hold</string> <string>Hold</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="1" column="0" colspan="2">
<widget class="QPlainTextEdit" name="receiveText"/> <widget class="QPlainTextEdit" name="receiveText">
<property name="minimumSize">
<size>
<width>300</width>
<height>50</height>
</size>
</property>
<property name="tabStopWidth">
<number>60</number>
</property>
</widget>
</item> </item>
<item row="2" column="0" colspan="2"> <item row="2" column="0" colspan="2">
<widget class="QLineEdit" name="sentText"> <widget class="QLineEdit" name="sentText">
@ -98,13 +108,22 @@
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLineEdit" name="sendText"> <widget class="QLineEdit" name="sendText">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Type the bytes to send here, use 0xAA format for HEX (Check HEX checkbox above)</string> <string>Type the bytes to send here, use 0xAA format for HEX (Check HEX checkbox above)</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout" stretch="10,10,10">
<property name="spacing">
<number>5</number>
</property>
<item> <item>
<widget class="QPushButton" name="transmitButton"> <widget class="QPushButton" name="transmitButton">
<property name="toolTip"> <property name="toolTip">

8
src/ui/MainWindow.cc
Unescape View File

@ -83,7 +83,7 @@ MainWindow::MainWindow(QWidget *parent) :
configureWindowName(); configureWindowName();
// Add status bar // Add status bar
setStatusBar(createStatusBar()); //setStatusBar(createStatusBar());
// Set the application style (not the same as a style sheet) // Set the application style (not the same as a style sheet)
// Set the style to Plastique // Set the style to Plastique
@ -131,7 +131,7 @@ void MainWindow::buildWidgets()
// Center widgets // Center widgets
linechartWidget = new Linecharts(this); linechartWidget = new Linecharts(this);
hudWidget = new HUD(640, 480, this); hudWidget = new HUD(320, 240, this);
mapWidget = new MapWidget(this); mapWidget = new MapWidget(this);
protocolWidget = new XMLCommProtocolWidget(this); protocolWidget = new XMLCommProtocolWidget(this);
dataplotWidget = new QGCDataPlot2D(this); dataplotWidget = new QGCDataPlot2D(this);
@ -340,12 +340,12 @@ void MainWindow::reloadStylesheet()
void MainWindow::showStatusMessage(const QString& status, int timeout) void MainWindow::showStatusMessage(const QString& status, int timeout)
{ {
statusBar->showMessage(status, timeout); //statusBar->showMessage(status, timeout);
} }
void MainWindow::showStatusMessage(const QString& status) void MainWindow::showStatusMessage(const QString& status)
{ {
statusBar->showMessage(status, 5); //statusBar->showMessage(status, 5);
} }
/** /**

4
src/ui/ParameterInterface.ui
Unescape View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>350</width> <width>335</width>
<height>545</height> <height>300</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">

18
src/ui/QGCSensorSettingsWidget.ui
Unescape View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>319</width> <width>231</width>
<height>221</height> <height>221</height>
</rect> </rect>
</property> </property>
@ -22,7 +22,7 @@
<property name="title"> <property name="title">
<string>Calibration Wizards</string> <string>Calibration Wizards</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout" columnstretch="5,5"> <layout class="QGridLayout" name="gridLayout" columnstretch="100,100">
<property name="leftMargin"> <property name="leftMargin">
<number>6</number> <number>6</number>
</property> </property>
@ -44,28 +44,28 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QPushButton" name="rcCalButton"> <widget class="QPushButton" name="rcCalButton">
<property name="text"> <property name="text">
<string>RC Calibration</string> <string>RC Cal.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QPushButton" name="magCalButton"> <widget class="QPushButton" name="magCalButton">
<property name="text"> <property name="text">
<string>Mag. Calibration</string> <string>Mag. Cal.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QPushButton" name="gyroCalButton"> <widget class="QPushButton" name="gyroCalButton">
<property name="text"> <property name="text">
<string>Gyro Calibration</string> <string>Gyro Cal.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QPushButton" name="pressureCalButton"> <widget class="QPushButton" name="pressureCalButton">
<property name="text"> <property name="text">
<string>Pressure Calibration</string> <string>Pressure Cal.</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -99,7 +99,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QCheckBox" name="sendRawCheckBox"> <widget class="QCheckBox" name="sendRawCheckBox">
<property name="text"> <property name="text">
<string>RAW Sensor Data</string> <string>RAW Sensors</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -113,14 +113,14 @@
<item row="4" column="0"> <item row="4" column="0">
<widget class="QCheckBox" name="sendPositionCheckBox"> <widget class="QCheckBox" name="sendPositionCheckBox">
<property name="text"> <property name="text">
<string>Position setpoint</string> <string>Position CTRL</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="5" column="0">
<widget class="QCheckBox" name="sendControllerCheckBox"> <widget class="QCheckBox" name="sendControllerCheckBox">
<property name="text"> <property name="text">
<string>Raw Controller</string> <string>Attitude CTRL</string>
</property> </property>
</widget> </widget>
</item> </item>

76
src/ui/UASControl.ui
Unescape View File

@ -6,44 +6,53 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>287</width> <width>210</width>
<height>354</height> <height>130</height>
</rect> </rect>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>280</width> <width>210</width>
<height>170</height> <height>130</height>
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout" rowminimumheight="10,20,0,10,10,10,300"> <layout class="QGridLayout" name="gridLayout" rowstretch="10,10,0,10,10,5,100" columnstretch="0,0,10,10,10,0">
<property name="leftMargin"> <property name="margin">
<number>6</number> <number>0</number>
</property>
<property name="topMargin">
<number>12</number>
</property> </property>
<property name="rightMargin"> <property name="spacing">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="1" colspan="4"> <item row="0" column="1" colspan="4">
<widget class="QLabel" name="controlStatusLabel"> <widget class="QLabel" name="controlStatusLabel">
<property name="minimumSize">
<size>
<width>50</width>
<height>20</height>
</size>
</property>
<property name="text"> <property name="text">
<string>UNCONNECTED</string> <string>UNCONNECTED</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
<property name="margin">
<number>0</number>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="1" colspan="4"> <item row="1" column="1" colspan="4">
<widget class="QPushButton" name="controlButton"> <widget class="QPushButton" name="controlButton">
<property name="minimumSize">
<size>
<width>0</width>
<height>12</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Activate Engine</string> <string>Activate Engine</string>
</property> </property>
@ -80,6 +89,12 @@
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="QPushButton" name="liftoffButton"> <widget class="QPushButton" name="liftoffButton">
<property name="minimumSize">
<size>
<width>80</width>
<height>12</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Liftoff</string> <string>Liftoff</string>
</property> </property>
@ -91,6 +106,12 @@
</item> </item>
<item row="3" column="2" colspan="2"> <item row="3" column="2" colspan="2">
<widget class="QPushButton" name="landButton"> <widget class="QPushButton" name="landButton">
<property name="minimumSize">
<size>
<width>80</width>
<height>12</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Land</string> <string>Land</string>
</property> </property>
@ -102,6 +123,12 @@
</item> </item>
<item row="3" column="4"> <item row="3" column="4">
<widget class="QPushButton" name="shutdownButton"> <widget class="QPushButton" name="shutdownButton">
<property name="minimumSize">
<size>
<width>80</width>
<height>12</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Halt</string> <string>Halt</string>
</property> </property>
@ -125,10 +152,23 @@
</spacer> </spacer>
</item> </item>
<item row="4" column="1" colspan="2"> <item row="4" column="1" colspan="2">
<widget class="QComboBox" name="modeComboBox"/> <widget class="QComboBox" name="modeComboBox">
<property name="minimumSize">
<size>
<width>0</width>
<height>12</height>
</size>
</property>
</widget>
</item> </item>
<item row="4" column="3" colspan="2"> <item row="4" column="3" colspan="2">
<widget class="QPushButton" name="setModeButton"> <widget class="QPushButton" name="setModeButton">
<property name="minimumSize">
<size>
<width>40</width>
<height>12</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Set Mode</string> <string>Set Mode</string>
</property> </property>
@ -140,6 +180,12 @@
</item> </item>
<item row="5" column="1" colspan="4"> <item row="5" column="1" colspan="4">
<widget class="QLabel" name="lastActionLabel"> <widget class="QLabel" name="lastActionLabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>12</height>
</size>
</property>
<property name="text"> <property name="text">
<string>No actions executed so far</string> <string>No actions executed so far</string>
</property> </property>

11
src/ui/UASInfo.ui
Unescape View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>455</width> <width>223</width>
<height>220</height> <height>138</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -16,9 +16,12 @@
<property name="styleSheet"> <property name="styleSheet">
<string notr="true"/> <string notr="true"/>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0,0,0,100" columnstretch="0,0,0,0,0,0,0">
<property name="margin"> <property name="margin">
<number>6</number> <number>3</number>
</property>
<property name="spacing">
<number>5</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">

6
src/ui/UASView.ui
Unescape View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>370</width> <width>335</width>
<height>120</height> <height>121</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -18,7 +18,7 @@
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>370</width> <width>335</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>

2
src/ui/linechart/LinechartWidget.cc
Unescape View File

@ -70,7 +70,7 @@ updateTimer(new QTimer())
{ {
// Add elements defined in Qt Designer // Add elements defined in Qt Designer
ui.setupUi(this); ui.setupUi(this);
this->setMinimumSize(600, 300); this->setMinimumSize(400, 250);
// Add and customize curve list elements (left side) // Add and customize curve list elements (left side)
curvesWidget = new QWidget(ui.curveListWidget); curvesWidget = new QWidget(ui.curveListWidget);

Write Preview
Loading…
Cancel
Save