|
|
@ -175,7 +175,7 @@ void MapWindow::updateState(const UIState &s) { |
|
|
|
|
|
|
|
|
|
|
|
loaded_once = loaded_once || m_map->isFullyLoaded(); |
|
|
|
loaded_once = loaded_once || m_map->isFullyLoaded(); |
|
|
|
if (!loaded_once) { |
|
|
|
if (!loaded_once) { |
|
|
|
map_instructions->showError("Map Loading"); |
|
|
|
map_instructions->showError(tr("Map Loading")); |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -192,7 +192,7 @@ void MapWindow::updateState(const UIState &s) { |
|
|
|
carPosSource["data"] = QVariant::fromValue<QMapbox::Feature>(feature1); |
|
|
|
carPosSource["data"] = QVariant::fromValue<QMapbox::Feature>(feature1); |
|
|
|
m_map->updateSource("carPosSource", carPosSource); |
|
|
|
m_map->updateSource("carPosSource", carPosSource); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
map_instructions->showError("Waiting for GPS"); |
|
|
|
map_instructions->showError(tr("Waiting for GPS")); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (pan_counter == 0) { |
|
|
|
if (pan_counter == 0) { |
|
|
@ -418,10 +418,10 @@ void MapInstructions::updateDistance(float d) { |
|
|
|
if (uiState()->scene.is_metric) { |
|
|
|
if (uiState()->scene.is_metric) { |
|
|
|
if (d > 500) { |
|
|
|
if (d > 500) { |
|
|
|
distance_str.setNum(d / 1000, 'f', 1); |
|
|
|
distance_str.setNum(d / 1000, 'f', 1); |
|
|
|
distance_str += " km"; |
|
|
|
distance_str += tr(" km"); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
distance_str.setNum(50 * int(d / 50)); |
|
|
|
distance_str.setNum(50 * int(d / 50)); |
|
|
|
distance_str += " m"; |
|
|
|
distance_str += tr(" m"); |
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
float miles = d * METER_TO_MILE; |
|
|
|
float miles = d * METER_TO_MILE; |
|
|
@ -429,10 +429,10 @@ void MapInstructions::updateDistance(float d) { |
|
|
|
|
|
|
|
|
|
|
|
if (feet > 500) { |
|
|
|
if (feet > 500) { |
|
|
|
distance_str.setNum(miles, 'f', 1); |
|
|
|
distance_str.setNum(miles, 'f', 1); |
|
|
|
distance_str += " mi"; |
|
|
|
distance_str += tr(" mi"); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
distance_str.setNum(50 * int(feet / 50)); |
|
|
|
distance_str.setNum(50 * int(feet / 50)); |
|
|
|
distance_str += " ft"; |
|
|
|
distance_str += tr(" ft"); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -615,7 +615,7 @@ void MapETA::updateETA(float s, float s_typical, float d) { |
|
|
|
auto eta_time = QDateTime::currentDateTime().addSecs(s).time(); |
|
|
|
auto eta_time = QDateTime::currentDateTime().addSecs(s).time(); |
|
|
|
if (params.getBool("NavSettingTime24h")) { |
|
|
|
if (params.getBool("NavSettingTime24h")) { |
|
|
|
eta->setText(eta_time.toString("HH:mm")); |
|
|
|
eta->setText(eta_time.toString("HH:mm")); |
|
|
|
eta_unit->setText("eta"); |
|
|
|
eta_unit->setText(tr("eta")); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
auto t = eta_time.toString("h:mm a").split(' '); |
|
|
|
auto t = eta_time.toString("h:mm a").split(' '); |
|
|
|
eta->setText(t[0]); |
|
|
|
eta->setText(t[0]); |
|
|
@ -625,11 +625,11 @@ void MapETA::updateETA(float s, float s_typical, float d) { |
|
|
|
// Remaining time
|
|
|
|
// Remaining time
|
|
|
|
if (s < 3600) { |
|
|
|
if (s < 3600) { |
|
|
|
time->setText(QString::number(int(s / 60))); |
|
|
|
time->setText(QString::number(int(s / 60))); |
|
|
|
time_unit->setText("min"); |
|
|
|
time_unit->setText(tr("min")); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
int hours = int(s) / 3600; |
|
|
|
int hours = int(s) / 3600; |
|
|
|
time->setText(QString::number(hours) + ":" + QString::number(int((s - hours * 3600) / 60)).rightJustified(2, '0')); |
|
|
|
time->setText(QString::number(hours) + ":" + QString::number(int((s - hours * 3600) / 60)).rightJustified(2, '0')); |
|
|
|
time_unit->setText("hr"); |
|
|
|
time_unit->setText(tr("hr")); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
QString color; |
|
|
|
QString color; |
|
|
@ -649,10 +649,10 @@ void MapETA::updateETA(float s, float s_typical, float d) { |
|
|
|
float num = 0; |
|
|
|
float num = 0; |
|
|
|
if (uiState()->scene.is_metric) { |
|
|
|
if (uiState()->scene.is_metric) { |
|
|
|
num = d / 1000.0; |
|
|
|
num = d / 1000.0; |
|
|
|
distance_unit->setText("km"); |
|
|
|
distance_unit->setText(tr("km")); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
num = d * METER_TO_MILE; |
|
|
|
num = d * METER_TO_MILE; |
|
|
|
distance_unit->setText("mi"); |
|
|
|
distance_unit->setText(tr("mi")); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
distance_str.setNum(num, 'f', num < 100 ? 1 : 0); |
|
|
|
distance_str.setNum(num, 'f', num < 100 ? 1 : 0); |
|
|
|