Add exclusions to newline formatter.

Author: john-michaelburke

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(f".*{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 "

docs/imgs/app-diagram.drawio

@@ -1 +1 @@
-<mxfile host="app.diagrams.net" modified="2021-10-25T18:02:02.297Z" agent="5.0 (X11)" etag="Pipex7-AcuOoGR8RTcAn" version="15.5.9" type="google"><diagram name="Page-1" id="5d7acffa-a066-3a61-03fe-96351882024d">5Vtbb6M6EP41PLYCG3N5bNK9SKtdVafnsvvoghNQCc4ap0321x8DNgFMGpIG0rRRpcIAE/i+b4YZ2zHgdLH+wvAy+k5DkhjADNcGvDUAsEwTin+5ZSMtluOUljmLQ2nbGu7jP0RdKq2rOCRZ40ROacLjZdMY0DQlAW/YMGP0uXnajCbNb13iOdEM9wFOdOt/ccgj9RimuT3wlcTzSH61h+SBBxw8zhldpfL7DABnxac8vMDKlzw/i3BIn2sm+MmAU0YpL7cW6ylJcnAVbOV1n3ccre6bkZT3ueBH4P/9I7r7Nf3Xvs3cf75Nvzx9u7KkmyecrIh6juJu+UYhFPFFIrYsA06WNE55ATiaGOg2txAWLwgnTBgp4xGd0xQnd1vrRH4BYZysd966VQEilEaouJZtxCnyAmBLDKXIgCLnucaYNEU1rmx1HpYimVeut0CJDYnVIbgBDbdcD0SIQWBHmHhcoyJ+C6WAQNzapIYoTuJ5KrYDAUUBVw5ULOR5Iw8s4jDML58wksV/8EPhyuzkAq84zcoAy11nnNFHMqUJzclJaZp7mcVJ0jKdgCDLRw2CLLeLoA6GwGAE2Zcg7EqgEjcI+gkbeIPhhjTcZOaNaVqktVQkRPZhlA3tprKB38EQGFXZ7iUo27HgdQu5nkm7SvanR867BOSQ08wJdpfiOnCzrMFw8zXcGKlnhQ+SCxBoKtrueMt5Y6YCpd+GoJ0kBz+Mn8TmPN9UlTP4HMZZtVOeVhirMzsuZuT3imSCAXnogbVPbrvYHVBt0h8o53QhDoiy6SYv5XNbQoPH/HvzwpqEUgWCILb5Wd/5le9cW76vDLfr+uHbTX2vFqGlcR3zn/Km8u3SmW3L3a2rfGdT22k7Kp+WhFqL0ZKUQISuWEB6VOIcsznheysbXaQdImQkwTx+at5clwqlt7s82GplN2qV3a6vcrpyUj6WvK7efLRcQbjXVfngmqsiMKrHfEWsQC1WZoyKdFSU7AuSZaKuyYaRb3+Z7Gd/R4o6PftVVaMoa7+X+3IPzD2Ohma+qxXQEl0m7oIXqLVS5P6Mp/kaMzWeUlveWNqyVbbbqDfrkdpCyGu+ktuN0dDauohi3HWPLcYH6zPV+6AGXEwNeCP+/iI4PG+sjBECDrDbnMAjg6CD3rargcMA6oXoahliTgoSi/+DlIWnquN21ZdoT3V5wuQL4VjK08o6ZF+7rr/9uMfJEHq633FrPKjXeFkkuAj7yPAEeRY6YFcg1mlEep5FQ+VZWx/gHzMyr0SP1ghO4IOzdlnuiwSK24UIejplp4m89tAOcI/M+LbWmfXL91tH6kQ6m2VkkGC0uwYnLqA0gla/0mi4kNWz2FsEzn97wF3EnI+L3h5w+qSPSAo8TudZUbo8aDC+1yFeF3rtN3jH8Puog7y2cxGq1vNoz3mL4VR9Gb25nkfPDtxFzJN15NGzA6dPlFXF9ofKorZGTcdUmTtmFlWc16i5n9wZQ4/8qz5IbZdNkOeiczZBYEcTdPqGxwXayNSxLY+z39XAowtIb6WrqQJTzpOOqSJX8HjOVnq02QIEzRb16OjGWb0PdjkaWkOHtSjHSybEWVTsWAewfp5xbwi1ccLeI996DQDHHXJEeuv04Qm1rRMSalsjE9qj3cqe40WCi2qpmDaWq9p30PS6NUdme0jZcvRSCtodtRQcbPUz7Fo1vnNGvb5S7E3Ni7/A/xiBc+XrswVHL7C50nyNvcpCbxplaV0ghcN3tWj4IOmoeTfgNBk69xp50JXqtDBeMhoIIhutUq8w/ljsIldbYqHTO+pCcaiPRjxjHkTGoDN/r8u7fVYpvTyFZ15DS5UMA+Rs1M6z7RUyfRO21VoV55nXqtJ4Q5N4SM/qOCjwa77X303oH1yN2R1h3vmzhsPDXOxufx5YMrr9ESb89D8=</diagram></mxfile>
+<mxfile host="app.diagrams.net" modified="2021-10-25T18:02:02.297Z" agent="5.0 (X11)" etag="Pipex7-AcuOoGR8RTcAn" version="15.5.9" type="google"><diagram name="Page-1" id="5d7acffa-a066-3a61-03fe-96351882024d">5Vtbb6M6EP41PLYCG3N5bNK9SKtdVafnsvvoghNQCc4ap0321x8DNgFMGpIG0rRRpcIAE/i+b4YZ2zHgdLH+wvAy+k5DkhjADNcGvDUAsEwTin+5ZSMtluOUljmLQ2nbGu7jP0RdKq2rOCRZ40ROacLjZdMY0DQlAW/YMGP0uXnajCbNb13iOdEM9wFOdOt/ccgj9RimuT3wlcTzSH61h+SBBxw8zhldpfL7DABnxac8vMDKlzw/i3BIn2sm+MmAU0YpL7cW6ylJcnAVbOV1n3ccre6bkZT3ueBH4P/9I7r7Nf3Xvs3cf75Nvzx9u7KkmyecrIh6juJu+UYhFPFFIrYsA06WNE55ATiaGOg2txAWLwgnTBgp4xGd0xQnd1vrRH4BYZysd966VQEilEaouJZtxCnyAmBLDKXIgCLnucaYNEU1rmx1HpYimVeut0CJDYnVIbgBDbdcD0SIQWBHmHhcoyJ+C6WAQNzapIYoTuJ5KrYDAUUBVw5ULOR5Iw8s4jDML58wksV/8EPhyuzkAq84zcoAy11nnNFHMqUJzclJaZp7mcVJ0jKdgCDLRw2CLLeLoA6GwGAE2Zcg7EqgEjcI+gkbeIPhhjTcZOaNaVqktVQkRPZhlA3tprKB38EQGFXZ7iUo27HgdQu5nkm7SvanR867BOSQ08wJdpfiOnCzrMFw8zXcGKlnhQ+SCxBoKtrueMt5Y6YCpd+GoJ0kBz+Mn8TmPN9UlTP4HMZZtVOeVhirMzsuZuT3imSCAXnogbVPbrvYHVBt0h8o53QhDoiy6SYv5XNbQoPH/HvzwpqEUgWCILb5Wd/5le9cW76vDLfr+uHbTX2vFqGlcR3zn/Km8u3SmW3L3a2rfGdT22k7Kp+WhFqL0ZKUQISuWEB6VOIcsznheysbXaQdImQkwTx+at5clwqlt7s82GplN2qV3a6vcrpyUj6WvK7efLRcQbjXVfngmqsiMKrHfEWsQC1WZoyKdFSU7AuSZaKuyYaRb3+Z7Gd/R4o6PftVVaMoa7+X+3IPzD2Ohma+qxXQEl0m7oIXqLVS5P6Mp/kaMzWeUlveWNqyVbbbqDfrkdpCyGu+ktuN0dDauohi3HWPLcYH6zPV+6AGXEwNeCP+/iI4PG+sjBECDrDbnMAjg6CD3rargcMA6oXoahliTgoSi/+DlIWnquN21ZdoT3V5wuQL4VjK08o6ZF+7rr/9uMfJEHq633FrPKjXeFkkuAj7yPAEeRY6YFcg1mlEep5FQ+VZWx/gHzMyr0SP1ghO4IOzdlnuiwSK24UIejplp4m89tAOcI/M+LbWmfXL91tH6kQ6m2VkkGC0uwYnLqA0gla/0mi4kNWz2FsEzn97wF3EnI+L3h5w+qSPSAo8TudZUbo8aDC+1yFeF3rtN3jH8Puog7y2cxGq1vNoz3mL4VR9Gb25nkfPDtxFzJN15NGzA6dPlFXF9ofKorZGTcdUmTtmFlWc16i5n9wZQ4/8qz5IbZdNkOeiczZBYEcTdPqGxwXayNSxLY+z39XAowtIb6WrqQJTzpOOqSJX8HjOVnq02QIEzRb16OjGWb0PdjkaWkOHtSjHSybEWVTsWAewfp5xbwi1ccLeI996DQDHHXJEeuv04Qm1rRMSalsjE9qj3cqe40WCi2qpmDaWq9p30PS6NUdme0jZcvRSCtodtRQcbPUz7Fo1vnNGvb5S7E3Ni7/A/xiBc+XrswVHL7C50nyNvcpCbxplaV0ghcN3tWj4IOmoeTfgNBk69xp50JXqtDBeMhoIIhutUq8w/ljsIldbYqHTO+pCcaiPRjxjHkTGoDN/r8u7fVYpvTyFZ15DS5UMA+Rs1M6z7RUyfRO21VoV55nXqtJ4Q5N4SM/qOCjwa77X303oH1yN2R1h3vmzhsPDXOxufx5YMrr9ESb89D8=</diagram></mxfile>

docs/imgs/console-backend-thds.drawio

@@ -461,6 +461,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
@@ -628,6 +629,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 {

resources/Constants/Constants.qml

@@ -1,4 +1,5 @@
-import "./Constants"
+import "BaseComponents"
+import "Constants"
 import Qt.labs.qmlmodels 1.0
 import QtQuick 2.15
 import QtQuick.Controls 2.15
@@ -48,13 +49,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
@@ -69,13 +100,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

resources/LogPanel.qml

@@ -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>

resources/console_resources.qrc

@@ -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: