rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-26 15:54:15 +01:00
Code Issues Releases Activity

LP-559 Update Revo HW tab with vector picture

Browse Source
This commit is contained in:
Laurent Lalanne 2017-11-11 19:00:26 +01:00
parent ff3a1bd630
commit acfa6cc197
2 changed files with 104 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ground/gcs/src/plugins/config/configrevohwwidget.cpp
View File

@ -38,6 +38,11 @@ ConfigRevoHWWidget::ConfigRevoHWWidget(QWidget *parent) : ConfigTaskWidget(paren
m_ui = new Ui_RevoHWWidget(); m_ui = new Ui_RevoHWWidget();
m_ui->setupUi(this); m_ui->setupUi(this);
m_ui->boardImg->load(QString(":/configgadget/images/revolution.svg"));
QSize picSize = m_ui->boardImg->sizeHint();
picSize.scale(360, 360, Qt::KeepAspectRatio);
m_ui->boardImg->setFixedSize(picSize);
// must be done before auto binding ! // must be done before auto binding !
setWikiURL("Revolution+Configuration"); setWikiURL("Revolution+Configuration");

235
ground/gcs/src/plugins/config/configrevohwwidget.ui
View File

@ -233,23 +233,6 @@
</item> </item>
<item row="2" column="2"> <item row="2" column="2">
<layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"> <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0">
<item row="15" column="3">
<layout class="QVBoxLayout" name="verticalLayout_6">
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QComboBox" name="cbMainTelemSpeed">
<property name="enabled">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cbMainGPSSpeed"/>
</item>
</layout>
</item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QComboBox" name="cbRcvr"/> <widget class="QComboBox" name="cbRcvr"/>
</item> </item>
@ -269,16 +252,6 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="14" column="3" alignment="Qt::AlignHCenter">
<widget class="QLabel" name="lblMainSpeed">
<property name="text">
<string>Speed</string>
</property>
<property name="alignment">
<set>Qt::AlignBottom|Qt::AlignHCenter</set>
</property>
</widget>
</item>
<item row="8" column="5"> <item row="8" column="5">
<spacer name="verticalSpacer_7"> <spacer name="verticalSpacer_7">
<property name="orientation"> <property name="orientation">
@ -319,6 +292,9 @@
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>80</width> <width>80</width>
@ -359,9 +335,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="3">
<widget class="QComboBox" name="cbMain"/>
</item>
<item row="5" column="5" alignment="Qt::AlignHCenter"> <item row="5" column="5" alignment="Qt::AlignHCenter">
<widget class="QLabel" name="label_9"> <widget class="QLabel" name="label_9">
<property name="sizePolicy"> <property name="sizePolicy">
@ -427,9 +400,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="17" column="3">
<widget class="QComboBox" name="cbMainGPSProtocol"/>
</item>
<item row="9" column="5"> <item row="9" column="5">
<spacer name="verticalSpacer_5"> <spacer name="verticalSpacer_5">
<property name="orientation"> <property name="orientation">
@ -446,22 +416,6 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="18" column="3">
<spacer name="horizontalSpacer_9">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>120</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item row="7" column="5"> <item row="7" column="5">
<spacer name="verticalSpacer_8"> <spacer name="verticalSpacer_8">
<property name="orientation"> <property name="orientation">
@ -478,22 +432,6 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="18" column="4">
<spacer name="horizontalSpacer_8">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>70</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item row="10" column="5"> <item row="10" column="5">
<spacer name="verticalSpacer_6"> <spacer name="verticalSpacer_6">
<property name="orientation"> <property name="orientation">
@ -510,15 +448,8 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="12" column="3" alignment="Qt::AlignHCenter"> <item row="13" column="2">
<widget class="QLabel" name="label_3"> <widget class="QComboBox" name="cbRadioAux"/>
<property name="text">
<string>Main Port</string>
</property>
<property name="alignment">
<set>Qt::AlignBottom|Qt::AlignHCenter</set>
</property>
</widget>
</item> </item>
<item row="12" column="1" alignment="Qt::AlignHCenter"> <item row="12" column="1" alignment="Qt::AlignHCenter">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
@ -540,39 +471,8 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="2"> <item row="7" column="0">
<widget class="QComboBox" name="cbRadioAux"/> <widget class="QComboBox" name="cbUSBVCPFunction"/>
</item>
<item row="0" column="1" rowspan="12" colspan="4" alignment="Qt::AlignHCenter|Qt::AlignVCenter">
<widget class="QLabel" name="label_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>350</width>
<height>350</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap>:/configgadget/images/revolution_top.png</pixmap>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="textInteractionFlags">
<set>Qt::NoTextInteraction</set>
</property>
</widget>
</item> </item>
<item row="15" column="1"> <item row="15" column="1">
<layout class="QVBoxLayout" name="verticalLayout_5"> <layout class="QVBoxLayout" name="verticalLayout_5">
@ -607,32 +507,6 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="16" column="3" alignment="Qt::AlignHCenter">
<widget class="QLabel" name="lbMainGPSProtocol">
<property name="text">
<string>Protocol</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="12" column="4">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>50</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="0"> <item row="3" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<item> <item>
@ -685,9 +559,6 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="7" column="0">
<widget class="QComboBox" name="cbUSBVCPFunction"/>
</item>
<item row="5" column="0"> <item row="5" column="0">
<widget class="QComboBox" name="cbUSBHIDFunction"/> <widget class="QComboBox" name="cbUSBHIDFunction"/>
</item> </item>
@ -707,6 +578,9 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="3" colspan="2">
<widget class="QComboBox" name="cbMain"/>
</item>
<item row="4" column="0" alignment="Qt::AlignHCenter"> <item row="4" column="0" alignment="Qt::AlignHCenter">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="sizePolicy"> <property name="sizePolicy">
@ -723,6 +597,88 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="3" colspan="2">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Main Port</string>
</property>
<property name="alignment">
<set>Qt::AlignBottom|Qt::AlignHCenter</set>
</property>
</widget>
</item>
<item row="17" column="3" colspan="2">
<widget class="QComboBox" name="cbMainGPSProtocol"/>
</item>
<item row="14" column="3" colspan="2">
<widget class="QLabel" name="lblMainSpeed">
<property name="text">
<string>Speed</string>
</property>
<property name="alignment">
<set>Qt::AlignBottom|Qt::AlignHCenter</set>
</property>
</widget>
</item>
<item row="16" column="3" colspan="2">
<widget class="QLabel" name="lbMainGPSProtocol">
<property name="text">
<string>Protocol</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="18" column="3" colspan="2">
<spacer name="horizontalSpacer_9">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>120</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item row="15" column="3" colspan="2">
<layout class="QVBoxLayout" name="verticalLayout_6">
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QComboBox" name="cbMainTelemSpeed">
<property name="enabled">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cbMainGPSSpeed"/>
</item>
</layout>
</item>
<item row="0" column="1" rowspan="12" colspan="4">
<widget class="QSvgWidget" name="boardImg" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>160000</width>
<height>160000</height>
</size>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>
@ -936,6 +892,13 @@ Beware of not locking yourself out!</string>
</item> </item>
</layout> </layout>
</widget> </widget>
<customwidgets>
<customwidget>
<class>QSvgWidget</class>
<extends>QWidget</extends>
<header>qsvgwidget.h</header>
</customwidget>
</customwidgets>
<resources> <resources>
<include location="../coreplugin/core.qrc"/> <include location="../coreplugin/core.qrc"/>
<include location="configgadget.qrc"/> <include location="configgadget.qrc"/>