eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-20 06:49:19 +02:00
Code Issues 123 Wiki Activity

Merge branch 'tmj-dev' into nogfx

Browse Source
This commit is contained in:
milek7
2017-08-21 13:16:36 +02:00
parent 5104d7f4fd 318dd9a0fe
commit 2829a8430c
13 changed files with 757 additions and 922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
World.cpp
View File

@@ -1453,13 +1453,19 @@ TWorld::Update_UI() {
uitextline1 +=
"; C0:" +
( tmp->PrevConnected ?
tmp->PrevConnected->GetName() + ":" + to_string( tmp->MoverParameters->Couplers[ 0 ].CouplingFlag ) :
"none" );
tmp->PrevConnected->GetName() + ":" + to_string( tmp->MoverParameters->Couplers[ 0 ].CouplingFlag ) + (
tmp->MoverParameters->Couplers[ 0 ].CouplingFlag == 0 ?
" (" + to_string( tmp->MoverParameters->Couplers[ 0 ].CoupleDist, 1 ) + " m)" :
"" ) :
"none" );
uitextline1 +=
" C1:" +
( tmp->NextConnected ?
tmp->NextConnected->GetName() + ":" + to_string( tmp->MoverParameters->Couplers[ 1 ].CouplingFlag ) :
"none" );
tmp->NextConnected->GetName() + ":" + to_string( tmp->MoverParameters->Couplers[ 1 ].CouplingFlag ) + (
tmp->MoverParameters->Couplers[ 1 ].CouplingFlag == 0 ?
" (" + to_string( tmp->MoverParameters->Couplers[ 1 ].CoupleDist, 1 ) + " m)" :
"" ) :
"none" );
// equipment flags
uitextline2 = ( tmp->MoverParameters->Battery ? "B" : "." );
@@ -1565,9 +1571,10 @@ TWorld::Update_UI() {
uitextline4 +=
"Driver: Vd=" + to_string( tmp->Mechanik->VelDesired, 0 )
+ " Ad=" + to_string( tmp->Mechanik->AccDesired, 2 )
+ " Ah=" + to_string(tmp->Mechanik->fAccThreshold, 2)
+ "@" + to_string(tmp->Mechanik->fBrake_a0[0], 2)
+ "+" + to_string(tmp->Mechanik->fBrake_a1[0], 2)
+ " Ah=" + to_string( tmp->Mechanik->fAccThreshold, 2 )
+ "@" + to_string( tmp->Mechanik->fBrake_a0[0], 2 )
+ "+" + to_string( tmp->Mechanik->fBrake_a1[0], 2 )
+ " Bd=" + to_string( tmp->Mechanik->fBrakeDist, 0 )
+ " Pd=" + to_string( tmp->Mechanik->ActualProximityDist, 0 )
+ " Vn=" + to_string( tmp->Mechanik->VelNext, 0 )
+ " VSl=" + to_string( tmp->Mechanik->VelSignalLast, 0 )