eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-19 13:29:18 +02:00
Code Issues 121 Wiki Activity

Zmiana AnsiString na std::string. Zakończenie sprawy przypadkowo skasowanego mover.h

Browse Source
This commit is contained in:
firleju
2016-10-21 06:56:46 +02:00
parent ab34354584
commit 167b1e3a8d
18 changed files with 1466 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Driver.cpp
View File

@@ -284,7 +284,7 @@ bool TSpeedPos::Update(vector3 *p, vector3 *dir, double &len)
return false;
};
AnsiString TSpeedPos::GetName()
std::string TSpeedPos::GetName()
{
if (iFlags & spTrack) // je<6A>li tor
return trTrack->NameGet();
@@ -292,12 +292,12 @@ AnsiString TSpeedPos::GetName()
return evEvent->asName;
}
AnsiString TSpeedPos::TableText()
std::string TSpeedPos::TableText()
{ // pozycja tabelki pr<70>dko<6B>ci
if (iFlags & spEnabled)
{ // o ile pozycja istotna
return "Flags=#" + IntToHex(iFlags, 8) + ", Dist=" + FloatToStrF(fDist, ffFixed, 7, 1) +
", Vel=" + AnsiString(fVelNext) + ", Name=" + GetName();
return "Flags=#" + to_hex_str(iFlags, 8) + ", Dist=" + to_string(fDist, 1, 7) +
", Vel=" + to_string(fVelNext) + ", Name=" + GetName();
//if (iFlags & spTrack) // je<6A>li tor
// return "Flags=#" + IntToHex(iFlags, 8) + ", Dist=" + FloatToStrF(fDist, ffFixed, 7, 1) +
// ", Vel=" + AnsiString(fVelNext) + ", Track=" + trTrack->NameGet();
@@ -1603,7 +1603,7 @@ TController::~TController()
CloseLog();
};
AnsiString TController::Order2Str(TOrders Order)
std::string TController::Order2Str(TOrders Order)
{ // zamiana kodu rozkazu na opis
if (Order & Change_direction)
return "Change_direction"; // mo<6D>e by<62> na<6E>o<EFBFBD>ona na inn<6E> i wtedy ma priorytet
@@ -1638,9 +1638,9 @@ AnsiString TController::Order2Str(TOrders Order)
return "Undefined!";
}
AnsiString TController::OrderCurrent()
std::string TController::OrderCurrent()
{ // pobranie aktualnego rozkazu celem wy<77>wietlenia
return AnsiString(OrderPos) + ". " + Order2Str(OrderList[OrderPos]);
return to_string(OrderPos) + ". " + Order2Str(OrderList[OrderPos]);
};
void TController::OrdersClear()
@@ -2889,8 +2889,8 @@ void TController::RecognizeCommand()
c->Command = ""; // usuni<6E>cie obs<62>u<EFBFBD>onej komendy
}
void TController::PutCommand(AnsiString NewCommand, double NewValue1, double NewValue2,
const TLocation &NewLocation, TStopReason reason)
void TController::PutCommand(std::string NewCommand, double NewValue1, double NewValue2,
const TLocation &NewLocation, TStopReason reason = stopComm)
{ // wys<79>anie komendy przez event PutValues, jak pojazd ma obsad<61>, to wysy<73>a tutaj, a nie do pojazdu
// bezpo<70>rednio
vector3 sl;
@@ -2901,8 +2901,8 @@ void TController::PutCommand(AnsiString NewCommand, double NewValue1, double New
mvOccupied->PutCommand(NewCommand, NewValue1, NewValue2, NewLocation);
}
bool TController::PutCommand(AnsiString NewCommand, double NewValue1, double NewValue2,
const vector3 *NewLocation, TStopReason reason)
bool TController::PutCommand(std::string NewCommand, double NewValue1, double NewValue2,
const vector3 *NewLocation, TStopReason reason = stopComm)
{ // analiza komendy
if (NewCommand == "CabSignal")
{ // SHP wyzwalane jest przez cz<63>on z obsad<61>, ale obs<62>ugiwane przez silnikowy
@@ -5425,7 +5425,7 @@ void TController::ControllingSet()
mvControlling = pVehicle->ControlledFind()->MoverParameters; // poszukiwanie cz<63>onu sterowanego
};
AnsiString TController::TableText(int i)
std::string TController::TableText(int i)
{ // pozycja tabelki pr<70>dko<6B>ci
i = (iFirst + i) % iSpeedTableSize; // numer pozycji
if (i != iLast) // w (iLast) znajduje si<73> kolejny tor do przeskanowania, ale nie jest ona
@@ -5475,7 +5475,7 @@ void TController::RouteSwitch(int d)
}
}
};
AnsiString TController::OwnerName()
std::string TController::OwnerName()
{
return pVehicle ? pVehicle->MoverParameters->Name : AnsiString("none");
return pVehicle ? pVehicle->MoverParameters->Name : ("none");
};