Filtred charts

src/Plugins/Tools/Signals/README.md

@@ -4,4 +4,4 @@ page: plugins
 
 # Signals
 
-QML widget to show live chart of defined UAV physical values for easy tuning.
+QML widget to show live chart of selected UAV physical values with the ability to use filters for easy tuning and analysis.

src/Plugins/Tools/Signals/Signals.qml

@@ -27,177 +27,161 @@ import QtCore
 
 import Apx.Common
 
-
 Rectangle {
-    id: control
+    id: sgControl
 
     implicitHeight: layout.implicitHeight
-    implicitWidth: layout.implicitWidth
-
+    implicitWidth: Style.buttonSize * 15
     border.width: 0
     color: "#000"
 
-    ColumnLayout {
-        id: layout
-        anchors.fill: parent
-        spacing: 0
+    readonly property var pages: sgMenu.getActivePages()
+    readonly property var activeSet: sgMenu.getActiveSet()
+
+    onActiveSetChanged: updateModels()
+    Component.onCompleted: {
+        if (buttonGroup.buttons.length <= 0)
+            return;
+        if (buttonGroup.checkedButton == null)
+            buttonGroup.checkedButton = buttonGroup.buttons[0]; // check button #1
+    }
 
-        SignalsView {
-            id: signals
-            facts: []
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            Layout.minimumHeight: 20
-            Layout.preferredHeight: 130*ui.scale
+    Connections {
+        target: apx.fleet.current.mandala
+        function onTelemetryDecoded() {
+            if (pages.length <= 0)
+                return;
+            for (var i = 0; i < pages.length; ++i)
+                pages[i].updateChartsValues();
         }
+    }
 
-        TextInput {
-            id: textInput
+    function updateModels() {
+        pinnedModel.updateModel(sgMenu.getPinnedPages())
+        buttonsModel.updateModel(sgMenu.getActivePages())
+    }
 
-            Layout.fillWidth: true
-            Layout.minimumHeight: Style.fontSize
+    function checkScrMatches(val) {
+        var matches = false;
+        for (var i = 0; i < buttonGroup.buttons.length; ++i)
+            if (buttonGroup.buttons[i].getScrMatches(val))
+                matches = true;
+        return matches;
+    }
 
-            // clip: true
-            // focus: true
-            visible: false
+    function allowResetChart(num) {
+        for(var i = 0; i < pinnedRepeater.count; ++i) {
+            if(num === pinnedRepeater.itemAt(i).num)
+                pinnedRepeater.itemAt(i).allowReset()
+        }
+    }
 
-            horizontalAlignment: Text.AlignRight
-            verticalAlignment: Text.AlignVCenter
+    function clearButtonGroup() {
+        buttonGroup.buttons = [];
+        buttonGroup.checkedButton = null;
+    }
 
-            font: apx.font_narrow(Style.fontSize)
+    ColumnLayout {
+        id: layout
+        anchors.fill: parent
 
-            color: activeFocus?Material.color(Material.Yellow):Material.primaryTextColor
-            text: "est.air.airspeed"
+        SignalsPinnedModel {
+            id: pinnedModel
+        }
 
-            activeFocusOnTab: true
-            selectByMouse: true
+        Repeater {
+            id: pinnedRepeater
+            model: pinnedModel
+        }
 
-            onEditingFinished: {
-                updateFacts()
-            }
-            onActiveFocusChanged: {
-                if(activeFocus)selectAll();
-            }
-            onVisibleChanged: if(visible)forceActiveFocus()
-            Component.onCompleted: updateFacts()
-
-            property var facts: []
-            function updateFacts()
-            {
-                var flist=[]
-                var list=textInput.text.split(',')
-                for(var i=0;i<list.length;++i){
-                    var f=list[i]
-                    var fact={}
-                    if(eval(f)==undefined) continue
-                    fact.title=f
-                    fact.name=f
-                    fact.descr=f
-                    fact.opts={}
-                    fact.opts.color=Material.color(Material.Blue+i*2)
-                    flist.push(fact)
+        SignalsChartItem {
+            id: mainChartArea
+
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+            Layout.minimumHeight: 20
+            Layout.preferredHeight: 110 * ui.scale // 130 * ui.scale
+            clip: true
+
+            Rectangle {
+                anchors.right: parent.right
+                anchors.bottom: parent.bottom
+                anchors.rightMargin: 4 * ui.scale
+                visible: lblMainSet.text !== ""
+                radius: ui.scale
+                color: "#30ffffff"
+                opacity: 0.7
+
+                implicitWidth: lblMainSet.implicitWidth + 10 * ui.scale
+                implicitHeight: lblMainSet.implicitHeight + 4 * ui.scale
+
+                Label {
+                    id: lblMainSet
+                    anchors.centerIn: parent
+                    text: sgControl.activeSet ? sgControl.activeSet.title : ""
+                    font: mainChartArea.labelFont
                 }
-                if(JSON.stringify(textInput.facts)==JSON.stringify(flist))
-                    return
-                textInput.facts=flist
+            }
 
-                if(plusButton.checked)
-                    signals.facts=flist
+            Label {
+                anchors.centerIn: parent
+                visible: btnRepeater.count <= 0
+                text: qsTr("No pages in the active set")
+                font: mainChartArea.labelFont
+                color: Material.secondaryTextColor
+                background: Rectangle {
+                    color: sgControl.color
+                }
             }
         }
 
         ButtonGroup {
             id: buttonGroup
-            //buttons: bottomArea.buttons
+
+            onCheckedButtonChanged: {
+                if (checkedButton)
+                    return;
+                mainChartArea.allowReset();    
+                mainChartArea.ciPageFact = null;
+            }
         }
 
         RowLayout {
             id: bottomArea
             Layout.fillWidth: true
             Layout.margins: Style.spacing
+            Layout.maximumHeight: 24 * ui.scale
             spacing: 3
-            Layout.maximumHeight: 24*ui.scale
-            SignalButton {
-                text: "R"
-                values: [ mandala.cmd.att.roll, mandala.est.att.roll ]
-            }
-            SignalButton {
-                text: "P"
-                values: [ mandala.cmd.att.pitch, mandala.est.att.pitch ]
-            }
-            SignalButton {
-                text: "Y"
-                values: [ mandala.cmd.pos.bearing, mandala.cmd.att.yaw, mandala.est.att.yaw ]
-            }
-            SignalButton {
-                text: "Axy"
-                values: [ mandala.est.acc.x, mandala.est.acc.y ]
-            }
-            SignalButton {
-                text: "Az"
-                values: [ mandala.est.acc.z ]
-            }
-            SignalButton {
-                text: "G"
-                values: [ mandala.est.gyro.x, mandala.est.gyro.y, mandala.est.gyro.z ]
-            }
-            SignalButton {
-                text: "Pt"
-                values: [ mandala.est.pos.altitude, mandala.est.pos.vspeed, mandala.est.air.airspeed ]
-            }
-            SignalButton {
-                text: "Ctr"
-                values: [ mandala.ctr.att.ail, mandala.ctr.att.elv, mandala.ctr.att.rud, mandala.ctr.eng.thr, mandala.ctr.eng.prop, mandala.ctr.str.rud ]
+
+            SignalsButtonsModel {
+               id: buttonsModel
             }
-            SignalButton {
-                text: "RC"
-                values: [ mandala.cmd.rc.roll, mandala.cmd.rc.pitch, mandala.cmd.rc.thr, mandala.cmd.rc.yaw ]
+            Repeater {
+                id: btnRepeater
+                model: buttonsModel
             }
-            SignalButton {
-                text: "Usr"
-                values: [ mandala.est.usr.u1, mandala.est.usr.u2, mandala.est.usr.u3, mandala.est.usr.u4, mandala.est.usr.u5, mandala.est.usr.u6 ]
-            }
-
-            SignalButton {
-                id: plusButton
-                text: "+"
-                values: textInput.facts
-                onCheckedChanged: {
-                    if(!checked)
-                        textInput.visible=false
-                }
-                onPressed: {
-                    if(checked)
-                        textInput.visible=!textInput.visible
-                }
-            }
-
-            TextButton {
-                text: signals.speedFactorValue+"x"
-                onClicked: signals.changeSpeed()
+            IconButton {
+                iconName: "plus"
+                toolTip: qsTr("Edit chart configuration")
                 Layout.fillHeight: true
-                Layout.minimumWidth: height*3
+                Layout.minimumWidth: height
+                onClicked: sgMenu.trigger()
             }
         }
     }
 
-    property string currentPage: buttonGroup.checkedButton.text
-
-    Settings {
-        category: "signals"
-        property alias page: control.currentPage
-        property alias custom: textInput.text
+    SignalsMenu {
+        id: sgMenu
     }
-    Component.onCompleted: {
-        for(var i=0;i<buttonGroup.buttons.length;++i){
-            var b=buttonGroup.buttons[i]
-            if(b.text!==control.currentPage)continue
-            buttonGroup.checkedButton=b
-            break
-        }
-        if(buttonGroup.checkedButton==null){
-            buttonGroup.checkedButton=buttonGroup.buttons[0] //showPage("R")
-        }
+
+    Timer {
+        id: autosaveTimer
+        interval: 1000
+        onTriggered: sgMenu.saveSettings()
     }
 
+    Timer {
+        id: warnTimer
+        interval: 10000
+    }
 }

src/Plugins/Tools/Signals/SignalsButton.qml

@@ -0,0 +1,78 @@
+/*
+ * APX Autopilot project <http://docs.uavos.com>
+ *
+ * Copyright (c) 2003-2020, Aliaksei Stratsilatau <sa@uavos.com>
+ * All rights reserved
+ *
+ * This file is part of APX Ground Control.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.Material
+
+import Apx.Common
+
+TextButton {
+    id: sgBtn
+
+    property var pageFact: null
+    property string pageToolTip: pageFact ? pageFact.pageToolTip : ""
+    property bool pageWarning: pageFact ? pageFact.warnings : false
+    property var num: pageFact ? pageFact.num : -1
+
+    Layout.fillHeight: true
+    checkable: true
+    ButtonGroup.group: buttonGroup
+    text: pageFact ? pageFact.title.slice(0, 3) : getDefaultText()
+    textColor: checked ? Material.color(Material.Yellow) : Material.primaryTextColor
+    toolTip: pageFact ? pageFact.pageToolTip : ""
+    Material.background: pageWarning ? Material.color(Material.Orange) : sgBtn.color
+
+    Component.onCompleted: {
+        if(!pageFact)
+            return;
+        checked = pageFact.active    
+    } 
+    onCheckedChanged: {
+        if (!pageFact)
+            return;
+        if (checked)
+            mainChartArea.ciPageFact = pageFact;
+        // Check if set changed and model reset
+        if(buttonsModel.count === 0)
+            return;
+        pageFact.active = checked;
+    }
+
+    onPressed: {
+        if (!pageFact)
+            return;
+        if (checked)
+            pageFact.trigger();
+    }
+
+    onActivated: {
+        mainChartArea.allowReset()
+        mainChartArea.ciPageFact = Qt.binding(function () {
+            return pageFact;
+        });
+    }
+
+    function getDefaultText() {
+        return "#" + buttonGroup.buttons.indexOf(this);
+    }
+}