Copy from table / log level default / some settings tab improvements[…

…CPP-281][CPP-403][CPP-483][CPP-474][CPP-476] (#257) Copying data from all tables (AFAICT) via OS native copy command. Upon selecting or copying a row all other table rows deselect. (Not including observation tab tables https://swift-nav.atlassian.net/browse/CPP-517) Changes default log level from INFO to WARNING to match old console. Fixes column headers for Solution TableCPP-483 Allows user to select data from Settings tab textfield via mouseCPP-474 Fixes minimum widths and column headers for baseline table CPP-476 Implements slideview for settings tab. Implements column resizing for settings table Switches buttons in settings tab to icon over text and flat buttons.
swift-nav · Dec 11, 2021 · 00b175c · 00b175c
1 parent 04376c2
commit 00b175c
Show file tree

Hide file tree

Showing 20 changed files with 445 additions and 693 deletions.
diff --git a/console_backend/src/cli_options.rs b/console_backend/src/cli_options.rs
@@ -104,7 +104,7 @@ pub struct CliOptions {
     #[clap(long = "sbp-log")]
     pub sbp_log: Option<CliSbpLogging>,
 
-    /// Set Console Log Level Filter. Default: INFO.
+    /// Set Console Log Level Filter. Default: WARNING.
     #[clap(long = "log-level")]
     pub log_level: Option<CliLogLevel>,
 
@@ -305,7 +305,7 @@ pub fn handle_cli(opt: CliOptions, conn_manager: &ConnectionManager, shared_stat
     let log_level = if let Some(log_level_) = opt.log_level {
         (*log_level_).clone()
     } else {
-        LogLevel::INFO
+        LogLevel::WARNING
     };
     shared_state.set_log_level(log_level);
     let mut shared_data = shared_state.lock();

diff --git a/console_backend/src/shared_state.rs b/console_backend/src/shared_state.rs
@@ -448,7 +448,7 @@ pub struct LogPanelState {
 impl LogPanelState {
     fn new() -> LogPanelState {
         LogPanelState {
-            log_level: LogLevel::INFO,
+            log_level: LogLevel::WARNING,
         }
     }
 }

diff --git a/resources/AdvancedTabComponents/MetricsMonitor.qml b/resources/AdvancedTabComponents/MetricsMonitor.qml
@@ -1,4 +1,5 @@
 import "../Constants"
+import "../TableComponents"
 import Qt.labs.qmlmodels 1.0
 import QtCharts 2.2
 import QtQuick 2.15
@@ -7,9 +8,7 @@ import QtQuick.Layouts 1.15
 import SwiftConsole 1.0
 
 Item {
-    property variant columnWidths: [width / 2, width / 2]
     property real mouse_x: 0
-    property int selectedRow: -1
     property variant entries: []
     property bool csacReceived: false
 
@@ -29,6 +28,8 @@ Item {
         }
 
         Rectangle {
+            property variant columnWidths: [width / 2, width / 2]
+
             Layout.fillWidth: true
             Layout.fillHeight: true
             clip: true
@@ -93,25 +94,14 @@ Item {
 
             }
 
-            TableView {
+            SwiftTableView {
                 id: tableView
 
-                columnSpacing: -1
-                rowSpacing: -1
-                columnWidthProvider: function(column) {
-                    return columnWidths[column];
-                }
-                reuseItems: true
-                boundsBehavior: Flickable.StopAtBounds
                 anchors.top: horizontalHeader.bottom
-                width: parent.width
-                height: parent.height - horizontalHeader.height
-
-                ScrollBar.horizontal: ScrollBar {
-                }
-
-                ScrollBar.vertical: ScrollBar {
-                }
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.bottom: parent.bottom
+                columnWidths: parent.columnWidths
 
                 model: TableModel {
                     id: tableModel
@@ -128,37 +118,6 @@ Item {
 
                 }
 
-                delegate: Rectangle {
-                    implicitHeight: Constants.genericTable.cellHeight
-                    implicitWidth: tableView.columnWidthProvider(column)
-                    border.color: Constants.genericTable.borderColor
-                    color: row == selectedRow ? Constants.genericTable.cellHighlightedColor : Constants.genericTable.cellColor
-
-                    Label {
-                        width: parent.width
-                        horizontalAlignment: Text.AlignLeft
-                        clip: true
-                        font.family: Constants.genericTable.fontFamily
-                        font.pointSize: Constants.largePointSize
-                        text: model.display
-                        elide: Text.ElideRight
-                        padding: Constants.genericTable.padding
-                    }
-
-                    MouseArea {
-                        width: parent.width
-                        height: parent.height
-                        anchors.centerIn: parent
-                        onPressed: {
-                            if (selectedRow == row)
-                                selectedRow = -1;
-                            else
-                                selectedRow = row;
-                        }
-                    }
-
-                }
-
             }
 
             Timer {

diff --git a/resources/AdvancedTabComponents/NetworkInfo.qml b/resources/AdvancedTabComponents/NetworkInfo.qml
@@ -1,4 +1,5 @@
 import "../Constants"
+import "../TableComponents"
 import Qt.labs.qmlmodels 1.0
 import QtQuick 2.15
 import QtQuick.Controls 2.15
@@ -9,18 +10,14 @@ ColumnLayout {
     property variant entries: []
     property var columnWidths: [parent.width / 5, parent.width / 5, parent.width / 5, parent.width / 5, parent.width / 5]
     property real mouse_x: 0
-    property int selectedRow: -1
 
     spacing: Constants.networking.layoutSpacing
 
     HorizontalHeaderView {
         id: horizontalHeader
 
-        Layout.fillWidth: true
-        Layout.preferredHeight: Constants.genericTable.cellHeight
         interactive: false
-        syncView: table
-        z: Constants.genericTable.headerZOffset
+        syncView: tableView
 
         delegate: Rectangle {
             implicitWidth: columnWidths[index]
@@ -32,7 +29,7 @@ ColumnLayout {
                 anchors.centerIn: parent
                 horizontalAlignment: Text.AlignHCenter
                 verticalAlignment: Text.AlignVCenter
-                text: table.model.columns[index].display
+                text: tableView.model.columns[index].display
                 elide: Text.ElideRight
                 clip: true
                 font.family: Constants.genericTable.fontFamily
@@ -51,12 +48,12 @@ ColumnLayout {
                     if (pressed) {
                         var delta_x = (mouseX - mouse_x);
                         var next_idx = (index + 1) % 5;
-                        var min_width = table.width / 10;
+                        var min_width = tableView.width / 10;
                         if (columnWidths[index] + delta_x > min_width && columnWidths[next_idx] - delta_x > min_width) {
                             columnWidths[index] += delta_x;
                             columnWidths[next_idx] -= delta_x;
                         }
-                        table.forceLayout();
+                        tableView.forceLayout();
                     }
                 }
             }
@@ -78,27 +75,12 @@ ColumnLayout {
 
     }
 
-    TableView {
-        id: table
+    SwiftTableView {
+        id: tableView
 
-        columnSpacing: -1
-        rowSpacing: -1
-        columnWidthProvider: function(column) {
-            return columnWidths[column];
-        }
-        reuseItems: true
-        boundsBehavior: Flickable.StopAtBounds
         Layout.fillWidth: true
         Layout.fillHeight: true
-        onWidthChanged: {
-            table.forceLayout();
-        }
-
-        ScrollBar.horizontal: ScrollBar {
-        }
-
-        ScrollBar.vertical: ScrollBar {
-        }
+        columnWidths: parent.columnWidths
 
         model: TableModel {
             rows: [Constants.networking.defaultList]
@@ -125,37 +107,6 @@ ColumnLayout {
 
         }
 
-        delegate: Rectangle {
-            implicitHeight: Constants.genericTable.cellHeight
-            implicitWidth: table.columnWidthProvider(column)
-            border.color: Constants.genericTable.borderColor
-            color: row == selectedRow ? Constants.genericTable.cellHighlightedColor : Constants.genericTable.cellColor
-
-            Label {
-                width: parent.width
-                horizontalAlignment: Text.AlignLeft
-                clip: true
-                font.family: Constants.genericTable.fontFamily
-                font.pointSize: Constants.largePointSize
-                text: model.display
-                elide: Text.ElideRight
-                padding: Constants.genericTable.padding
-            }
-
-            MouseArea {
-                width: parent.width
-                height: parent.height
-                anchors.centerIn: parent
-                onPressed: {
-                    if (selectedRow == row)
-                        selectedRow = -1;
-                    else
-                        selectedRow = row;
-                }
-            }
-
-        }
-
     }
 
     Timer {
@@ -174,7 +125,7 @@ ColumnLayout {
                 new_row[Constants.networking.columnHeaders[2]] = entries[idx][2];
                 new_row[Constants.networking.columnHeaders[3]] = entries[idx][3];
                 new_row[Constants.networking.columnHeaders[4]] = entries[idx][4];
-                table.model.setRow(idx, new_row);
+                tableView.model.setRow(idx, new_row);
             }
         }
     }

diff --git a/resources/AdvancedTabComponents/ThreadStateTable.qml b/resources/AdvancedTabComponents/ThreadStateTable.qml
@@ -1,4 +1,5 @@
 import "../Constants"
+import "../TableComponents"
 import Qt.labs.qmlmodels 1.0
 import QtCharts 2.2
 import QtQuick 2.15
@@ -9,7 +10,6 @@ import SwiftConsole 1.0
 Item {
     property variant columnWidths: [parent.width / 3, parent.width / 3, parent.width / 3]
     property real mouse_x: 0
-    property int selectedRow: -1
     property variant entries: []
 
     HorizontalHeaderView {
@@ -75,28 +75,14 @@ Item {
 
     }
 
-    TableView {
+    SwiftTableView {
         id: tableView
 
-        columnSpacing: -1
-        rowSpacing: -1
-        columnWidthProvider: function(column) {
-            return columnWidths[column];
-        }
-        reuseItems: true
-        boundsBehavior: Flickable.StopAtBounds
         anchors.top: horizontalHeader.bottom
-        width: parent.width
-        height: parent.height - horizontalHeader.height
-        onWidthChanged: {
-            tableView.forceLayout();
-        }
-
-        ScrollBar.horizontal: ScrollBar {
-        }
-
-        ScrollBar.vertical: ScrollBar {
-        }
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.bottom: parent.bottom
+        columnWidths: parent.columnWidths
 
         model: TableModel {
             id: tableModel
@@ -117,37 +103,6 @@ Item {
 
         }
 
-        delegate: Rectangle {
-            implicitHeight: Constants.genericTable.cellHeight
-            implicitWidth: tableView.columnWidthProvider(column)
-            border.color: Constants.genericTable.borderColor
-            color: row == selectedRow ? Constants.genericTable.cellHighlightedColor : Constants.genericTable.cellColor
-
-            Label {
-                width: parent.width
-                horizontalAlignment: Text.AlignLeft
-                clip: true
-                font.family: Constants.genericTable.fontFamily
-                font.pointSize: Constants.largePointSize
-                text: model.display
-                elide: Text.ElideRight
-                padding: Constants.genericTable.padding
-            }
-
-            MouseArea {
-                width: parent.width
-                height: parent.height
-                anchors.centerIn: parent
-                onPressed: {
-                    if (selectedRow == row)
-                        selectedRow = -1;
-                    else
-                        selectedRow = row;
-                }
-            }
-
-        }
-
     }
 
     Timer {

diff --git a/resources/BaselineTab.qml b/resources/BaselineTab.qml
@@ -17,7 +17,7 @@ MainTab {
         height: parent.height
 
         Rectangle {
-            SplitView.minimumWidth: Constants.baselineTable.width
+            SplitView.minimumWidth: Constants.baselineTable.minimumWidth
             SplitView.fillHeight: true
 
             BaselineTabComponents.BaselineTable {
@@ -26,6 +26,7 @@ MainTab {
         }
 
         BaselineTabComponents.BaselinePlot {
+            SplitView.minimumWidth: Constants.baselinePlot.minimumWidth
             SplitView.fillWidth: true
             SplitView.fillHeight: true
         }