diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml index de0e299eb..4a7416899 100644 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml @@ -84,6 +84,10 @@ Item { // property real bar_width: (info_bg.height + info_bg.width) / 110 + property int satsInView: String(GPSSatellites.SatsInView).charCodeAt(0) + property variant gps_tooltip: "Altitude : "+GPSPositionSensor.Altitude +"m\n"+ + "H/V/P DOP : "+GPSPositionSensor.HDOP+"/"+GPSPositionSensor.VDOP+"/"+GPSPositionSensor.PDOP+"m\n"+ + satsInView+" Sats in view" Repeater { id: satNumberBar @@ -97,6 +101,10 @@ Item { width: Math.round(bar_width) radius: width / 4 + TooltipArea { + text: gps_tooltip + } + x: Math.round((bar_width*4.5) + (bar_width * 1.6 * index)) height: bar_width * index * 0.6 y: (bar_width*8) - height @@ -109,6 +117,10 @@ Item { sceneSize: info.sceneSize elementName: "gps-mode-text" + TooltipArea { + text: gps_tooltip + } + Text { property int satNumber : String(GPSPositionSensor.Satellites).charCodeAt(0) @@ -127,6 +139,10 @@ Item { elementName: "gps-icon" width: scaledBounds.width * sceneItem.width height: scaledBounds.height * sceneItem.height + + TooltipArea { + text: gps_tooltip + } } // Waypoint Info (Top) @@ -370,6 +386,10 @@ Item { Rectangle { anchors.fill: parent + TooltipArea { + text: "Reset consumed energy" + } + MouseArea { id: reset_consumed_energy_mouseArea; anchors.fill: parent; @@ -418,6 +438,10 @@ Item { y: Math.floor(scaledBounds.y * sceneItem.height) visible: SystemAlarms.Alarm_PathPlan != 1 + TooltipArea { + text: "Reset distance counter" + } + MouseArea { id: total_dist_mouseArea2; anchors.fill: parent; cursorShape: Qt.PointingHandCursor; onClicked: reset_distance()} Text { diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Panels.qml b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Panels.qml index de901798f..24806a0db 100644 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Panels.qml +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Panels.qml @@ -241,7 +241,11 @@ Item { elementName: "close-panel-mousearea" sceneSize: panels.sceneSize y: Math.floor(scaledBounds.y * sceneItem.height) - z: close_bg.z+100 + z: close_bg.z+100 + + TooltipArea { + text: show_panels == true ? "Close panels" : "Open panels" + } MouseArea { id: hidedisp_close; @@ -315,6 +319,10 @@ Item { y: Math.floor(scaledBounds.y * sceneItem.height) z: rc_input_bg.z+1 + TooltipArea { + text: "RC panel" + } + MouseArea { id: hidedisp_rcinput; anchors.fill: parent; @@ -527,6 +535,10 @@ Item { Rectangle { anchors.fill: parent + TooltipArea { + text: "Reset consumed energy" + } + MouseArea { id: reset_panel_consumed_energy_mouseArea; anchors.fill: parent; @@ -581,11 +593,15 @@ Item { anchors.fill: parent //color: panels.batColors[SystemAlarms.Alarm_Battery] + TooltipArea { + text: "Reset consumed energy" + } + MouseArea { id: reset_panel_consumed_energy_mouseArea2; anchors.fill: parent; - visible: display_bat == true ? 1 : 0 cursorShape: Qt.PointingHandCursor; + visible: display_bat == true ? 1 : 0 onClicked: qmlWidget.resetConsumedEnergy(); } @@ -636,6 +652,10 @@ Item { y: Math.floor(scaledBounds.y * sceneItem.height) z: battery_bg.z+6 + TooltipArea { + text: "Battery panel" + } + MouseArea { id: hidedisp_battery; anchors.fill: parent; @@ -816,8 +836,8 @@ Item { MouseArea { id: idButton_oplm_mousearea; anchors.fill: parent; + cursorShape: Qt.PointingHandCursor; visible: display_oplm == true ? 1 : 0 - cursorShape: display_oplm == true ? Qt.PointingHandCursor : Qt.ArrowCursor onClicked: select_oplm(index) } @@ -897,6 +917,10 @@ Item { y: Math.floor(scaledBounds.y * sceneItem.height) z: oplm_bg.z + TooltipArea { + text: "Link panel" + } + MouseArea { id: hidedisp_oplm; anchors.fill: parent; @@ -1139,6 +1163,10 @@ Item { y: Math.floor(scaledBounds.y * sceneItem.height) z: system_bg.z+1 + TooltipArea { + text: "System panel" + } + MouseArea { id: hidedisp_system; anchors.fill: parent; diff --git a/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadgetwidget.cpp b/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadgetwidget.cpp index 616328091..906523bcb 100644 --- a/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadgetwidget.cpp +++ b/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadgetwidget.cpp @@ -60,6 +60,7 @@ PfdQmlGadgetWidget::PfdQmlGadgetWidget(QWindow *parent) : "PathDesired" << "AltitudeHoldDesired" << "GPSPositionSensor" << + "GPSSatellites" << "GCSTelemetryStats" << "SystemAlarms" << "NedAccel" <<