Skip to content

Commit d39fcc1

Browse files
f5sohf5soh
committed
LP-559 Update RevoNano HW tab with vector picture
1 parent f486725 commit d39fcc1

2 files changed

Lines changed: 104 additions & 101 deletions

File tree

‎ground/gcs/src/plugins/config/configrevonanohwwidget.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ ConfigRevoNanoHWWidget::ConfigRevoNanoHWWidget(QWidget *parent) : ConfigTaskWidg
3838
m_ui = new Ui_RevoNanoHWWidget();
3939
m_ui->setupUi(this);
4040

41+
m_ui->boardImg->load(QString(":/configgadget/images/revo_nano.svg"));
42+
QSize picSize = m_ui->boardImg->sizeHint();
43+
picSize.scale(450, 450, Qt::KeepAspectRatio);
44+
m_ui->boardImg->setFixedSize(picSize);
45+
4146
// must be done before auto binding !
4247
setWikiURL("Revo+Nano+Configuration");
4348

‎ground/gcs/src/plugins/config/configrevonanohwwidget.ui‎

Lines changed: 99 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -233,110 +233,94 @@
233233
</item>
234234
<item row="2" column="2">
235235
<layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0">
236-
<item row="3" column="0" alignment="Qt::AlignTop">
237-
<widget class="QComboBox" name="cbUSBVCPFunction"/>
236+
<item row="3" column="3" colspan="2">
237+
<widget class="QComboBox" name="cbFlexiGPSProtocol"/>
238238
</item>
239-
<item row="6" column="0" rowspan="2" colspan="6" alignment="Qt::AlignHCenter|Qt::AlignVCenter">
240-
<widget class="QLabel" name="label_2">
239+
<item row="0" column="0">
240+
<widget class="QLabel" name="label_4">
241241
<property name="sizePolicy">
242242
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
243243
<horstretch>0</horstretch>
244244
<verstretch>0</verstretch>
245245
</sizepolicy>
246246
</property>
247-
<property name="maximumSize">
248-
<size>
249-
<width>500</width>
250-
<height>350</height>
251-
</size>
252-
</property>
253247
<property name="text">
254-
<string/>
248+
<string>USB HID Function</string>
255249
</property>
256-
<property name="pixmap">
257-
<pixmap>:/configgadget/images/nano_top.png</pixmap>
250+
<property name="alignment">
251+
<set>Qt::AlignBottom|Qt::AlignHCenter</set>
258252
</property>
259-
<property name="scaledContents">
260-
<bool>false</bool>
253+
</widget>
254+
</item>
255+
<item row="13" column="2" colspan="2">
256+
<widget class="QLabel" name="lbMainGPSProtocol">
257+
<property name="text">
258+
<string>Protocol</string>
261259
</property>
262260
<property name="alignment">
263261
<set>Qt::AlignCenter</set>
264262
</property>
265-
<property name="textInteractionFlags">
266-
<set>Qt::NoTextInteraction</set>
267-
</property>
268263
</widget>
269264
</item>
270-
<item row="1" column="0">
271-
<widget class="QComboBox" name="cbUSBHIDFunction"/>
272-
</item>
273-
<item row="8" column="0" alignment="Qt::AlignHCenter">
274-
<widget class="QLabel" name="label_7">
275-
<property name="sizePolicy">
276-
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
277-
<horstretch>0</horstretch>
278-
<verstretch>0</verstretch>
279-
</sizepolicy>
280-
</property>
265+
<item row="0" column="1" colspan="2">
266+
<widget class="QLabel" name="label_5">
281267
<property name="text">
282-
<string>Receiver Port</string>
268+
<string>Flexi Port</string>
283269
</property>
284270
<property name="alignment">
285271
<set>Qt::AlignBottom|Qt::AlignHCenter</set>
286272
</property>
287273
</widget>
288274
</item>
289-
<item row="0" column="0">
290-
<widget class="QLabel" name="label_4">
291-
<property name="sizePolicy">
292-
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
293-
<horstretch>0</horstretch>
294-
<verstretch>0</verstretch>
295-
</sizepolicy>
296-
</property>
275+
<item row="2" column="1" colspan="2">
276+
<widget class="QLabel" name="lblFlexiSpeed">
297277
<property name="text">
298-
<string>USB HID Function</string>
278+
<string>Speed</string>
299279
</property>
300280
<property name="alignment">
301281
<set>Qt::AlignBottom|Qt::AlignHCenter</set>
302282
</property>
303283
</widget>
304284
</item>
305-
<item row="9" column="0">
306-
<widget class="QComboBox" name="cbRcvr"/>
285+
<item row="3" column="0" alignment="Qt::AlignTop">
286+
<widget class="QComboBox" name="cbUSBVCPFunction"/>
307287
</item>
308-
<item row="9" column="2" colspan="2">
309-
<widget class="QComboBox" name="cbMain"/>
288+
<item row="3" column="1" colspan="2">
289+
<layout class="QVBoxLayout" name="verticalLayout_5">
290+
<property name="spacing">
291+
<number>0</number>
292+
</property>
293+
<item>
294+
<widget class="QComboBox" name="cbFlexiTelemSpeed">
295+
<property name="enabled">
296+
<bool>true</bool>
297+
</property>
298+
</widget>
299+
</item>
300+
<item alignment="Qt::AlignTop">
301+
<widget class="QComboBox" name="cbFlexiGPSSpeed"/>
302+
</item>
303+
</layout>
310304
</item>
311-
<item row="2" column="0">
312-
<widget class="QLabel" name="label_8">
305+
<item row="1" column="0">
306+
<widget class="QComboBox" name="cbUSBHIDFunction"/>
307+
</item>
308+
<item row="8" column="0" alignment="Qt::AlignHCenter">
309+
<widget class="QLabel" name="label_7">
313310
<property name="sizePolicy">
314-
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
311+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
315312
<horstretch>0</horstretch>
316313
<verstretch>0</verstretch>
317314
</sizepolicy>
318315
</property>
319316
<property name="text">
320-
<string>USB VCP Function</string>
321-
</property>
322-
<property name="alignment">
323-
<set>Qt::AlignBottom|Qt::AlignHCenter</set>
324-
</property>
325-
</widget>
326-
</item>
327-
<item row="8" column="2" colspan="2">
328-
<widget class="QLabel" name="label_3">
329-
<property name="text">
330-
<string>Main Port</string>
317+
<string>Receiver Port</string>
331318
</property>
332319
<property name="alignment">
333320
<set>Qt::AlignBottom|Qt::AlignHCenter</set>
334321
</property>
335322
</widget>
336323
</item>
337-
<item row="14" column="2" colspan="2">
338-
<widget class="QComboBox" name="cbMainGPSProtocol"/>
339-
</item>
340324
<item row="10" column="2" colspan="2">
341325
<widget class="QLabel" name="lblMainSpeed">
342326
<property name="text">
@@ -364,69 +348,76 @@
364348
</item>
365349
</layout>
366350
</item>
367-
<item row="3" column="3" colspan="2">
368-
<widget class="QComboBox" name="cbFlexiGPSProtocol"/>
369-
</item>
370-
<item row="13" column="2" colspan="2">
371-
<widget class="QLabel" name="lbMainGPSProtocol">
351+
<item row="8" column="2" colspan="2">
352+
<widget class="QLabel" name="label_3">
372353
<property name="text">
373-
<string>Protocol</string>
354+
<string>Main Port</string>
374355
</property>
375356
<property name="alignment">
376-
<set>Qt::AlignCenter</set>
357+
<set>Qt::AlignBottom|Qt::AlignHCenter</set>
377358
</property>
378359
</widget>
379360
</item>
380-
<item row="2" column="3" colspan="2">
381-
<widget class="QLabel" name="lbFlexiGPSProtocol">
382-
<property name="text">
383-
<string>Protocol</string>
361+
<item row="9" column="2" colspan="2">
362+
<widget class="QComboBox" name="cbMain"/>
363+
</item>
364+
<item row="9" column="0">
365+
<widget class="QComboBox" name="cbRcvr"/>
366+
</item>
367+
<item row="14" column="2" colspan="2">
368+
<widget class="QComboBox" name="cbMainGPSProtocol"/>
369+
</item>
370+
<item row="2" column="0">
371+
<widget class="QLabel" name="label_8">
372+
<property name="sizePolicy">
373+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
374+
<horstretch>0</horstretch>
375+
<verstretch>0</verstretch>
376+
</sizepolicy>
384377
</property>
385-
<property name="textFormat">
386-
<enum>Qt::PlainText</enum>
378+
<property name="text">
379+
<string>USB VCP Function</string>
387380
</property>
388381
<property name="alignment">
389-
<set>Qt::AlignCenter</set>
382+
<set>Qt::AlignBottom|Qt::AlignHCenter</set>
390383
</property>
391384
</widget>
392385
</item>
393386
<item row="1" column="1" colspan="2">
394387
<widget class="QComboBox" name="cbFlexi"/>
395388
</item>
396-
<item row="3" column="1" colspan="2">
397-
<layout class="QVBoxLayout" name="verticalLayout_5">
398-
<property name="spacing">
399-
<number>0</number>
400-
</property>
401-
<item>
402-
<widget class="QComboBox" name="cbFlexiTelemSpeed">
403-
<property name="enabled">
404-
<bool>true</bool>
405-
</property>
406-
</widget>
407-
</item>
408-
<item alignment="Qt::AlignTop">
409-
<widget class="QComboBox" name="cbFlexiGPSSpeed"/>
410-
</item>
411-
</layout>
412-
</item>
413-
<item row="0" column="1" colspan="2">
414-
<widget class="QLabel" name="label_5">
389+
<item row="2" column="3" colspan="2">
390+
<widget class="QLabel" name="lbFlexiGPSProtocol">
415391
<property name="text">
416-
<string>Flexi Port</string>
392+
<string>Protocol</string>
393+
</property>
394+
<property name="textFormat">
395+
<enum>Qt::PlainText</enum>
417396
</property>
418397
<property name="alignment">
419-
<set>Qt::AlignBottom|Qt::AlignHCenter</set>
398+
<set>Qt::AlignCenter</set>
420399
</property>
421400
</widget>
422401
</item>
423-
<item row="2" column="1" colspan="2">
424-
<widget class="QLabel" name="lblFlexiSpeed">
425-
<property name="text">
426-
<string>Speed</string>
402+
<item row="6" column="0" rowspan="2" colspan="6">
403+
<widget class="QSvgWidget" name="boardImg" native="true">
404+
<property name="sizePolicy">
405+
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
406+
<horstretch>0</horstretch>
407+
<verstretch>0</verstretch>
408+
</sizepolicy>
427409
</property>
428-
<property name="alignment">
429-
<set>Qt::AlignBottom|Qt::AlignHCenter</set>
410+
<property name="minimumSize">
411+
<size>
412+
<width>100</width>
413+
<height>100</height>
414+
</size>
415+
</property>
416+
<property name="maximumSize">
417+
<size>
418+
<width>160000</width>
419+
<height>160000</height>
420+
</size>
430421
</property>
431422
</widget>
432423
</item>
@@ -643,6 +634,13 @@ Beware of not locking yourself out!</string>
643634
</item>
644635
</layout>
645636
</widget>
637+
<customwidgets>
638+
<customwidget>
639+
<class>QSvgWidget</class>
640+
<extends>QWidget</extends>
641+
<header>qsvgwidget.h</header>
642+
</customwidget>
643+
</customwidgets>
646644
<resources>
647645
<include location="../coreplugin/core.qrc"/>
648646
<include location="configgadget.qrc"/>

0 commit comments

Comments
 (0)