From 5d130c7fcfd689442c8b3e39591f0fb9639dbd56 Mon Sep 17 00:00:00 2001 From: milek7 Date: Sat, 16 Jan 2021 19:52:30 +0100 Subject: [PATCH] ..obviously only for vehicles that have pantographs at all --- driveruipanels.cpp | 6 ++++-- widgets/vehicleparams.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/driveruipanels.cpp b/driveruipanels.cpp index 96e87aed..6b49389b 100644 --- a/driveruipanels.cpp +++ b/driveruipanels.cpp @@ -821,8 +821,10 @@ debug_panel::update_section_vehicle( std::vector &Output ) { Output.emplace_back( m_buffer.data(), Global.UITextColor ); - std::snprintf(m_buffer.data(), m_buffer.size(), STR_C("Energy consumed from pantographs: %.1f kWh"), mover.EnergyConsumed); - Output.emplace_back( m_buffer.data(), Global.UITextColor ); + if( mover.EnginePowerSource.SourceType == TPowerSource::CurrentCollector ) { + std::snprintf(m_buffer.data(), m_buffer.size(), STR_C("Energy consumed from pantographs: %.1f kWh"), mover.EnergyConsumed); + Output.emplace_back( m_buffer.data(), Global.UITextColor ); + } if (!std::isnan(last_time)) { double dt = Timer::GetTime() - last_time; diff --git a/widgets/vehicleparams.cpp b/widgets/vehicleparams.cpp index b043d9da..17bd40fe 100644 --- a/widgets/vehicleparams.cpp +++ b/widgets/vehicleparams.cpp @@ -277,8 +277,10 @@ void ui::vehicleparams_panel::render_contents() ImGui::TextUnformatted(buffer.data()); - std::snprintf(buffer.data(), buffer.size(), STR_C("Energy consumed from pantographs: %.1f kWh"), mover.EnergyConsumed); - ImGui::TextUnformatted(buffer.data()); + if( mover.EnginePowerSource.SourceType == TPowerSource::CurrentCollector ) { + std::snprintf(buffer.data(), buffer.size(), STR_C("Energy consumed from pantographs: %.1f kWh"), mover.EnergyConsumed); + ImGui::TextUnformatted(buffer.data()); + } draw_mini(mover);