Merge branch 'main' of github.com:swift-nav/console_pp into john-michaelburke/copy-table

john-michaelburke · john-michaelburke · commit 6a6c57586888 · 2021-12-10T15:54:00.000-08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile.toml b/Makefile.toml
@@ -879,11 +879,13 @@ cd console_backend/tests && python ../../utils/bench_runner.py --frontend_mem --
 '''
 
 [tasks.newline-terminator]
+env = { EXCLUSION_PATTERNS = [".png", "docs", "resources/images"] }
 private = true
 script_runner = "python"
 script_extension = "py"
 script = '''
 import os
+import re
 import sys
 import subprocess
 def raises_exc(func):
@@ -900,6 +902,9 @@ try_open_text = lambda fn: lambda: (open(fn, "ta"), open(fn, "tr").read(4096))
 valid_file = lambda fn: os.path.getsize(fn) > 0 and not raises_exc(try_open_text(fn))
 no_trailing_lf = lambda fn: valid_file(fn) and not has_newline(fn)
 all_files = subprocess.check_output(["git", "ls-files"]).decode('utf8').splitlines()
+exclusion_substrings = os.environ.get("EXCLUSION_PATTERNS")
+exclusion_substrings = exclusion_substrings.split(";")
+all_files = [x for x in all_files if not any([re.match(".*"+y, x) for y in exclusion_substrings])]
 no_newline = list(map(append_newline, filter(no_trailing_lf, all_files)))
 footer = "*********************************************\n"
 err = "ERROR: " if dry_run else "Fixing "
diff --git a/console_backend/Cargo.toml b/console_backend/Cargo.toml
@@ -42,7 +42,7 @@ minreq = { version = "2.4.2", features = ["https"] }
 regex = { version = "1.5.4" }
 rust-ini = "0.17.0"
 sbp = { version = "4.0.3", features = ["json", "link", "swiftnav"] }
-sbp-settings = "0.5.0"
+sbp-settings = "0.6.0"
 env_logger = { version = "0.9", optional = true }
 mimalloc = { version = "0.1", default-features = false }
 
diff --git a/console_backend/src/main_tab.rs b/console_backend/src/main_tab.rs
@@ -4,7 +4,6 @@ use std::{
     time::{Duration, Instant},
 };
 
-use capnp::message::Builder;
 use chrono::Local;
 use log::error;
 use sbp::Sbp;
@@ -15,7 +14,7 @@ use crate::constants::{
 };
 use crate::output::{CsvLogging, SbpLogger};
 use crate::shared_state::{create_directory, SharedState};
-use crate::utils::{bytes_to_human_readable, refresh_loggingbar, serialize_capnproto_builder};
+use crate::utils::{refresh_loggingbar, refresh_loggingbar_recording};
 use crate::{client_sender::BoxedClientSender, shared_state::ConnectionState};
 use crate::{common_constants::SbpLogging, shared_state::SbpLoggingStatsState};
 
@@ -55,32 +54,6 @@ pub fn logging_stats_thread(
     })
 }
 
-pub fn refresh_loggingbar_recording(
-    client_sender: &BoxedClientSender,
-    size: u64,
-    duration: u64,
-    filename: Option<String>,
-) {
-    let mut builder = Builder::new_default();
-    let msg = builder.init_root::<crate::console_backend_capnp::message::Builder>();
-
-    let mut logging_bar_status = msg.init_logging_bar_recording_status();
-    logging_bar_status.set_recording_duration_sec(duration);
-    logging_bar_status.set_recording_size(&bytes_to_human_readable(size as u128));
-    if let Some(filename_) = filename {
-        logging_bar_status
-            .reborrow()
-            .get_recording_filename()
-            .set_filename(&filename_);
-    } else {
-        logging_bar_status
-            .reborrow()
-            .get_recording_filename()
-            .set_none(());
-    }
-    client_sender.send_data(serialize_capnproto_builder(builder));
-}
-
 pub struct MainTab {
     logging_directory: PathBuf,
     last_csv_logging: CsvLogging,
diff --git a/console_backend/src/utils.rs b/console_backend/src/utils.rs
@@ -178,6 +178,32 @@ pub fn refresh_loggingbar(client_sender: &BoxedClientSender, shared_state: &Shar
     client_sender.send_data(serialize_capnproto_builder(builder));
 }
 
+pub fn refresh_loggingbar_recording(
+    client_sender: &BoxedClientSender,
+    size: u64,
+    duration: u64,
+    filename: Option<String>,
+) {
+    let mut builder = Builder::new_default();
+    let msg = builder.init_root::<crate::console_backend_capnp::message::Builder>();
+
+    let mut logging_bar_status = msg.init_logging_bar_recording_status();
+    logging_bar_status.set_recording_duration_sec(duration);
+    logging_bar_status.set_recording_size(size);
+    if let Some(filename_) = filename {
+        logging_bar_status
+            .reborrow()
+            .get_recording_filename()
+            .set_filename(&filename_);
+    } else {
+        logging_bar_status
+            .reborrow()
+            .get_recording_filename()
+            .set_none(());
+    }
+    client_sender.send_data(serialize_capnproto_builder(builder));
+}
+
 pub fn signal_key_label(
     key: (SignalCodes, i16),
     extra: Option<&HashMap<i16, i16>>,
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
         }
diff --git a/resources/Constants/Constants.qml b/resources/Constants/Constants.qml
@@ -408,6 +408,7 @@ QtObject {
     }
 
     baselinePlot: QtObject {
+        readonly property int minimumWidth: 410
         readonly property int buttonSvgHeight: 15
         readonly property int navBarMargin: 10
         readonly property int navBarSpacing: 0
@@ -422,7 +423,7 @@ QtObject {
     }
 
     baselineTable: QtObject {
-        readonly property int width: 240
+        readonly property int minimumWidth: 240
         readonly property int defaultColumnWidth: 100
         readonly property color tableBorderColor: "#000000"
         readonly property int tableBorderWidth: 1
@@ -437,6 +438,7 @@ QtObject {
     }
 
     solutionPosition: QtObject {
+        readonly property int minimumWidth: 410
         readonly property int buttonSvgHeight: 15
         readonly property int navBarMargin: 10
         readonly property int navBarSpacing: 0
@@ -461,6 +463,7 @@ QtObject {
         readonly property int pauseButtonPadding: 0
         readonly property string pauseButtonTooltip: "Pause Log Panel"
         readonly property string playButtonTooltip: "Resume Log Panel"
+        readonly property string clearButtonTooltip: "Clear Log Panel"
         readonly property int logLevelMenuHeight: 100
         readonly property int dropdownButtonPadding: 0
         readonly property int dropdownButtonWidth: 20
@@ -483,7 +486,7 @@ QtObject {
     }
 
     solutionTable: QtObject {
-        readonly property int width: 240
+        readonly property int minimumWidth: 240
         readonly property int defaultColumnWidth: 100
         readonly property color tableBorderColor: "#000000"
         readonly property int tableBorderWidth: 1
@@ -630,6 +633,7 @@ QtObject {
         readonly property string swiftLogoPath: "qrc:/images/icon.png"
         readonly property string swiftLogoWidePath: "qrc:/images/swiftLogoWide.svg"
         readonly property string folderPath: "qrc:/images/fontawesome/folder-regular.svg"
+        readonly property string xPath: "qrc:/images/iconic/x.svg"
     }
 
     insSettingsPopup: QtObject {
diff --git a/resources/LogPanel.qml b/resources/LogPanel.qml
@@ -1,9 +1,10 @@
-import "./Constants"
-import "./TableComponents"
+import "BaseComponents"
+import "Constants"
 import Qt.labs.qmlmodels 1.0
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import SwiftConsole 1.0
+import "TableComponents"
 
 Item {
     property var logEntries: []
@@ -30,13 +31,43 @@ Item {
             anchors.rightMargin: Constants.logPanel.pauseButtonRightMargin
             z: Constants.logPanel.zAboveTable
 
-            RoundButton {
-                id: baselinePauseButton
+            SwiftButton {
+                width: Constants.logPanel.pauseButtonWidth
+                height: Constants.logPanel.pauseButtonWidth
+                padding: Constants.logPanel.pauseButtonPadding
+                icon.width: Constants.logPanel.pauseButtonWidth / 3
+                icon.height: Constants.logPanel.pauseButtonWidth / 3
+                icon.source: Constants.icons.xPath
+                icon.color: Constants.materialGrey
+                anchors.right: parent.right
+                anchors.top: parent.top
+                ToolTip.visible: hovered
+                ToolTip.text: Constants.logPanel.clearButtonTooltip
+                onClicked: {
+                    tableView.model.clear();
+                    var new_row = {
+                    };
+                    new_row[Constants.logPanel.timestampHeader] = "";
+                    new_row[Constants.logPanel.levelHeader] = "";
+                    new_row[Constants.logPanel.msgHeader] = "";
+                    logEntries = [new_row];
+                    tableView.model.setRow(0, new_row);
+                    tableView.forceLayout();
+                }
+            }
 
+        }
+
+        Item {
+            anchors.fill: parent
+            anchors.topMargin: Constants.genericTable.cellHeight * 2
+            anchors.rightMargin: Constants.logPanel.pauseButtonRightMargin
+            z: Constants.logPanel.zAboveTable
+
+            SwiftButton {
                 visible: !consolePaused
                 width: Constants.logPanel.pauseButtonWidth
                 height: Constants.logPanel.pauseButtonWidth
-                radius: Constants.logPanel.pauseButtonWidth / 3
                 padding: Constants.logPanel.pauseButtonPadding
                 icon.width: Constants.logPanel.pauseButtonWidth / 3
                 icon.height: Constants.logPanel.pauseButtonWidth / 3
@@ -51,13 +82,10 @@ Item {
                 }
             }
 
-            RoundButton {
-                id: baselinePlayButton
-
+            SwiftButton {
                 visible: consolePaused
                 width: Constants.logPanel.pauseButtonWidth
                 height: Constants.logPanel.pauseButtonWidth
-                radius: Constants.logPanel.pauseButtonWidth / 3
                 padding: Constants.logPanel.pauseButtonPadding
                 icon.width: Constants.logPanel.pauseButtonWidth / 3
                 icon.height: Constants.logPanel.pauseButtonWidth / 3
diff --git a/resources/LoggingBar.qml b/resources/LoggingBar.qml
@@ -19,7 +19,7 @@ Rectangle {
         let hours = Math.floor(duration / 3600).toFixed(0).padStart(2, 0);
         let minutes = Math.floor(duration / 60).toFixed(0).padStart(2, 0);
         let seconds = (duration % 60).toFixed(0).padStart(2, 0);
-        return hours + ":" + minutes + ":" + seconds + " s";
+        return hours + ":" + minutes + ":" + seconds;
     }
 
     color: Constants.swiftControlBackground
@@ -275,8 +275,8 @@ Rectangle {
                     mockRecordingSize += 15.15;
                     recordingSize.text = bytesToString(mockRecordingSize);
                 } else {
-                    if (loggingBarData.recording_size.length > 0)
-                        recordingSize.text = loggingBarData.recording_size;
+                    if (loggingBarData.recording_size > 0)
+                        recordingSize.text = bytesToString(loggingBarData.recording_size);
                     else
                         recordingSize.text = "0.00 MiB";
                 }
diff --git a/resources/SettingsTab.qml b/resources/SettingsTab.qml
@@ -153,7 +153,7 @@ MainTab {
         ColumnLayout {
             SplitView.fillWidth: true
             SplitView.fillHeight: true
-            SplitView.minimumWidth: parent.width * 0.55 //Constants.settingsTable.minimumWidth
+            SplitView.minimumWidth: parent.width * 0.55
             spacing: 3
 
             RowLayout {
diff --git a/resources/SolutionTab.qml b/resources/SolutionTab.qml
@@ -18,13 +18,13 @@ MainTab {
         orientation: Qt.Horizontal
 
         SolutionTabComponents.SolutionTable {
-            SplitView.minimumWidth: 240
+            SplitView.minimumWidth: Constants.solutionTable.minimumWidth
         }
 
         StackLayout {
             id: solutionBarLayout
 
-            SplitView.minimumWidth: 410
+            SplitView.minimumWidth: Constants.solutionPosition.minimumWidth
             SplitView.fillWidth: true
             SplitView.fillHeight: true
             currentIndex: curSubTabIndex
diff --git a/resources/SolutionTabComponents/SolutionTable.qml b/resources/SolutionTabComponents/SolutionTable.qml
@@ -12,7 +12,7 @@ Item {
 
     property real mouse_x: 0
 
-    implicitWidth: Constants.solutionTable.width
+    implicitWidth: Constants.solutionTable.minimumWidth
 
     SolutionTableEntries {
         id: solutionTableEntries
diff --git a/resources/console_resources.qrc b/resources/console_resources.qrc
@@ -103,6 +103,7 @@
     <file>images/fontawesome/file-import.svg</file>
     <file>images/fontawesome/exclamation-triangle.svg</file>
     <file>images/fontawesome/folder-regular.svg</file>
+    <file>images/iconic/x.svg</file>
     <file>images/icon.png</file>
     <file>images/icon.ico</file>
     <file>TableComponents/SortableColumnHeading.qml</file>
diff --git a/src/main/resources/base/console_backend.capnp b/src/main/resources/base/console_backend.capnp
@@ -330,7 +330,7 @@ struct LoggingBarStatus {
 }
 struct LoggingBarRecordingStatus {
     recordingDurationSec @0 : UInt64;
-    recordingSize @1 :Text;
+    recordingSize @1 :UInt64;
     recordingFilename :union {
         filename @2 :Text;
         none @3 :Void = void;
diff --git a/swiftnav_console/logging_bar.py b/swiftnav_console/logging_bar.py
@@ -14,7 +14,7 @@
     Keys.SBP_LOGGING_FORMAT: SbpLogging.SBP_JSON,
     Keys.SBP_LOGGING_LABELS: [SbpLogging.SBP_JSON, SbpLogging.SBP],
     Keys.RECORDING_DURATION_SEC: int,
-    Keys.RECORDING_SIZE: str,
+    Keys.RECORDING_SIZE: int,
     Keys.RECORDING_FILENAME: str,
 }
 
@@ -27,7 +27,7 @@ class LoggingBarData(QObject):  # pylint: disable=too-many-instance-attributes
     _sbp_logging_labels: List[str] = []
     _previous_folders: List[str] = []
     _recording_duration_sec: int = 0
-    _recording_size: str
+    _recording_size: int = 0
     _recording_filename: str = ""
 
     def get_csv_logging(self) -> bool:
@@ -70,13 +70,13 @@ def set_previous_folders(self, previous_folders: List[str]) -> None:
 
     previous_folders = Property(QTKeys.QVARIANTLIST, get_previous_folders, set_previous_folders)  # type: ignore
 
-    def get_recording_size(self) -> str:
+    def get_recording_size(self) -> int:
         return self._recording_size
 
-    def set_recording_size(self, recording_size: str) -> None:
+    def set_recording_size(self, recording_size: int) -> None:
         self._recording_size = recording_size
 
-    recording_size = Property(str, get_recording_size, set_recording_size)
+    recording_size = Property(int, get_recording_size, set_recording_size)
 
     def get_recording_duration_sec(self) -> int:
         return self._recording_duration_sec

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ MainTab {`
`17`	`17`	`height: parent.height`
`18`	`18`
`19`	`19`	`Rectangle {`
`20`		`- SplitView.minimumWidth: Constants.baselineTable.width`
	`20`	`+ SplitView.minimumWidth: Constants.baselineTable.minimumWidth`
`21`	`21`	`SplitView.fillHeight: true`
`22`	`22`
`23`	`23`	`BaselineTabComponents.BaselineTable {`
`@@ -26,6 +26,7 @@ MainTab {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`BaselineTabComponents.BaselinePlot {`
	`29`	`+ SplitView.minimumWidth: Constants.baselinePlot.minimumWidth`
`29`	`30`	`SplitView.fillWidth: true`
`30`	`31`	`SplitView.fillHeight: true`
`31`	`32`	`}`