From 02903e78586063cbe5730ad91bab0278a12747a9 Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Fri, 26 Dec 2014 22:45:15 +0100 Subject: [PATCH] OP-1660 Display limits for every FlightMode position on Flightmode channel --- .../src/plugins/config/configgadget.qrc | 6 ++++++ .../src/plugins/config/configinputwidget.cpp | 20 ++++++++++++++++++ .../plugins/config/images/flightmode_bg1.png | Bin 0 -> 499 bytes .../plugins/config/images/flightmode_bg2.png | Bin 0 -> 866 bytes .../plugins/config/images/flightmode_bg3.png | Bin 0 -> 1278 bytes .../plugins/config/images/flightmode_bg4.png | Bin 0 -> 1536 bytes .../plugins/config/images/flightmode_bg5.png | Bin 0 -> 1862 bytes .../plugins/config/images/flightmode_bg6.png | Bin 0 -> 2300 bytes 8 files changed, 26 insertions(+) create mode 100644 ground/openpilotgcs/src/plugins/config/images/flightmode_bg1.png create mode 100644 ground/openpilotgcs/src/plugins/config/images/flightmode_bg2.png create mode 100644 ground/openpilotgcs/src/plugins/config/images/flightmode_bg3.png create mode 100644 ground/openpilotgcs/src/plugins/config/images/flightmode_bg4.png create mode 100644 ground/openpilotgcs/src/plugins/config/images/flightmode_bg5.png create mode 100644 ground/openpilotgcs/src/plugins/config/images/flightmode_bg6.png diff --git a/ground/openpilotgcs/src/plugins/config/configgadget.qrc b/ground/openpilotgcs/src/plugins/config/configgadget.qrc index c557e7b81..01984a553 100644 --- a/ground/openpilotgcs/src/plugins/config/configgadget.qrc +++ b/ground/openpilotgcs/src/plugins/config/configgadget.qrc @@ -1,5 +1,11 @@ + images/flightmode_bg1.png + images/flightmode_bg2.png + images/flightmode_bg3.png + images/flightmode_bg4.png + images/flightmode_bg5.png + images/flightmode_bg6.png images/help2.png images/ahrs-calib.svg images/multirotor-shapes.svg diff --git a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp index af3433766..57a3a81f9 100644 --- a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp @@ -1536,6 +1536,26 @@ void ConfigInputWidget::updatePositionSlider() default: break; } + + QString fmNumber = QString().setNum(manualSettingsDataPriv.FlightModeNumber); + int count = 0; + foreach(QSlider * sp, findChildren()) { + // Find FlightMode slider and apply stylesheet + if (sp->objectName() == "channelNeutral") { + if (count == 4) { + sp->setStyleSheet( + "QSlider::groove:horizontal {border: 2px solid rgb(196, 196, 196); height: 20px; margin 9px 9px; border-radius: 4px; " + "border-image:url(:/configgadget/images/flightmode_bg" + fmNumber + ".png); }" + "QSlider::add-page:horizontal { background: none; border: none; }" + "QSlider::sub-page:horizontal { background: none; border: none; }" + "QSlider::handle:horizontal { background: rgba(196, 196, 196, 255); width: 10px; height: 28px; " + "margin: -4px -4px; border-radius: 3px; border: 1px solid #777; }"); + count++; + } else { + count++; + } + } + } } void ConfigInputWidget::updateCalibration() diff --git a/ground/openpilotgcs/src/plugins/config/images/flightmode_bg1.png b/ground/openpilotgcs/src/plugins/config/images/flightmode_bg1.png new file mode 100644 index 0000000000000000000000000000000000000000..ae77ac4361032c12a5221153d56745cc155ec5bc GIT binary patch literal 499 zcmeAS@N?(olHy`uVBq!ia0y~yV2S{;RXEsyWT>QzKagT6cJd720D>Bhlnx-Dv%n*= zn1Laf2ZR}Yul^DM3QCr^MwA5SrEaktG3V`_wO%ZNGRGd4AN7t{fADB_!Q#+^S%wj7cO89G)-2{~5XqZ#|8$|Qn4O{^t1ucpWF9=|;G zVa2YSRRRZe<|HuAHIwnL_S`mUj@nMYqRVB12i~&)^;vtKo3v(|9FqZmBT!e|Yet58 zpn13*jPS#s43P+x?86^RzCW(LP{eV-pG9nghnbyRgWu;)0fq%L4lprjsBK_i=;G92 gXh>q>#t_O6{-m_y#cpmsU<5IEy85}Sb4q9e0ApORQUCw| literal 0 HcmV?d00001 diff --git a/ground/openpilotgcs/src/plugins/config/images/flightmode_bg2.png b/ground/openpilotgcs/src/plugins/config/images/flightmode_bg2.png new file mode 100644 index 0000000000000000000000000000000000000000..8008aa805fabd058ada114d379c18871658e5776 GIT binary patch literal 866 zcmeAS@N?(olHy`uVBq!ia0y~yV2S{;RXEsyWT>QzKagT6cJd720D>Bhlnx-Dv%n*= zn1Laf2ZR}Yul^DM3QCr^MwA5SrEH2S`$ zi(^Q|oVRyvJ7h{3jy?Q-#A{8OpAO4glRA;GrUG`ZtRoAW#P}j4E_eyBD9UxUwpLB` zb;uPtm?qM4SZU?cRX1D$1SUF!2ppNq*zCyBCAOXWb*0yiKi{7j{kGX)uzB;*=zlX3 z%fqkT`}K4^Lk#P-eS1n@a57API%^?214B>m0VW0wp9Dq*5w#5r3|zuMpSE)9Ff<%u z5o2&jWa4I6upzr$?m))hc~4qZ>eVbKJ$ah=oZ-*m^`6@%&G9z!Eb^XYJz2(klhFe` zH>ZS+8tU84!|wY}`g-uvV-w)Vvn4ok>4x@yXweUw#OT;x2d8t7De=?dWkd%8XSN_@XMPm-T(v-S0_ zs7aqMKc3HDAg-*kK_jiUc+;dOA64F~{j}&jz{EFMdh(v1_Sc`kkGi|{fo{*71B<3C zpS)-KlWhyz8QvV8x$Euz+1B<}H-y|A69P{aJM%N#Siad)ZsuH|v+E}vZ<~Es;)j?b z!|69Ulh|Kvdp~(e_Nv#D=g5=^B`a)ThzN^+e!sBP%6k6`zHpZW#tl9D{EJHZcSK2- zh%QzH%9~AobL6Uj=Z+*pVC&9T9EWgCx*e&`TrNd4$}_gg)WZPU{Sd}7^2 z$A3M0^5e^o6BC>nmg$xHmi{raul}smZcxY6?OIvzi^)PKPNs_C^kHQufx*+&&t;ucLK6U|=5<;C literal 0 HcmV?d00001 diff --git a/ground/openpilotgcs/src/plugins/config/images/flightmode_bg3.png b/ground/openpilotgcs/src/plugins/config/images/flightmode_bg3.png new file mode 100644 index 0000000000000000000000000000000000000000..4791cab01eb9930a175420821cc93c842ff0d4f8 GIT binary patch literal 1278 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 S?aE32Jb>Wl=i1;x&iOBB31A8U literal 0 HcmV?d00001 diff --git a/ground/openpilotgcs/src/plugins/config/images/flightmode_bg6.png b/ground/openpilotgcs/src/plugins/config/images/flightmode_bg6.png new file mode 100644 index 0000000000000000000000000000000000000000..05a095495b10087a1617dc6b78802db51139730e GIT binary patch literal 2300 zcma)8c|6o>7yr$IY$J+7W6De1F`49+DV4Gh${I75EMeSC))CzqG{4fTbSGl2EZ=iJ=bT$kXKfVaG~@sPP{i9> zx&Q!_AbIO-la}1))GZw)3{Ek}yKR$D?6!cL5?MCfmPi2rSA|~(a;AT6yW~?n%8C%> z8b*qW@rw)uVq#(pFNTsS{(j+shGCIGIbV)z0Km4t@Rq0DuCV6E$bTaPk)2<~YWf!j z(8m7uH|pv77j!e6?ztgr_-GZ|%AF;tz375#ZAnf{%ZmEa+}aek(*5p+s=Qpg!o$|u z*c#qrOT1z$yd}Y<$o?EledZ5UgQ&Q#+@Y>KZzogJ?!4S_y`$5{S-YMuP0g)#Q%ui` zz1Onh0|=t{;z#1m5ZBHRUHg8<1-ucjtxfmR4mnhgth zNAc_fAMxvhMsK14Wo6~mRBNfsn>TOTw!8V>l5jVNeo5$ovCp-S~`FR5qUIM8A zjb{-3PBd^fjpx}P9iNLTHlUBt9s5!CcJ56Po67^I)o|#V8Mad60om5)s4pdx><7>a zEl)7HIbt(vdepi=PoDJ@Or#GI@X>JVH`_l>>MUgrBYJ#KgtD;52@z5g9jgLPJ7;`` z(NFNmx@}-)m;9r!R=!}xrAhh<&mHGy8h(9#yW;ns9tPD#?xytVs!6mw%b(3rA88hK ztV;WWRpB-d-qUI}f!JfRt@%TUUf&JoeIoFLlMP^GN?_zs+;dqDWAP!I(}Xm}Xj|yX z4Adgl_0K~waO#GBZfb&em{!(rIju2w%l$=iuPo<4Vxzcj z`Q^oyPobDR1EJpvJcK@zhH7<5~FZq9)v2IQmb#yxy=e!JA>P`zKC#kNz@a(NU99+rA9zl8~h z-lLprPz+@~ho?w&8F8$N$%SBNRZ+REO?TV3!rHgVz4r8X9Af?A?|s?K>Jcqp*hKyL zt3`czUatE=6JQ5D%Shbz4lk;LEfhxWBptrr7lb`H$XIM`Ur+N4kqNGe1nZ=CXC?5< zPMLhB={!y=&yK!3tmp5ZkA;(bscPaEJ2}X*bXpAwVh=V9A+!_w1Rbj=`%ZB~W>J&Y z8S}7-t+C|ZPzR$}u+^4P`--s`Vnx$ku+H(*xD=#9CC=`ZZ9P!@{iJUNs#plCpjTj~ z$oC?_ekImy$LeA+ub@HFB;EUcv)T0m6IdM6 zjD&1zaFAJ(vPwRuhGWx*=1@nnsCQ|P77CXXxZ}lD91FZ?-ari;r4!-b_RFj11Qc-4 zRoZ)$aG@+SB5Mn;h8qON8+Lr%8hkC4so+Bfk4kV=kl?y|0`W9eqhchv7keS8T)fk9 z4z*YqgP*#J z(AC_h8NjpfmUsu!z#ig6Wt1QmLe~_YAWnGU6W<}{MMnvTFdG?d?fp3Jp1tp$Kk-M9 z)YnY(=i}}s@L?JCl$3pxR!yO4(swzoW$@#m0)gf-I`Hyll#9v*&e}88crU40lzbzEA4z3{>Ffgwa%} zpZwa&maWM}F@c~f-)O5dWbiG`GkWw6^QQ!1FE`tIp)!LiN!N!~UErOs%qzP?nNHV#b%*#)nG?W6c%AQz}&Knltsc z&x42#X#S@>xL(|&ET)%_ES?GtNs9SA_{^kH{+)|gSs~5yVz|a zz@%%?c;z)r0!c{$lw6uCw3+^d7mX>UB=94-c4g7G59Yjl!<(Mu(SEd4&o>IbuS`4b zT5~>zm2GuTUEUi)QQpu;GKlkK7aFwkyP-l!CbyIj6GIk<7|--Sv1fb z!GCNzf5)j}U4NqyRV*_{`D8O~B0H(2hnDBW}Zuv2$v1IfM1Ow>t~jDvx5Ni)s$ZV9-8gAklrtl^5vN&kN0{@-}sgz^7AmQn0r SDVA(10N(1XWwp8QwSNFS&}UZw literal 0 HcmV?d00001