rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

GCS-Added layouts to new wiz

Browse Source
This commit is contained in:
PT_Dreamer 2012-10-04 15:37:16 +01:00
parent 29111b3529
commit d9afd58ee2
15 changed files with 1376 additions and 1584 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.ui
View File

@ -13,15 +13,9 @@
<property name="windowTitle"> <property name="windowTitle">
<string>WizardPage</string> <string>WizardPage</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>20</x>
<y>20</y>
<width>550</width>
<height>261</height>
</rect>
</property>
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@ -38,6 +32,9 @@ p, li { white-space: pre-wrap; }
<property name="textFormat"> <property name="textFormat">
<enum>Qt::AutoText</enum> <enum>Qt::AutoText</enum>
</property> </property>
<property name="scaledContents">
<bool>true</bool>
</property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property> </property>
@ -45,71 +42,11 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
<widget class="QPushButton" name="connectButton"> </item>
<property name="geometry"> <item>
<rect> <layout class="QFormLayout" name="formLayout">
<x>460</x> <item row="1" column="0">
<y>350</y>
<width>100</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Connect</string>
</property>
</widget>
<widget class="QLabel" name="label_3">
<property name="geometry">
<rect>
<x>40</x>
<y>350</y>
<width>125</width>
<height>16</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Detected board type:</string>
</property>
</widget>
<widget class="QComboBox" name="boardTypeCombo">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry">
<rect>
<x>170</x>
<y>350</y>
<width>279</width>
<height>22</height>
</rect>
</property>
</widget>
<widget class="QComboBox" name="deviceCombo">
<property name="geometry">
<rect>
<x>170</x>
<y>310</y>
<width>279</width>
<height>22</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="geometry">
<rect>
<x>40</x>
<y>310</y>
<width>121</width>
<height>16</height>
</rect>
</property>
<property name="font"> <property name="font">
<font> <font>
<pointsize>10</pointsize> <pointsize>10</pointsize>
@ -121,6 +58,64 @@ p, li { white-space: pre-wrap; }
<string>Connection device:</string> <string>Connection device:</string>
</property> </property>
</widget> </widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="deviceCombo"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Detected board type:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="boardTypeCombo">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="connectButton">
<property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>Connect</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections/>

26
ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.ui
View File

@ -19,15 +19,9 @@
<property name="windowTitle"> <property name="windowTitle">
<string>WizardPage</string> <string>WizardPage</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="geometry">
<rect>
<x>20</x>
<y>20</y>
<width>550</width>
<height>251</height>
</rect>
</property>
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@ -48,15 +42,11 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QToolButton" name="inputWizardButton"> <widget class="QToolButton" name="inputWizardButton">
<property name="geometry">
<rect>
<x>200</x>
<y>270</y>
<width>200</width>
<height>100</height>
</rect>
</property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QToolButton { border: none }</string> <string notr="true">QToolButton { border: none }</string>
</property> </property>
@ -80,6 +70,10 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item>
</layout>
</item>
</layout>
</widget> </widget>
<resources> <resources>
<include location="../wizardResources.qrc"/> <include location="../wizardResources.qrc"/>

14
ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.ui
View File

@ -13,15 +13,9 @@
<property name="windowTitle"> <property name="windowTitle">
<string>WizardPage</string> <string>WizardPage</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="geometry">
<rect>
<x>50</x>
<y>160</y>
<width>500</width>
<height>41</height>
</rect>
</property>
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@ -31,12 +25,14 @@ p, li { white-space: pre-wrap; }
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignHCenter|Qt::AlignTop</set> <set>Qt::AlignCenter</set>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item>
</layout>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections/>

135
ground/openpilotgcs/src/plugins/setupwizard/pages/inputpage.ui
View File

@ -13,14 +13,11 @@
<property name="windowTitle"> <property name="windowTitle">
<string>WizardPage</string> <string>WizardPage</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="geometry"> <property name="frameShape">
<rect> <enum>QFrame::NoFrame</enum>
<x>20</x>
<y>20</y>
<width>541</width>
<height>221</height>
</rect>
</property> </property>
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
@ -40,62 +37,11 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
<widget class="QToolButton" name="spectrumButton"> </item>
<property name="geometry"> <item>
<rect> <layout class="QHBoxLayout" name="horizontalLayout">
<x>430</x> <item>
<y>250</y>
<width>100</width>
<height>120</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="toolTip">
<string>Spectrum Satellite</string>
</property>
<property name="styleSheet">
<string notr="true">QToolButton { border: none }</string>
</property>
<property name="text">
<string>Spectrum</string>
</property>
<property name="icon">
<iconset resource="../wizardResources.qrc">
<normaloff>:/setupwizard/resources/bttn-sat-up.png</normaloff>
<normalon>:/setupwizard/resources/bttn-sat-down.png</normalon>:/setupwizard/resources/bttn-sat-up.png</iconset>
</property>
<property name="iconSize">
<size>
<width>100</width>
<height>100</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="autoExclusive">
<bool>true</bool>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextUnderIcon</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
<widget class="QToolButton" name="pwmButton"> <widget class="QToolButton" name="pwmButton">
<property name="geometry">
<rect>
<x>70</x>
<y>250</y>
<width>100</width>
<height>120</height>
</rect>
</property>
<property name="font"> <property name="font">
<font> <font>
<pointsize>10</pointsize> <pointsize>10</pointsize>
@ -137,15 +83,9 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item>
<item>
<widget class="QToolButton" name="ppmButton"> <widget class="QToolButton" name="ppmButton">
<property name="geometry">
<rect>
<x>190</x>
<y>250</y>
<width>100</width>
<height>120</height>
</rect>
</property>
<property name="font"> <property name="font">
<font> <font>
<pointsize>10</pointsize> <pointsize>10</pointsize>
@ -184,15 +124,9 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item>
<item>
<widget class="QToolButton" name="sbusButton"> <widget class="QToolButton" name="sbusButton">
<property name="geometry">
<rect>
<x>310</x>
<y>250</y>
<width>100</width>
<height>120</height>
</rect>
</property>
<property name="font"> <property name="font">
<font> <font>
<pointsize>10</pointsize> <pointsize>10</pointsize>
@ -231,6 +165,51 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item>
<item>
<widget class="QToolButton" name="spectrumButton">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="toolTip">
<string>Spectrum Satellite</string>
</property>
<property name="styleSheet">
<string notr="true">QToolButton { border: none }</string>
</property>
<property name="text">
<string>Spectrum</string>
</property>
<property name="icon">
<iconset resource="../wizardResources.qrc">
<normaloff>:/setupwizard/resources/bttn-sat-up.png</normaloff>
<normalon>:/setupwizard/resources/bttn-sat-down.png</normalon>:/setupwizard/resources/bttn-sat-up.png</iconset>
</property>
<property name="iconSize">
<size>
<width>100</width>
<height>100</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="autoExclusive">
<bool>true</bool>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextUnderIcon</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget> </widget>
<resources> <resources>
<include location="../wizardResources.qrc"/> <include location="../wizardResources.qrc"/>

74
ground/openpilotgcs/src/plugins/setupwizard/pages/levellingpage.ui
View File

@ -13,15 +13,9 @@
<property name="windowTitle"> <property name="windowTitle">
<string>WizardPage</string> <string>WizardPage</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>20</x>
<y>20</y>
<width>541</width>
<height>241</height>
</rect>
</property>
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@ -40,15 +34,11 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QToolButton" name="levelButton"> <widget class="QToolButton" name="levelButton">
<property name="geometry">
<rect>
<x>200</x>
<y>260</y>
<width>200</width>
<height>70</height>
</rect>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Calculate gyro and accelerometer bias</string> <string>Calculate gyro and accelerometer bias</string>
</property> </property>
@ -70,15 +60,20 @@ p, li { white-space: pre-wrap; }
</size> </size>
</property> </property>
</widget> </widget>
<widget class="QProgressBar" name="levellinProgressBar"> </item>
<property name="geometry"> </layout>
<rect> </item>
<x>40</x> <item>
<y>350</y> <widget class="QLabel" name="progressLabel">
<width>520</width> <property name="text">
<height>23</height> <string/>
</rect>
</property> </property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QProgressBar" name="levellinProgressBar">
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QProgressBar { <string notr="true">QProgressBar {
border: 2px solid grey; border: 2px solid grey;
@ -98,24 +93,23 @@ QProgressBar::chunk {
<string/> <string/>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="progressLabel"> </item>
<property name="geometry"> </layout>
<rect> </item>
<x>42</x> <item>
<y>330</y> <spacer name="verticalSpacer">
<width>511</width> <property name="orientation">
<height>16</height> <enum>Qt::Vertical</enum>
</rect>
</property> </property>
<property name="font"> <property name="sizeHint" stdset="0">
<font> <size>
<pointsize>10</pointsize> <width>20</width>
</font> <height>40</height>
</size>
</property> </property>
<property name="text"> </spacer>
<string/> </item>
</property> </layout>
</widget>
</widget> </widget>
<resources> <resources>
<include location="../wizardResources.qrc"/> <include location="../wizardResources.qrc"/>

2
ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp
View File

@ -48,6 +48,8 @@ MultiPage::MultiPage(SetupWizard *wizard, QWidget *parent) :
// Default to Quad X since it is the most common setup // Default to Quad X since it is the most common setup
ui->typeCombo->setCurrentIndex(1); ui->typeCombo->setCurrentIndex(1);
connect(ui->typeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(updateImageAndDescription())); connect(ui->typeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(updateImageAndDescription()));
ui->typeGraphicsView->setSceneRect(multiPic->boundingRect());
ui->typeGraphicsView->fitInView(multiPic, Qt::KeepAspectRatio);
} }
MultiPage::~MultiPage() MultiPage::~MultiPage()

123
ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.ui
View File

@ -13,15 +13,9 @@
<property name="windowTitle"> <property name="windowTitle">
<string>WizardPage</string> <string>WizardPage</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>20</x>
<y>20</y>
<width>541</width>
<height>151</height>
</rect>
</property>
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@ -40,23 +34,63 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
<widget class="QGraphicsView" name="typeGraphicsView"> </item>
<property name="geometry"> <item>
<rect> <layout class="QHBoxLayout" name="horizontalLayout">
<x>390</x> <item>
<y>200</y> <layout class="QVBoxLayout" name="verticalLayout_2">
<width>170</width> <item>
<height>170</height> <layout class="QHBoxLayout" name="horizontalLayout_2">
</rect> <item>
<widget class="QLabel" name="label_2">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property> </property>
<property name="text">
<string>Multirotor type:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="typeCombo"/>
</item>
</layout>
</item>
<item>
<widget class="QTextEdit" name="typeDescription">
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOn</enum>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QGraphicsView" name="typeGraphicsView">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum"> <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize">
<size>
<width>200</width>
<height>200</height>
</size>
</property>
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>false</bool> <bool>true</bool>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
@ -95,55 +129,10 @@ p, li { white-space: pre-wrap; }
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_2"> </item>
<property name="geometry"> </layout>
<rect> </item>
<x>40</x> </layout>
<y>200</y>
<width>90</width>
<height>16</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Multirotor type:</string>
</property>
</widget>
<widget class="QComboBox" name="typeCombo">
<property name="geometry">
<rect>
<x>140</x>
<y>198</y>
<width>230</width>
<height>22</height>
</rect>
</property>
</widget>
<widget class="QTextEdit" name="typeDescription">
<property name="geometry">
<rect>
<x>40</x>
<y>240</y>
<width>330</width>
<height>130</height>
</rect>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOn</enum>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections/>

262
ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.ui
View File

@ -13,41 +13,33 @@
<property name="windowTitle"> <property name="windowTitle">
<string>WizardPage</string> <string>WizardPage</string>
</property> </property>
<widget class="QGraphicsView" name="vehicleView"> <layout class="QGridLayout" name="gridLayout">
<property name="geometry"> <item row="0" column="0">
<rect> <widget class="QLabel" name="label_2">
<x>310</x> <property name="font">
<y>40</y> <font>
<width>270</width> <pointsize>12</pointsize>
<height>341</height> <weight>75</weight>
</rect> <bold>true</bold>
</font>
</property> </property>
<property name="frameShape"> <property name="text">
<enum>QFrame::NoFrame</enum> <string>Output calibration</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item>
<item row="1" column="0">
<widget class="QStackedWidget" name="calibrationStack"> <widget class="QStackedWidget" name="calibrationStack">
<property name="geometry">
<rect>
<x>20</x>
<y>40</y>
<width>290</width>
<height>341</height>
</rect>
</property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="intro"> <widget class="QWidget" name="intro">
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="geometry">
<rect>
<x>0</x>
<y>10</y>
<width>270</width>
<height>321</height>
</rect>
</property>
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@ -66,17 +58,13 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item>
</layout>
</widget> </widget>
<widget class="QWidget" name="motorNeutral"> <widget class="QWidget" name="motorNeutral">
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="geometry">
<rect>
<x>0</x>
<y>10</y>
<width>261</width>
<height>221</height>
</rect>
</property>
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;In this step we will set the neutral rate for the motor highlighted in the illustration to the right. &lt;br/&gt;Plase pay attention to the details and in particular the motors position and its rotation direction.&lt;/p&gt;&lt;p&gt;To find the neutral rate for this engine, press the Start button below and slide the slider to the right until the engine just starts to spin stably. &lt;br/&gt;&lt;br/&gt;When done press button again to stop.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;In this step we will set the neutral rate for the motor highlighted in the illustration to the right. &lt;br/&gt;Plase pay attention to the details and in particular the motors position and its rotation direction.&lt;/p&gt;&lt;p&gt;To find the neutral rate for this engine, press the Start button below and slide the slider to the right until the engine just starts to spin stably. &lt;br/&gt;&lt;br/&gt;When done press button again to stop.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
@ -87,18 +75,12 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item>
<item>
<widget class="QSlider" name="motorNeutralSlider"> <widget class="QSlider" name="motorNeutralSlider">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="geometry">
<rect>
<x>10</x>
<y>250</y>
<width>241</width>
<height>19</height>
</rect>
</property>
<property name="minimum"> <property name="minimum">
<number>1000</number> <number>1000</number>
</property> </property>
@ -124,15 +106,9 @@ p, li { white-space: pre-wrap; }
<number>20</number> <number>20</number>
</property> </property>
</widget> </widget>
</item>
<item>
<widget class="QPushButton" name="motorNeutralButton"> <widget class="QPushButton" name="motorNeutralButton">
<property name="geometry">
<rect>
<x>90</x>
<y>290</y>
<width>75</width>
<height>23</height>
</rect>
</property>
<property name="text"> <property name="text">
<string>Start</string> <string>Start</string>
</property> </property>
@ -143,17 +119,13 @@ p, li { white-space: pre-wrap; }
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item>
</layout>
</widget> </widget>
<widget class="QWidget" name="servoNeutral"> <widget class="QWidget" name="servoNeutral">
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="geometry">
<rect>
<x>0</x>
<y>10</y>
<width>261</width>
<height>201</height>
</rect>
</property>
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This step calibrates the center position of the servo. To set the center position for this servo, press the Start button below and slide the slider to center the servo. &lt;/p&gt;&lt;p&gt;When done press button again to stop.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This step calibrates the center position of the servo. To set the center position for this servo, press the Start button below and slide the slider to center the servo. &lt;/p&gt;&lt;p&gt;When done press button again to stop.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
@ -164,18 +136,12 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item>
<item>
<widget class="QSlider" name="servoCenterSlider"> <widget class="QSlider" name="servoCenterSlider">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="geometry">
<rect>
<x>10</x>
<y>250</y>
<width>241</width>
<height>19</height>
</rect>
</property>
<property name="minimum"> <property name="minimum">
<number>1000</number> <number>1000</number>
</property> </property>
@ -210,15 +176,9 @@ p, li { white-space: pre-wrap; }
<number>40</number> <number>40</number>
</property> </property>
</widget> </widget>
</item>
<item>
<widget class="QPushButton" name="servoCenterButton"> <widget class="QPushButton" name="servoCenterButton">
<property name="geometry">
<rect>
<x>90</x>
<y>290</y>
<width>75</width>
<height>23</height>
</rect>
</property>
<property name="text"> <property name="text">
<string>Start</string> <string>Start</string>
</property> </property>
@ -229,36 +189,13 @@ p, li { white-space: pre-wrap; }
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item>
</layout>
</widget> </widget>
<widget class="QWidget" name="servoMinMax"> <widget class="QWidget" name="servoMinMax">
<widget class="QPushButton" name="servoMinAngleButton"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="geometry"> <item>
<rect>
<x>90</x>
<y>290</y>
<width>75</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Start</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
<widget class="QLabel" name="label_7"> <widget class="QLabel" name="label_7">
<property name="geometry">
<rect>
<x>0</x>
<y>10</y>
<width>261</width>
<height>211</height>
</rect>
</property>
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;To save the servo and other hardware from damage we have to set the max and min angles for the servo. &lt;/p&gt;&lt;p&gt;To set the minimum angle for the servo, press the Start button below and select the top slider and slide it to the left until min angle is reached.&lt;/p&gt;&lt;p&gt;When done press button again to stop.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;To save the servo and other hardware from damage we have to set the max and min angles for the servo. &lt;/p&gt;&lt;p&gt;To set the minimum angle for the servo, press the Start button below and select the top slider and slide it to the left until min angle is reached.&lt;/p&gt;&lt;p&gt;When done press button again to stop.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
@ -269,18 +206,12 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item>
<item>
<widget class="QSlider" name="servoMinAngleSlider"> <widget class="QSlider" name="servoMinAngleSlider">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="geometry">
<rect>
<x>10</x>
<y>250</y>
<width>241</width>
<height>20</height>
</rect>
</property>
<property name="minimum"> <property name="minimum">
<number>1000</number> <number>1000</number>
</property> </property>
@ -315,17 +246,9 @@ p, li { white-space: pre-wrap; }
<number>40</number> <number>40</number>
</property> </property>
</widget> </widget>
</widget> </item>
<widget class="QWidget" name="page"> <item>
<widget class="QPushButton" name="servoMaxAngleButton"> <widget class="QPushButton" name="servoMinAngleButton">
<property name="geometry">
<rect>
<x>90</x>
<y>290</y>
<width>75</width>
<height>23</height>
</rect>
</property>
<property name="text"> <property name="text">
<string>Start</string> <string>Start</string>
</property> </property>
@ -336,18 +259,29 @@ p, li { white-space: pre-wrap; }
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="page">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="label_8">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;To set the maximum angle for the servo, press the Start button below and select the top slider and slide it to the right until max angle is reached.&lt;/p&gt;&lt;p&gt;When done press button again to stop.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QSlider" name="servoMaxAngleSlider"> <widget class="QSlider" name="servoMaxAngleSlider">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="geometry">
<rect>
<x>10</x>
<y>250</y>
<width>241</width>
<height>20</height>
</rect>
</property>
<property name="minimum"> <property name="minimum">
<number>1500</number> <number>1500</number>
</property> </property>
@ -382,50 +316,44 @@ p, li { white-space: pre-wrap; }
<number>40</number> <number>40</number>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_8"> </item>
<property name="geometry"> <item>
<rect> <widget class="QPushButton" name="servoMaxAngleButton">
<x>0</x>
<y>10</y>
<width>261</width>
<height>211</height>
</rect>
</property>
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;To set the maximum angle for the servo, press the Start button below and select the top slider and slide it to the right until max angle is reached.&lt;/p&gt;&lt;p&gt;When done press button again to stop.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>Start</string>
</property> </property>
<property name="alignment"> <property name="checkable">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> <property name="checked">
</widget> <bool>false</bool>
</widget>
<widget class="QLabel" name="label_2">
<property name="geometry">
<rect>
<x>20</x>
<y>20</y>
<width>531</width>
<height>16</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Output calibration</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item>
</layout>
</widget>
</widget>
</item>
<item row="1" column="1">
<widget class="QGraphicsView" name="vehicleView">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>200</width>
<height>200</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
</widget>
</item>
</layout>
</widget> </widget>
<resources/> <resources/>
<connections> <connections>

120
ground/openpilotgcs/src/plugins/setupwizard/pages/outputpage.ui
View File

@ -13,15 +13,9 @@
<property name="windowTitle"> <property name="windowTitle">
<string>WizardPage</string> <string>WizardPage</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>20</x>
<y>20</y>
<width>541</width>
<height>151</height>
</rect>
</property>
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@ -42,65 +36,11 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
<widget class="QToolButton" name="rapidESCButton"> </item>
<property name="geometry"> <item>
<rect> <layout class="QHBoxLayout" name="horizontalLayout">
<x>320</x> <item>
<y>250</y>
<width>200</width>
<height>120</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="toolTip">
<string>Turbo PWM ESC 400Hz</string>
</property>
<property name="styleSheet">
<string notr="true">QToolButton { border: none }</string>
</property>
<property name="text">
<string>Turbo PWM</string>
</property>
<property name="icon">
<iconset resource="../wizardResources.qrc">
<normaloff>:/setupwizard/resources/bttn-turbo-up.png</normaloff>
<normalon>:/setupwizard/resources/bttn-turbo-down.png</normalon>:/setupwizard/resources/bttn-turbo-up.png</iconset>
</property>
<property name="iconSize">
<size>
<width>200</width>
<height>100</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="autoExclusive">
<bool>true</bool>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextUnderIcon</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
<widget class="QToolButton" name="defaultESCButton"> <widget class="QToolButton" name="defaultESCButton">
<property name="geometry">
<rect>
<x>80</x>
<y>250</y>
<width>200</width>
<height>120</height>
</rect>
</property>
<property name="font"> <property name="font">
<font> <font>
<pointsize>10</pointsize> <pointsize>10</pointsize>
@ -142,6 +82,54 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item>
<item>
<widget class="QToolButton" name="rapidESCButton">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="toolTip">
<string>Turbo PWM ESC 400Hz</string>
</property>
<property name="styleSheet">
<string notr="true">QToolButton { border: none }</string>
</property>
<property name="text">
<string>Turbo PWM</string>
</property>
<property name="icon">
<iconset resource="../wizardResources.qrc">
<normaloff>:/setupwizard/resources/bttn-turbo-up.png</normaloff>
<normalon>:/setupwizard/resources/bttn-turbo-down.png</normalon>:/setupwizard/resources/bttn-turbo-up.png</iconset>
</property>
<property name="iconSize">
<size>
<width>200</width>
<height>100</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="autoExclusive">
<bool>true</bool>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextUnderIcon</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget> </widget>
<resources> <resources>
<include location="../wizardResources.qrc"/> <include location="../wizardResources.qrc"/>

62
ground/openpilotgcs/src/plugins/setupwizard/pages/rebootpage.ui
View File

@ -13,15 +13,9 @@
<property name="windowTitle"> <property name="windowTitle">
<string>WizardPage</string> <string>WizardPage</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="redLabel"> <widget class="QLabel" name="redLabel">
<property name="geometry">
<rect>
<x>50</x>
<y>130</y>
<width>501</width>
<height>41</height>
</rect>
</property>
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@ -36,38 +30,9 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_3"> </item>
<property name="geometry"> <item>
<rect>
<x>50</x>
<y>180</y>
<width>501</width>
<height>151</height>
</rect>
</property>
<property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#000000;&quot;&gt;The configuration created by the wizard contains settings that require a reboot of your controller. Please power cycle the controller before continuing. To power cycle the controller remove all batteries and the USB cable for at least 30 seconds. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="yellowLabel"> <widget class="QLabel" name="yellowLabel">
<property name="geometry">
<rect>
<x>50</x>
<y>130</y>
<width>501</width>
<height>41</height>
</rect>
</property>
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@ -82,6 +47,25 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item>
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#000000;&quot;&gt;The configuration created by the wizard contains settings that require a reboot of your controller. Please power cycle the controller before continuing. To power cycle the controller remove all batteries and the USB cable for at least 30 seconds. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
<zorder>yellowLabel</zorder> <zorder>yellowLabel</zorder>
<zorder>redLabel</zorder> <zorder>redLabel</zorder>
<zorder>label_3</zorder> <zorder>label_3</zorder>

46
ground/openpilotgcs/src/plugins/setupwizard/pages/savepage.ui
View File

@ -13,15 +13,9 @@
<property name="windowTitle"> <property name="windowTitle">
<string>WizardPage</string> <string>WizardPage</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>20</x>
<y>20</y>
<width>541</width>
<height>231</height>
</rect>
</property>
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@ -45,15 +39,11 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QToolButton" name="saveButton"> <widget class="QToolButton" name="saveButton">
<property name="geometry">
<rect>
<x>225</x>
<y>260</y>
<width>150</width>
<height>70</height>
</rect>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Write configuration to controller</string> <string>Write configuration to controller</string>
</property> </property>
@ -78,15 +68,11 @@ p, li { white-space: pre-wrap; }
<enum>Qt::ToolButtonIconOnly</enum> <enum>Qt::ToolButtonIconOnly</enum>
</property> </property>
</widget> </widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="saveProgressLabel"> <widget class="QLabel" name="saveProgressLabel">
<property name="geometry">
<rect>
<x>42</x>
<y>330</y>
<width>441</width>
<height>16</height>
</rect>
</property>
<property name="font"> <property name="font">
<font> <font>
<pointsize>10</pointsize> <pointsize>10</pointsize>
@ -96,15 +82,9 @@ p, li { white-space: pre-wrap; }
<string>Ready...</string> <string>Ready...</string>
</property> </property>
</widget> </widget>
</item>
<item>
<widget class="QProgressBar" name="saveProgressBar"> <widget class="QProgressBar" name="saveProgressBar">
<property name="geometry">
<rect>
<x>40</x>
<y>350</y>
<width>520</width>
<height>23</height>
</rect>
</property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QProgressBar { <string notr="true">QProgressBar {
border: 2px solid grey; border: 2px solid grey;
@ -124,6 +104,8 @@ QProgressBar::chunk {
<string/> <string/>
</property> </property>
</widget> </widget>
</item>
</layout>
</widget> </widget>
<resources> <resources>
<include location="../wizardResources.qrc"/> <include location="../wizardResources.qrc"/>

1
ground/openpilotgcs/src/plugins/setupwizard/pages/startpage.cpp
View File

@ -32,6 +32,7 @@ StartPage::StartPage(SetupWizard *wizard, QWidget *parent) :
ui(new Ui::StartPage) ui(new Ui::StartPage)
{ {
ui->setupUi(this); ui->setupUi(this);
setFont(QFont("Ubuntu",2));
} }
StartPage::~StartPage() StartPage::~StartPage()

12
ground/openpilotgcs/src/plugins/setupwizard/pages/startpage.ui
View File

@ -19,15 +19,9 @@
<property name="windowTitle"> <property name="windowTitle">
<string>WizardPage</string> <string>WizardPage</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="geometry">
<rect>
<x>20</x>
<y>20</y>
<width>581</width>
<height>350</height>
</rect>
</property>
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@ -53,6 +47,8 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item>
</layout>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections/>

36
ground/openpilotgcs/src/plugins/setupwizard/pages/summarypage.ui
View File

@ -13,15 +13,9 @@
<property name="windowTitle"> <property name="windowTitle">
<string>WizardPage</string> <string>WizardPage</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>20</x>
<y>20</y>
<width>541</width>
<height>241</height>
</rect>
</property>
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@ -43,15 +37,11 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QToolButton" name="illustrationButton"> <widget class="QToolButton" name="illustrationButton">
<property name="geometry">
<rect>
<x>460</x>
<y>271</y>
<width>100</width>
<height>100</height>
</rect>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Show connection diagram for configuration</string> <string>Show connection diagram for configuration</string>
</property> </property>
@ -85,15 +75,9 @@ p, li { white-space: pre-wrap; }
<enum>Qt::ToolButtonIconOnly</enum> <enum>Qt::ToolButtonIconOnly</enum>
</property> </property>
</widget> </widget>
</item>
<item>
<widget class="QTextEdit" name="configurationSummary"> <widget class="QTextEdit" name="configurationSummary">
<property name="geometry">
<rect>
<x>20</x>
<y>270</y>
<width>400</width>
<height>100</height>
</rect>
</property>
<property name="font"> <property name="font">
<font> <font>
<pointsize>10</pointsize> <pointsize>10</pointsize>
@ -109,6 +93,10 @@ p, li { white-space: pre-wrap; }
<set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property> </property>
</widget> </widget>
</item>
</layout>
</item>
</layout>
</widget> </widget>
<resources> <resources>
<include location="../wizardResources.qrc"/> <include location="../wizardResources.qrc"/>

148
ground/openpilotgcs/src/plugins/setupwizard/pages/vehiclepage.ui
View File

@ -13,15 +13,9 @@
<property name="windowTitle"> <property name="windowTitle">
<string>WizardPage</string> <string>WizardPage</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="geometry">
<rect>
<x>20</x>
<y>20</y>
<width>550</width>
<height>221</height>
</rect>
</property>
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@ -42,65 +36,11 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
<widget class="QToolButton" name="surfaceButton"> </item>
<property name="enabled"> <item>
<bool>false</bool> <layout class="QHBoxLayout" name="horizontalLayout">
</property> <item>
<property name="geometry">
<rect>
<x>430</x>
<y>250</y>
<width>100</width>
<height>120</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="toolTip">
<string>Car, Boat, U-Boat</string>
</property>
<property name="styleSheet">
<string notr="true">QToolButton { border: none }</string>
</property>
<property name="text">
<string>Surface</string>
</property>
<property name="icon">
<iconset resource="../wizardResources.qrc">
<normaloff>:/setupwizard/resources/bttn-land-up.png</normaloff>
<normalon>:/setupwizard/resources/bttn-land-down.png</normalon>:/setupwizard/resources/bttn-land-up.png</iconset>
</property>
<property name="iconSize">
<size>
<width>100</width>
<height>100</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="autoExclusive">
<bool>true</bool>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextUnderIcon</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
<widget class="QToolButton" name="multirotorButton"> <widget class="QToolButton" name="multirotorButton">
<property name="geometry">
<rect>
<x>70</x>
<y>250</y>
<width>100</width>
<height>120</height>
</rect>
</property>
<property name="font"> <property name="font">
<font> <font>
<pointsize>10</pointsize> <pointsize>10</pointsize>
@ -145,17 +85,55 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
<widget class="QToolButton" name="fixedwingButton"> </item>
<item>
<widget class="QToolButton" name="heliButton">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="geometry"> <property name="font">
<rect> <font>
<x>190</x> <pointsize>10</pointsize>
<y>250</y> </font>
</property>
<property name="toolTip">
<string>CCPM Helicopters</string>
</property>
<property name="styleSheet">
<string notr="true">QToolButton { border: none }</string>
</property>
<property name="text">
<string>Helicopter</string>
</property>
<property name="icon">
<iconset resource="../wizardResources.qrc">
<normaloff>:/setupwizard/resources/bttn-heli-up.png</normaloff>
<normalon>:/setupwizard/resources/bttn-heli-down.png</normalon>:/setupwizard/resources/bttn-heli-up.png</iconset>
</property>
<property name="iconSize">
<size>
<width>100</width> <width>100</width>
<height>120</height> <height>100</height>
</rect> </size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="autoExclusive">
<bool>true</bool>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextUnderIcon</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="fixedwingButton">
<property name="enabled">
<bool>false</bool>
</property> </property>
<property name="font"> <property name="font">
<font> <font>
@ -198,36 +176,30 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
<widget class="QToolButton" name="heliButton"> </item>
<item>
<widget class="QToolButton" name="surfaceButton">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="geometry">
<rect>
<x>310</x>
<y>250</y>
<width>100</width>
<height>120</height>
</rect>
</property>
<property name="font"> <property name="font">
<font> <font>
<pointsize>10</pointsize> <pointsize>10</pointsize>
</font> </font>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>CCPM Helicopters</string> <string>Car, Boat, U-Boat</string>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QToolButton { border: none }</string> <string notr="true">QToolButton { border: none }</string>
</property> </property>
<property name="text"> <property name="text">
<string>Helicopter</string> <string>Surface</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../wizardResources.qrc"> <iconset resource="../wizardResources.qrc">
<normaloff>:/setupwizard/resources/bttn-heli-up.png</normaloff> <normaloff>:/setupwizard/resources/bttn-land-up.png</normaloff>
<normalon>:/setupwizard/resources/bttn-heli-down.png</normalon>:/setupwizard/resources/bttn-heli-up.png</iconset> <normalon>:/setupwizard/resources/bttn-land-down.png</normalon>:/setupwizard/resources/bttn-land-up.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
<size> <size>
@ -248,6 +220,10 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item>
</layout>
</item>
</layout>
</widget> </widget>
<resources> <resources>
<include location="../wizardResources.qrc"/> <include location="../wizardResources.qrc"/>