Connect logging bar size with new UI.

Author: john-michaelburke

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,

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

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

@@ -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";
                 }

resources/LoggingBar.qml

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

src/main/resources/base/console_backend.capnp

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