From 740e9fa86fdb63ab92d139470927faa0299c23a8 Mon Sep 17 00:00:00 2001
From: Laurent Lalanne <f5soh@free.fr>
Date: Mon, 27 Nov 2017 21:44:33 +0100
Subject: [PATCH] LP-559 Update SPRacingF3evo HW page with vector picture

---
 .../config/configspracingf3evohwwidget.cpp    |   5 +
 .../config/configspracingf3evohwwidget.ui     | 288 ++++++++++--------
 2 files changed, 158 insertions(+), 135 deletions(-)

diff --git a/ground/gcs/src/plugins/config/configspracingf3evohwwidget.cpp b/ground/gcs/src/plugins/config/configspracingf3evohwwidget.cpp
index 93eda6884..7d582b2a6 100644
--- a/ground/gcs/src/plugins/config/configspracingf3evohwwidget.cpp
+++ b/ground/gcs/src/plugins/config/configspracingf3evohwwidget.cpp
@@ -38,6 +38,11 @@ ConfigSPRacingF3EVOHWWidget::ConfigSPRacingF3EVOHWWidget(QWidget *parent) : Conf
     m_ui = new Ui_SPRacingF3EVOHWWidget();
     m_ui->setupUi(this);
 
+    m_ui->boardImg->load(QString(":/configgadget/images/spracingf3evo.svg"));
+    QSize picSize = m_ui->boardImg->sizeHint();
+    picSize.scale(360, 360, Qt::KeepAspectRatio);
+    m_ui->boardImg->setFixedSize(picSize);
+
     // must be done before auto binding !
     setWikiURL("SPRacingF3EVO+Configuration");
 
diff --git a/ground/gcs/src/plugins/config/configspracingf3evohwwidget.ui b/ground/gcs/src/plugins/config/configspracingf3evohwwidget.ui
index ce14082a9..02c33299e 100644
--- a/ground/gcs/src/plugins/config/configspracingf3evohwwidget.ui
+++ b/ground/gcs/src/plugins/config/configspracingf3evohwwidget.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>969</width>
-    <height>886</height>
+    <width>918</width>
+    <height>591</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -122,8 +122,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>939</width>
-            <height>786</height>
+            <width>896</width>
+            <height>503</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_3">
@@ -147,7 +147,7 @@
              <property name="sizeHint" stdset="0">
               <size>
                <width>20</width>
-               <height>40</height>
+               <height>0</height>
               </size>
              </property>
             </spacer>
@@ -159,7 +159,7 @@
              </property>
              <property name="sizeHint" stdset="0">
               <size>
-               <width>40</width>
+               <width>0</width>
                <height>20</height>
               </size>
              </property>
@@ -225,67 +225,30 @@
              </property>
              <property name="sizeHint" stdset="0">
               <size>
-               <width>40</width>
+               <width>0</width>
                <height>20</height>
               </size>
              </property>
             </spacer>
            </item>
            <item row="2" column="2">
-            <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0">
-             <item row="2" column="1" colspan="5" alignment="Qt::AlignHCenter|Qt::AlignVCenter">
-              <widget class="QLabel" name="lbBoardImage">
+            <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0">
+             <item row="1" column="2">
+              <widget class="QComboBox" name="cbUART2">
                <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                <sizepolicy hsizetype="Preferred" 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 resource="configgadget.qrc">:/configgadget/images/spracingf3evo_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="3">
-              <spacer name="horizontalSpacer_2">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeType">
-                <enum>QSizePolicy::Minimum</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>10</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
              <item row="2" column="0">
               <layout class="QGridLayout" name="gridLayout_2">
-               <item row="1" column="1">
+               <item row="2" column="0" colspan="2">
                 <widget class="QComboBox" name="cbUART3"/>
                </item>
-               <item row="0" column="0">
+               <item row="0" column="0" colspan="2">
                 <spacer name="verticalSpacer_3">
                  <property name="orientation">
                   <enum>Qt::Vertical</enum>
@@ -296,12 +259,12 @@
                  <property name="sizeHint" stdset="0">
                   <size>
                    <width>20</width>
-                   <height>75</height>
+                   <height>50</height>
                   </size>
                  </property>
                 </spacer>
                </item>
-               <item row="1" column="0">
+               <item row="1" column="0" colspan="2">
                 <widget class="QLabel" name="lbUART3">
                  <property name="text">
                   <string>UART3
@@ -312,11 +275,14 @@
                  </property>
                 </widget>
                </item>
-               <item row="2" column="0">
+               <item row="3" column="0" colspan="2">
                 <spacer name="verticalSpacer_4">
                  <property name="orientation">
                   <enum>Qt::Vertical</enum>
                  </property>
+                 <property name="sizeType">
+                  <enum>QSizePolicy::MinimumExpanding</enum>
+                 </property>
                  <property name="sizeHint" stdset="0">
                   <size>
                    <width>20</width>
@@ -327,35 +293,82 @@
                </item>
               </layout>
              </item>
-             <item row="4" column="0" colspan="7">
-              <widget class="CommonHWSettingsWidget" name="commonHWSettings" native="true">
+             <item row="0" column="2">
+              <widget class="QLabel" name="lbUART2">
+               <property name="text">
+                <string>UART2</string>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignBottom|Qt::AlignHCenter</set>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="3" rowspan="2" colspan="2">
+              <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>6</width>
+                 <height>10</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item row="2" column="1" colspan="6">
+              <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="minimumSize">
                 <size>
-                 <width>20</width>
-                 <height>80</height>
+                 <width>0</width>
+                 <height>0</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>160000</width>
+                 <height>160000</height>
                 </size>
                </property>
               </widget>
              </item>
-             <item row="2" column="6">
+             <item row="0" column="5">
+              <widget class="QLabel" name="lbI2C1">
+               <property name="text">
+                <string>I2C1</string>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignBottom|Qt::AlignHCenter</set>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="6" rowspan="2">
+              <spacer name="horizontalSpacer_6">
+               <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>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item row="2" column="7">
               <layout class="QGridLayout" name="gridLayout_4">
-               <item row="3" column="0">
-                <widget class="QComboBox" name="cbLEDPort"/>
-               </item>
-               <item row="1" column="1">
-                <widget class="QLabel" name="lbUART1">
-                 <property name="text">
-                  <string>UART1
-(headers)</string>
-                 </property>
-                 <property name="alignment">
-                  <set>Qt::AlignCenter</set>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="0">
-                <widget class="QComboBox" name="cbUART1"/>
-               </item>
                <item row="0" column="0">
                 <spacer name="verticalSpacer_5">
                  <property name="orientation">
@@ -367,12 +380,52 @@
                  <property name="sizeHint" stdset="0">
                   <size>
                    <width>20</width>
-                   <height>75</height>
+                   <height>50</height>
                   </size>
                  </property>
                 </spacer>
                </item>
+               <item row="1" column="0">
+                <widget class="QLabel" name="lbUART1">
+                 <property name="text">
+                  <string>UART1
+(headers)</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
                <item row="2" column="0">
+                <widget class="QComboBox" name="cbUART1"/>
+               </item>
+               <item row="6" column="0">
+                <spacer name="verticalSpacer_6">
+                 <property name="orientation">
+                  <enum>Qt::Vertical</enum>
+                 </property>
+                 <property name="sizeType">
+                  <enum>QSizePolicy::MinimumExpanding</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>20</width>
+                   <height>60</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+               <item row="4" column="0">
+                <widget class="QLabel" name="lbLEDPort">
+                 <property name="text">
+                  <string>IR/LED</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="0">
                 <spacer name="verticalSpacer_8">
                  <property name="orientation">
                   <enum>Qt::Vertical</enum>
@@ -383,83 +436,43 @@
                  <property name="sizeHint" stdset="0">
                   <size>
                    <width>20</width>
-                   <height>35</height>
+                   <height>25</height>
                   </size>
                  </property>
                 </spacer>
                </item>
-               <item row="3" column="1">
-                <widget class="QLabel" name="lbLEDPort">
-                 <property name="text">
-                  <string>IR/LED</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="4" column="0">
-                <spacer name="verticalSpacer_6">
-                 <property name="orientation">
-                  <enum>Qt::Vertical</enum>
-                 </property>
-                 <property name="sizeType">
-                  <enum>QSizePolicy::Expanding</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>20</width>
-                   <height>60</height>
-                  </size>
-                 </property>
-                </spacer>
+               <item row="5" column="0">
+                <widget class="QComboBox" name="cbLEDPort"/>
                </item>
               </layout>
              </item>
-             <item row="3" column="0">
-              <spacer name="verticalSpacer_7">
+             <item row="3" column="0" colspan="8">
+              <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="1" rowspan="2">
+              <spacer name="horizontalSpacer_3">
                <property name="orientation">
-                <enum>Qt::Vertical</enum>
+                <enum>Qt::Horizontal</enum>
                </property>
                <property name="sizeType">
                 <enum>QSizePolicy::Fixed</enum>
                </property>
                <property name="sizeHint" stdset="0">
                 <size>
-                 <width>20</width>
-                 <height>20</height>
+                 <width>35</width>
+                 <height>10</height>
                 </size>
                </property>
               </spacer>
              </item>
-             <item row="0" column="1" colspan="2">
-              <widget class="QLabel" name="lbUART2">
-               <property name="text">
-                <string>UART2</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignBottom|Qt::AlignHCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="4" colspan="2">
-              <widget class="QLabel" name="lbI2C1">
-               <property name="text">
-                <string>I2C1</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignBottom|Qt::AlignHCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1" colspan="2">
-              <widget class="QComboBox" name="cbUART2">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="4" colspan="2">
+             <item row="1" column="5">
               <widget class="QComboBox" name="cbI2C1"/>
              </item>
             </layout>
@@ -676,6 +689,11 @@ Beware of not locking yourself out!</string>
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>QSvgWidget</class>
+   <extends>QWidget</extends>
+   <header>qsvgwidget.h</header>
+  </customwidget>
   <customwidget>
    <class>CommonHWSettingsWidget</class>
    <extends>QWidget</extends>