eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tmj-dev' into milek-dev

Browse Source
This commit is contained in:
milek7
2018-12-31 23:49:10 +01:00
parent eec2e38be8 bdbbaafc83
commit 4495f6a436
20 changed files with 575 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
driveruipanels.cpp
View File

@@ -443,8 +443,8 @@ debug_panel::update_section_vehicle( std::vector<text_line> &Output ) {
std::abs( mover.enrot ) * 60,
std::abs( mover.nrot ) * mover.Transmision.Ratio * 60,
mover.RventRot * 60,
mover.MotorBlowers[side::front].revolutions,
mover.MotorBlowers[side::rear].revolutions,
std::abs( mover.MotorBlowers[side::front].revolutions ),
std::abs( mover.MotorBlowers[side::rear].revolutions ),
mover.dizel_heat.rpmw,
mover.dizel_heat.rpmw2 );
@@ -470,6 +470,7 @@ debug_panel::update_section_vehicle( std::vector<text_line> &Output ) {
// brakes
mover.fBrakeCtrlPos,
mover.LocalBrakePosA,
mover.BrakeOpModeFlag,
update_vehicle_brake().c_str(),
mover.LoadFlag,
// cylinders
@@ -482,7 +483,7 @@ debug_panel::update_section_vehicle( std::vector<text_line> &Output ) {
mover.ScndPipePress,
mover.CntrlPipePress,
// tanks
mover.Volume,
mover.Hamulec->GetBRP(),
mover.Compressor,
mover.Hamulec->GetCRP() );
@@ -526,37 +527,7 @@ debug_panel::update_section_vehicle( std::vector<text_line> &Output ) {
vehicle.GetPosition().z );
Output.emplace_back( m_buffer.data(), Global.UITextColor );
/*
textline = " TC:" + to_string( mover.TotalCurrent, 0 );
*/
/*
if( mover.ManualBrakePos > 0 ) {
textline += "; manual brake on";
}
*/
/*
// McZapkie: warto wiedziec w jakim stanie sa przelaczniki
switch(
mover.ActiveDir *
( mover.Imin == mover.IminLo ?
1 :
2 ) ) {
case 2: { textline += " >> "; break; }
case 1: { textline += " -> "; break; }
case 0: { textline += " -- "; break; }
case -1: { textline += " <- "; break; }
case -2: { textline += " << "; break; }
}
// McZapkie: komenda i jej parametry
if( mover.CommandIn.Command != ( "" ) ) {
textline =
"C:" + mover.CommandIn.Command
+ " V1=" + to_string( mover.CommandIn.Value1, 0 )
+ " V2=" + to_string( mover.CommandIn.Value2, 0 );
}
*/
}
std::string
@@ -899,7 +870,10 @@ debug_panel::render_section( std::string const &Header, std::vector<text_line> c
if( false == ImGui::CollapsingHeader( Header.c_str() ) ) { return false; }
for( auto const &line : Lines ) {
ImGui::TextColored( ImVec4( line.color.r, line.color.g, line.color.b, line.color.a ), line.data.c_str() );
ImGui::PushStyleColor( ImGuiCol_Text, { line.color.r, line.color.g, line.color.b, line.color.a } );
ImGui::TextUnformatted( line.data.c_str() );
ImGui::PopStyleColor();
// ImGui::TextColored( ImVec4( line.color.r, line.color.g, line.color.b, line.color.a ), line.data.c_str() );
}
return true;
}