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 CC HW page for vector pictures

Browse Source
This commit is contained in:
Laurent Lalanne 2017-11-11 17:50:49 +01:00
parent 6cd8a85bbd
commit ff3a1bd630
2 changed files with 53 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
ground/gcs/src/plugins/config/cc_hw_settings.ui
View File

@ -290,11 +290,15 @@
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0,0,0,0"> <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0,0,0,0">
<item row="4" column="0"> <item row="1" column="1" colspan="2" alignment="Qt::AlignLeft">
<widget class="QComboBox" name="cbFlexi"/> <widget class="QLabel" name="label_7">
</item> <property name="text">
<item row="6" column="0"> <string>Receiver Port</string>
<widget class="QComboBox" name="cbTele"/> </property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item> </item>
<item row="3" column="3"> <item row="3" column="3">
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="label_8">
@ -306,10 +310,16 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0"> <item row="6" column="3">
<widget class="QLabel" name="label_4"> <widget class="QComboBox" name="cbUsbVcp"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
<string/> <string>Flexi Port</string>
</property>
<property name="alignment">
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
</property> </property>
</widget> </widget>
</item> </item>
@ -323,15 +333,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0">
<widget class="QComboBox" name="cbTele"/>
</item>
<item row="2" column="1" colspan="2" alignment="Qt::AlignLeft">
<widget class="QComboBox" name="cbRcvr"/>
</item>
<item row="3" column="1" rowspan="5" colspan="2"> <item row="3" column="1" rowspan="5" colspan="2">
<widget class="QLabel" name="label_2"> <widget class="QSvgWidget" name="boardImg" native="true"/>
<property name="text">
<string/>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
</widget>
</item> </item>
<item row="5" column="0"> <item row="5" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
@ -343,45 +352,16 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Flexi Port</string>
</property>
<property name="alignment">
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
</property>
</widget>
</item>
<item row="4" column="3"> <item row="4" column="3">
<widget class="QComboBox" name="cbUsbHid"/> <widget class="QComboBox" name="cbUsbHid"/>
</item> </item>
<item row="4" column="4"> <item row="4" column="0">
<spacer name="horizontalSpacer_2"> <widget class="QComboBox" name="cbFlexi"/>
<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>
<item row="6" column="3"> <item row="7" column="0">
<widget class="QComboBox" name="cbUsbVcp"/> <widget class="QLabel" name="label_4">
</item>
<item row="2" column="1" colspan="2" alignment="Qt::AlignLeft">
<widget class="QComboBox" name="cbRcvr"/>
</item>
<item row="1" column="1" colspan="2" alignment="Qt::AlignLeft">
<widget class="QLabel" name="label_7">
<property name="text"> <property name="text">
<string>Receiver Port</string> <string/>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
@ -640,6 +620,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"/>
</resources> </resources>

28
ground/gcs/src/plugins/config/config_cc_hw_widget.cpp
View File

@ -55,25 +55,29 @@ ConfigCCHWWidget::ConfigCCHWWidget(QWidget *parent) : ConfigTaskWidget(parent)
int id = utilMngr->getBoardModel(); int id = utilMngr->getBoardModel();
switch (id) { switch (id) {
case 0x0101: case 0x0101:
m_telemetry->label_2->setPixmap(QPixmap(":/uploader/images/deviceID-0101.svg")); m_telemetry->boardImg->load(QString(":/uploader/images/deviceID-0101.svg"));
break;
case 0x0301:
m_telemetry->label_2->setPixmap(QPixmap(":/uploader/images/deviceID-0301.svg"));
break;
case 0x0401:
m_telemetry->label_2->setPixmap(QPixmap(":/configgadget/images/coptercontrol.svg"));
break;
case 0x0402:
m_telemetry->label_2->setPixmap(QPixmap(":/configgadget/images/cc3d_top.png"));
break; break;
case 0x0201: case 0x0201:
m_telemetry->label_2->setPixmap(QPixmap(":/uploader/images/deviceID-0201.svg")); m_telemetry->boardImg->load(QString(":/uploader/images/deviceID-0201.svg"));
break;
case 0x0301:
m_telemetry->boardImg->load(QString(":/uploader/images/deviceID-0301.svg"));
break;
case 0x0401:
m_telemetry->boardImg->load(QString(":/configgadget/images/coptercontrol.svg"));
break;
case 0x0402:
m_telemetry->boardImg->load(QString(":/configgadget/images/cc3d.svg"));
break; break;
default: default:
m_telemetry->label_2->setPixmap(QPixmap(":/configgadget/images/coptercontrol.svg")); m_telemetry->boardImg->load(QString(":/configgadget/images/cc3d.svg"));
break; break;
} }
QSize picSize = m_telemetry->boardImg->sizeHint();
picSize.scale(350, 350, Qt::KeepAspectRatio);
m_telemetry->boardImg->setFixedSize(picSize);
addWidgetBinding("HwSettings", "CC_FlexiPort", m_telemetry->cbFlexi); addWidgetBinding("HwSettings", "CC_FlexiPort", m_telemetry->cbFlexi);
addWidgetBinding("HwSettings", "CC_MainPort", m_telemetry->cbTele); addWidgetBinding("HwSettings", "CC_MainPort", m_telemetry->cbTele);
addWidgetBinding("HwSettings", "CC_RcvrPort", m_telemetry->cbRcvr); addWidgetBinding("HwSettings", "CC_RcvrPort", m_telemetry->cbRcvr);