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

LP-559 Update tinyFish HW page with vector picture

Browse Source
This commit is contained in:
Laurent Lalanne 2017-11-27 21:45:22 +01:00
parent 740e9fa86f
commit 2ed165b5e9
2 changed files with 141 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,11 @@ ConfigTinyFISHHWWidget::ConfigTinyFISHHWWidget(QWidget *parent) : ConfigTaskWidg
m_ui = new Ui_TinyFISHHWWidget(); m_ui = new Ui_TinyFISHHWWidget();
m_ui->setupUi(this); m_ui->setupUi(this);
m_ui->boardImg->load(QString(":/configgadget/images/tinyfish.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("TinyFISH+Configuration"); setWikiURL("TinyFISH+Configuration");

239
ground/gcs/src/plugins/config/configtinyfishhwwidget.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>969</width> <width>1130</width>
<height>886</height> <height>738</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -122,8 +122,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>939</width> <width>1108</width>
<height>786</height> <height>650</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
@ -139,48 +139,6 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>12</number> <number>12</number>
</property> </property>
<item row="3" column="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="3">
<spacer name="horizontalSpacer_5">
<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 row="1" column="2">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="2"> <item row="0" column="2">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="sizePolicy"> <property name="sizePolicy">
@ -225,7 +183,36 @@
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>0</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="2">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="3">
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
@ -233,13 +220,63 @@
</item> </item>
<item row="2" column="2"> <item row="2" column="2">
<layout class="QGridLayout" name="gridLayout" rowstretch="0,0"> <layout class="QGridLayout" name="gridLayout" rowstretch="0,0">
<item row="0" column="3"> <item row="0" column="4">
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
<item row="1" column="0"> <item row="1" column="0">
<widget class="QComboBox" name="cbLEDPort"/> <widget class="QComboBox" name="cbLEDPort"/>
</item> </item>
<item row="3" column="0">
<spacer name="verticalSpacer_6">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>100</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="1">
<widget class="QLabel" name="lbLEDPort">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>IR/LED</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QComboBox" name="cbUART3"/>
</item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QLabel" name="lbUART3"> <widget class="QLabel" name="lbUART3">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>UART3</string> <string>UART3</string>
</property> </property>
@ -254,7 +291,7 @@
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeType"> <property name="sizeType">
<enum>QSizePolicy::Expanding</enum> <enum>QSizePolicy::MinimumExpanding</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
@ -264,80 +301,71 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="3" column="0">
<spacer name="verticalSpacer_6">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>80</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0">
<widget class="QComboBox" name="cbUART3"/>
</item>
<item row="1" column="1">
<widget class="QLabel" name="lbLEDPort">
<property name="text">
<string>IR/LED</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item row="0" column="1" colspan="2" alignment="Qt::AlignHCenter|Qt::AlignVCenter"> <item row="0" column="1" colspan="3">
<widget class="QLabel" name="lbBoardImage"> <widget class="QSvgWidget" name="boardImg" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize"> <property name="minimumSize">
<size> <size>
<width>350</width> <width>350</width>
<height>350</height> <height>350</height>
</size> </size>
</property> </property>
<property name="text"> <property name="maximumSize">
<string/>
</property>
<property name="pixmap">
<pixmap resource="configgadget.qrc">:/configgadget/images/tinyfish_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 row="0" column="0">
<layout class="QGridLayout" name="gridLayout_2"/>
</item>
<item row="1" column="0" colspan="4">
<widget class="CommonHWSettingsWidget" name="commonHWSettings" native="true">
<property name="minimumSize">
<size> <size>
<width>20</width> <width>160000</width>
<height>80</height> <height>160000</height>
</size> </size>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="5">
<widget class="CommonHWSettingsWidget" name="commonHWSettings" native="true">
<property name="minimumSize">
<size>
<width>600</width>
<height>20</height>
</size>
</property>
</widget>
</item>
<item row="0" column="0">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>5</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
<item row="3" column="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>
@ -550,6 +578,11 @@ Beware of not locking yourself out!</string>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>QSvgWidget</class>
<extends>QWidget</extends>
<header>qsvgwidget.h</header>
</customwidget>
<customwidget> <customwidget>
<class>CommonHWSettingsWidget</class> <class>CommonHWSettingsWidget</class>
<extends>QWidget</extends> <extends>QWidget</extends>