Skip to content

Commit acfa6cc

Browse files
f5sohf5soh
committed
LP-559 Update Revo HW tab with vector picture
1 parent ff3a1bd commit acfa6cc

2 files changed

Lines changed: 104 additions & 136 deletions

File tree

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

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

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

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

Lines changed: 99 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -233,23 +233,6 @@
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,0,0,0,0">
236-
<item row="15" column="3">
237-
<layout class="QVBoxLayout" name="verticalLayout_6">
238-
<property name="spacing">
239-
<number>0</number>
240-
</property>
241-
<item>
242-
<widget class="QComboBox" name="cbMainTelemSpeed">
243-
<property name="enabled">
244-
<bool>true</bool>
245-
</property>
246-
</widget>
247-
</item>
248-
<item>
249-
<widget class="QComboBox" name="cbMainGPSSpeed"/>
250-
</item>
251-
</layout>
252-
</item>
253236
<item row="2" column="0">
254237
<widget class="QComboBox" name="cbRcvr"/>
255238
</item>
@@ -269,16 +252,6 @@
269252
</property>
270253
</spacer>
271254
</item>
272-
<item row="14" column="3" alignment="Qt::AlignHCenter">
273-
<widget class="QLabel" name="lblMainSpeed">
274-
<property name="text">
275-
<string>Speed</string>
276-
</property>
277-
<property name="alignment">
278-
<set>Qt::AlignBottom|Qt::AlignHCenter</set>
279-
</property>
280-
</widget>
281-
</item>
282255
<item row="8" column="5">
283256
<spacer name="verticalSpacer_7">
284257
<property name="orientation">
@@ -319,6 +292,9 @@
319292
<property name="orientation">
320293
<enum>Qt::Horizontal</enum>
321294
</property>
295+
<property name="sizeType">
296+
<enum>QSizePolicy::Expanding</enum>
297+
</property>
322298
<property name="sizeHint" stdset="0">
323299
<size>
324300
<width>80</width>
@@ -359,9 +335,6 @@
359335
</property>
360336
</widget>
361337
</item>
362-
<item row="13" column="3">
363-
<widget class="QComboBox" name="cbMain"/>
364-
</item>
365338
<item row="5" column="5" alignment="Qt::AlignHCenter">
366339
<widget class="QLabel" name="label_9">
367340
<property name="sizePolicy">
@@ -427,9 +400,6 @@
427400
</property>
428401
</widget>
429402
</item>
430-
<item row="17" column="3">
431-
<widget class="QComboBox" name="cbMainGPSProtocol"/>
432-
</item>
433403
<item row="9" column="5">
434404
<spacer name="verticalSpacer_5">
435405
<property name="orientation">
@@ -446,22 +416,6 @@
446416
</property>
447417
</spacer>
448418
</item>
449-
<item row="18" column="3">
450-
<spacer name="horizontalSpacer_9">
451-
<property name="orientation">
452-
<enum>Qt::Horizontal</enum>
453-
</property>
454-
<property name="sizeType">
455-
<enum>QSizePolicy::Minimum</enum>
456-
</property>
457-
<property name="sizeHint" stdset="0">
458-
<size>
459-
<width>120</width>
460-
<height>10</height>
461-
</size>
462-
</property>
463-
</spacer>
464-
</item>
465419
<item row="7" column="5">
466420
<spacer name="verticalSpacer_8">
467421
<property name="orientation">
@@ -478,22 +432,6 @@
478432
</property>
479433
</spacer>
480434
</item>
481-
<item row="18" column="4">
482-
<spacer name="horizontalSpacer_8">
483-
<property name="orientation">
484-
<enum>Qt::Horizontal</enum>
485-
</property>
486-
<property name="sizeType">
487-
<enum>QSizePolicy::Minimum</enum>
488-
</property>
489-
<property name="sizeHint" stdset="0">
490-
<size>
491-
<width>70</width>
492-
<height>10</height>
493-
</size>
494-
</property>
495-
</spacer>
496-
</item>
497435
<item row="10" column="5">
498436
<spacer name="verticalSpacer_6">
499437
<property name="orientation">
@@ -510,15 +448,8 @@
510448
</property>
511449
</spacer>
512450
</item>
513-
<item row="12" column="3" alignment="Qt::AlignHCenter">
514-
<widget class="QLabel" name="label_3">
515-
<property name="text">
516-
<string>Main Port</string>
517-
</property>
518-
<property name="alignment">
519-
<set>Qt::AlignBottom|Qt::AlignHCenter</set>
520-
</property>
521-
</widget>
451+
<item row="13" column="2">
452+
<widget class="QComboBox" name="cbRadioAux"/>
522453
</item>
523454
<item row="12" column="1" alignment="Qt::AlignHCenter">
524455
<widget class="QLabel" name="label_5">
@@ -540,39 +471,8 @@
540471
</property>
541472
</widget>
542473
</item>
543-
<item row="13" column="2">
544-
<widget class="QComboBox" name="cbRadioAux"/>
545-
</item>
546-
<item row="0" column="1" rowspan="12" colspan="4" alignment="Qt::AlignHCenter|Qt::AlignVCenter">
547-
<widget class="QLabel" name="label_2">
548-
<property name="sizePolicy">
549-
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
550-
<horstretch>0</horstretch>
551-
<verstretch>0</verstretch>
552-
</sizepolicy>
553-
</property>
554-
<property name="maximumSize">
555-
<size>
556-
<width>350</width>
557-
<height>350</height>
558-
</size>
559-
</property>
560-
<property name="text">
561-
<string/>
562-
</property>
563-
<property name="pixmap">
564-
<pixmap>:/configgadget/images/revolution_top.png</pixmap>
565-
</property>
566-
<property name="scaledContents">
567-
<bool>false</bool>
568-
</property>
569-
<property name="alignment">
570-
<set>Qt::AlignCenter</set>
571-
</property>
572-
<property name="textInteractionFlags">
573-
<set>Qt::NoTextInteraction</set>
574-
</property>
575-
</widget>
474+
<item row="7" column="0">
475+
<widget class="QComboBox" name="cbUSBVCPFunction"/>
576476
</item>
577477
<item row="15" column="1">
578478
<layout class="QVBoxLayout" name="verticalLayout_5">
@@ -607,32 +507,6 @@
607507
</property>
608508
</spacer>
609509
</item>
610-
<item row="16" column="3" alignment="Qt::AlignHCenter">
611-
<widget class="QLabel" name="lbMainGPSProtocol">
612-
<property name="text">
613-
<string>Protocol</string>
614-
</property>
615-
<property name="alignment">
616-
<set>Qt::AlignCenter</set>
617-
</property>
618-
</widget>
619-
</item>
620-
<item row="12" column="4">
621-
<spacer name="horizontalSpacer_2">
622-
<property name="orientation">
623-
<enum>Qt::Horizontal</enum>
624-
</property>
625-
<property name="sizeType">
626-
<enum>QSizePolicy::Fixed</enum>
627-
</property>
628-
<property name="sizeHint" stdset="0">
629-
<size>
630-
<width>50</width>
631-
<height>10</height>
632-
</size>
633-
</property>
634-
</spacer>
635-
</item>
636510
<item row="3" column="0">
637511
<layout class="QHBoxLayout" name="horizontalLayout_4">
638512
<item>
@@ -685,9 +559,6 @@
685559
</item>
686560
</layout>
687561
</item>
688-
<item row="7" column="0">
689-
<widget class="QComboBox" name="cbUSBVCPFunction"/>
690-
</item>
691562
<item row="5" column="0">
692563
<widget class="QComboBox" name="cbUSBHIDFunction"/>
693564
</item>
@@ -707,6 +578,9 @@
707578
</property>
708579
</widget>
709580
</item>
581+
<item row="13" column="3" colspan="2">
582+
<widget class="QComboBox" name="cbMain"/>
583+
</item>
710584
<item row="4" column="0" alignment="Qt::AlignHCenter">
711585
<widget class="QLabel" name="label_4">
712586
<property name="sizePolicy">
@@ -723,6 +597,88 @@
723597
</property>
724598
</widget>
725599
</item>
600+
<item row="12" column="3" colspan="2">
601+
<widget class="QLabel" name="label_3">
602+
<property name="text">
603+
<string>Main Port</string>
604+
</property>
605+
<property name="alignment">
606+
<set>Qt::AlignBottom|Qt::AlignHCenter</set>
607+
</property>
608+
</widget>
609+
</item>
610+
<item row="17" column="3" colspan="2">
611+
<widget class="QComboBox" name="cbMainGPSProtocol"/>
612+
</item>
613+
<item row="14" column="3" colspan="2">
614+
<widget class="QLabel" name="lblMainSpeed">
615+
<property name="text">
616+
<string>Speed</string>
617+
</property>
618+
<property name="alignment">
619+
<set>Qt::AlignBottom|Qt::AlignHCenter</set>
620+
</property>
621+
</widget>
622+
</item>
623+
<item row="16" column="3" colspan="2">
624+
<widget class="QLabel" name="lbMainGPSProtocol">
625+
<property name="text">
626+
<string>Protocol</string>
627+
</property>
628+
<property name="alignment">
629+
<set>Qt::AlignCenter</set>
630+
</property>
631+
</widget>
632+
</item>
633+
<item row="18" column="3" colspan="2">
634+
<spacer name="horizontalSpacer_9">
635+
<property name="orientation">
636+
<enum>Qt::Horizontal</enum>
637+
</property>
638+
<property name="sizeType">
639+
<enum>QSizePolicy::Minimum</enum>
640+
</property>
641+
<property name="sizeHint" stdset="0">
642+
<size>
643+
<width>120</width>
644+
<height>10</height>
645+
</size>
646+
</property>
647+
</spacer>
648+
</item>
649+
<item row="15" column="3" colspan="2">
650+
<layout class="QVBoxLayout" name="verticalLayout_6">
651+
<property name="spacing">
652+
<number>0</number>
653+
</property>
654+
<item>
655+
<widget class="QComboBox" name="cbMainTelemSpeed">
656+
<property name="enabled">
657+
<bool>true</bool>
658+
</property>
659+
</widget>
660+
</item>
661+
<item>
662+
<widget class="QComboBox" name="cbMainGPSSpeed"/>
663+
</item>
664+
</layout>
665+
</item>
666+
<item row="0" column="1" rowspan="12" colspan="4">
667+
<widget class="QSvgWidget" name="boardImg" native="true">
668+
<property name="sizePolicy">
669+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
670+
<horstretch>0</horstretch>
671+
<verstretch>0</verstretch>
672+
</sizepolicy>
673+
</property>
674+
<property name="maximumSize">
675+
<size>
676+
<width>160000</width>
677+
<height>160000</height>
678+
</size>
679+
</property>
680+
</widget>
681+
</item>
726682
</layout>
727683
</item>
728684
</layout>
@@ -936,6 +892,13 @@ Beware of not locking yourself out!</string>
936892
</item>
937893
</layout>
938894
</widget>
895+
<customwidgets>
896+
<customwidget>
897+
<class>QSvgWidget</class>
898+
<extends>QWidget</extends>
899+
<header>qsvgwidget.h</header>
900+
</customwidget>
901+
</customwidgets>
939902
<resources>
940903
<include location="../coreplugin/core.qrc"/>
941904
<include location="configgadget.qrc"/>

0 commit comments

Comments
 (0)