From 913f32a15c5b5f74bfa13dc238ee2bfd574b9cee Mon Sep 17 00:00:00 2001 From: DevTekVE Date: Sat, 6 Apr 2024 16:18:29 +0000 Subject: [PATCH] ui: Driving Model Selector description fixes --- .../offroad/sunnypilot/software_settings_sp.cc | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/selfdrive/ui/qt/offroad/sunnypilot/software_settings_sp.cc b/selfdrive/ui/qt/offroad/sunnypilot/software_settings_sp.cc index 9727bcc2f3..ec72e71a78 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot/software_settings_sp.cc +++ b/selfdrive/ui/qt/offroad/sunnypilot/software_settings_sp.cc @@ -129,38 +129,32 @@ void SoftwarePanelSP::HandleModelDownloadProgressReport() { // Driving model status if (isDownloadingModel()) { description += QString(tr("Downloading Driving model") + " [%1]... (%2%)") - .arg(drivingModelName) - .arg(QString::number(modelDownloadProgress.value_or(0.0), 'f', 2)); + .arg(drivingModelName, QString::number(modelDownloadProgress.value_or(0.0), 'f', 2)); } else { if (modelFromCache) drivingModelName += QString(" " + tr("(CACHED)")); - description += QString(tr("Driving model") + " [%1] " + tr("downloaded") - .arg(drivingModelName)); + description += QString(tr("Driving model") + " [%1] " + tr("downloaded")).arg(drivingModelName); } // Navigation model status if (isDownloadingNavModel()) { if (!description.isEmpty()) description += "\n"; // Add newline if driving model status is already appended description += QString(tr("Downloading Navigation model") + " [%1]... (%2%)") - .arg(navModelName) - .arg(QString::number(navModelDownloadProgress.value_or(0.0), 'f', 2)); + .arg(navModelName, QString::number(navModelDownloadProgress.value_or(0.0), 'f', 2)); } else { if (navModelFromCache) navModelName += QString(" " + tr("(CACHED)")); if (!description.isEmpty()) description += "\n"; // Ensure newline separation - description += QString(tr("Navigation model") + " [%1] " + tr("downloaded") - .arg(navModelName)); + description += QString(tr("Navigation model") + " [%1] " + tr("downloaded")).arg(navModelName); } // Metadata status if (isDownloadingMetadata()) { if (!description.isEmpty()) description += "\n"; description += QString(tr("Downloading Metadata model") + " [%1]... (%2%)") - .arg(metadataName) - .arg(QString::number(metadataDownloadProgress.value_or(0.0), 'f', 2)); + .arg(metadataName, QString::number(metadataDownloadProgress.value_or(0.0), 'f', 2)); } else { if (metadataFromCache) metadataName += QString(" " + tr("(CACHED)")); if (!description.isEmpty()) description += "\n"; - description += QString(tr("Metadata model") + " [%1] " + tr("downloaded") - .arg(metadataName)); + description += QString(tr("Metadata model") + " [%1] " + tr("downloaded")).arg(metadataName); } if (model_download_failed) {