From 01eb65a2b09381f751175c0c643b701702a6e0a7 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Mon, 15 Jun 2020 10:33:05 -0700 Subject: [PATCH] Common control for Pattern tab bar --- qgcimages.qrc | 4 ++++ qgroundcontrol.qrc | 2 ++ resources/PatternCamera.png | Bin 0 -> 2038 bytes resources/PatternGrid.png | Bin 0 -> 460 bytes resources/PatternPresets.png | Bin 0 -> 15426 bytes resources/PatternTerrain.png | Bin 0 -> 8736 bytes .../TransectStyleComplexItemTabBar.qml | 18 ++++++++++++++++++ 7 files changed, 24 insertions(+) create mode 100644 resources/PatternCamera.png create mode 100644 resources/PatternGrid.png create mode 100644 resources/PatternPresets.png create mode 100644 resources/PatternTerrain.png create mode 100644 src/PlanView/TransectStyleComplexItemTabBar.qml diff --git a/qgcimages.qrc b/qgcimages.qrc index 75fbb02ee..317c55a45 100644 --- a/qgcimages.qrc +++ b/qgcimages.qrc @@ -125,6 +125,10 @@ src/AutoPilotPlugins/PX4/Images/no-logging.svg src/AutoPilotPlugins/PX4/Images/ObjectAvoidance.svg src/ui/toolbar/Images/PaperPlane.svg + resources/PatternCamera.png + resources/PatternGrid.png + resources/PatternPresets.png + resources/PatternTerrain.png src/FlightMap/Images/PiP.svg src/FlightMap/Images/pipHide.svg src/FlightMap/Images/pipResize.svg diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc index 35ab7cff0..978507ce5 100644 --- a/qgroundcontrol.qrc +++ b/qgroundcontrol.qrc @@ -181,6 +181,8 @@ src/PlanView/TakeoffItemMapVisual.qml src/QmlControls/ToolStrip.qml src/PlanView/TransectStyleComplexItemStats.qml + src/PlanView/TransectStyleComplexItemTabBar.qml + src/PlanView/TransectStyleComplexItemTerrainFollow.qml src/QmlControls/VehicleRotationCal.qml src/QmlControls/VehicleSummaryRow.qml src/QmlControls/VerticalFactValueGrid.qml diff --git a/resources/PatternCamera.png b/resources/PatternCamera.png new file mode 100644 index 0000000000000000000000000000000000000000..cc784b2e028b0e6ebf13c1679c807672fa1fca15 GIT binary patch literal 2038 zcmbtVc~Fzr77t;`1|&v644^|4wepFz#6XoL1dvb^mrDFVmP93_C4vhIaRCxT*cWZV zhZGP5#E`^*&;WsgMoX0RHbzrQ>T z@*T}>AR{8qe~&L>#FPMoBe>1Cc#!3izmM0!gu(Yip0O*VY!N4Rml>9?woNASi@hqK(sbs9xuoXj4J6$B1h-`V z!mpyVJWXP^{#%NdHRG0=n@Pv9%zu!?~xmq%iQ=o`5_Sr8xdc=`HQKk|})* zngo!(%Es_gWcW~5Ji6wwV+K*ai(tjyyg4YSs}9gchrlts*9mFuR1mers6a+#qX0pE z&ynJm@2rEt{7CK*2Q`cYaDY8uKthlJGo|OPb+-(TtvTpfVVi+1MKyb|K{oxG6+8g6 zuQ#%~hc0uF;pkKh&q0iX;2{S*7)qdb%D0)CTzXFTW9wpvQ&p$Hi?bfr?=nst27gep zL6g$_YVEnD52MPh53G5|Yl4Qv#VMakDVH%Z^1=-rb=`_|Mg`nIf?&@_)<4pD6C|9;Y6Zq@87-SkQ)%s*`Pd>HQuM=%tajq zusH$>>1O3F!)Ox0{ZwID>si&u%M*hm(QngtTNf$a#2rDUhb7t_B)fAtg3!&~(-LgN z4BdI&jVzBN46 zq`vLfSIkYFQ|qfJxKPp>P(Lv=|L96;?VSGO#}YOl*pjrG^P#`(;nuN2pZOy9hRIu6 z=Z1{vw?WkUD<*C7@=a6H@aI~SvmD-SW|QGYIk&UUZD45V;yc3aq`hSK2zVzh+Rm}6q1;9vQjKdOIVv)GiEAnRRbex2+@gL zJmbwc83xgnLxzZzMum{Tk)7-6!GZ13Q<>cS-%T)=o3f%dYzHnG*J{$zXm|X_Zvl6oed^l3R_^ zst>#b*@@eM_RBa5!|M;XSko8Cx2q}g5(9?tXi0<_M89?R$?b3>D`;8Q4_}S!HldX#&lu1 zA`y#Dv>kRO3>xb;9B{!+i@Jy9FQ+iz8+uQ3Y2!hI!|6gSdrn|u?U+8-z z+wsBV@ox%S@N|Mz`kR?^t*?I%EIYZyD)T{tTO!%kytKL5?%L6Y)}pH3H&2$9mh?G^ zq555$WMC1*+q3cUYvtd@vHTb)pxl-+eI(o?C3Rw9d#d&>ORB)esM~(oF89&J2 z3XOfd83tc+_fG;P`}bQkIUqa^y<8hNGq#_$iPCb?0!r=*xg*b*4Z{45=p~xN1$MLI zqimaqzZ_HYC>J7<3F^+?`X%RS1B(f$hWtEw~Z*vQgP4X-GqN@Dfdb@dd`cO}Tj2!i5x4vmz3 zVXs)@n11cdx#b48jXyKl&=X;l`N^_bsZ>7cSo%Dqh?i#*!?r`uSrEyslgstTp#CP2!H_%5)W$^z8sdH}8 literal 0 HcmV?d00001 diff --git a/resources/PatternGrid.png b/resources/PatternGrid.png new file mode 100644 index 0000000000000000000000000000000000000000..736c89627e521363218f816bfff27d6e375b86c7 GIT binary patch literal 460 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 literal 0 HcmV?d00001 diff --git a/src/PlanView/TransectStyleComplexItemTabBar.qml b/src/PlanView/TransectStyleComplexItemTabBar.qml new file mode 100644 index 000000000..597ec9657 --- /dev/null +++ b/src/PlanView/TransectStyleComplexItemTabBar.qml @@ -0,0 +1,18 @@ +import QtQuick 2.3 + +import QGroundControl 1.0 +import QGroundControl.ScreenTools 1.0 +import QGroundControl.Controls 1.0 + +QGCTabBar { + id: tabBar + anchors.left: parent.left + anchors.right: parent.right + + Component.onCompleted: currentIndex = QGroundControl.settingsManager.planViewSettings.displayPresetsTabFirst.rawValue ? 2 : 0 + + QGCTabButton { icon.source: "/qmlimages/PatternGrid.png"; icon.height: ScreenTools.defaultFontPixelHeight } + QGCTabButton { icon.source: "/qmlimages/PatternCamera.png"; icon.height: ScreenTools.defaultFontPixelHeight } + QGCTabButton { icon.source: "/qmlimages/PatternTerrain.png"; icon.height: ScreenTools.defaultFontPixelHeight } + QGCTabButton { icon.source: "/qmlimages/PatternPresets.png"; icon.height: ScreenTools.defaultFontPixelHeight } +} -- 2.22.0