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

Funkcje Init przesunięte do kontruktora dla wszystkich zaworów roz.

Browse Source
This commit is contained in:
firleju
2016-11-06 21:45:46 +01:00
parent 3ff4dd04a1
commit 97ba33b3ea
3 changed files with 122 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
McZapkie/Mover.cpp
View File

@@ -7196,7 +7196,8 @@ bool TMoverParameters::CreateBrakeSys()
{
WriteLog("XBT W, K");
Hamulec = new TWest(MaxBrakePress[3], BrakeCylRadius, BrakeCylDist, BrakeVVolume,
BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA);
BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA,
PipePress, HighPipePress, LowPipePress, BrakePress, BrakeDelayFlag);
if (MBPM < 2) // jesli przystawka wazaca
(static_cast<TWest *>(Hamulec))->SetLP(0, MaxBrakePress[3], 0);
else
@@ -7207,7 +7208,8 @@ bool TMoverParameters::CreateBrakeSys()
{
WriteLog("XBT WKE");
Hamulec = new TKE(MaxBrakePress[3], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo,
BrakeDelays, BrakeMethod, NAxles, NBpA);
BrakeDelays, BrakeMethod, NAxles, NBpA,
PipePress, HighPipePress, LowPipePress, BrakePress, BrakeDelayFlag);
(static_cast<TKE *>(Hamulec))->SetRM(RapidMult);
if (MBPM < 2) // jesli przystawka wazaca
(static_cast<TKE *>(Hamulec))->SetLP(0, MaxBrakePress[3], 0);
@@ -7222,7 +7224,8 @@ bool TMoverParameters::CreateBrakeSys()
{
WriteLog("XBT NESt3, ESt3, ESt3AL2, ESt4");
Hamulec = new TNESt3(MaxBrakePress[3], BrakeCylRadius, BrakeCylDist, BrakeVVolume,
BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA);
BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA,
PipePress, HighPipePress, LowPipePress, BrakePress, BrakeDelayFlag);
(static_cast<TNESt3 *>(Hamulec))->SetSize(BrakeValveSize, BrakeValveParams);
if (MBPM < 2) // jesli przystawka wazaca
(static_cast<TNESt3 *>(Hamulec))->SetLP(0, MaxBrakePress[3], 0);
@@ -7235,7 +7238,8 @@ bool TMoverParameters::CreateBrakeSys()
{
WriteLog("XBT LSt");
Hamulec = new TLSt(MaxBrakePress[3], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo,
BrakeDelays, BrakeMethod, NAxles, NBpA);
BrakeDelays, BrakeMethod, NAxles, NBpA,
PipePress, HighPipePress, LowPipePress, BrakePress, BrakeDelayFlag);
(static_cast<TLSt *>(Hamulec))->SetRM(RapidMult);
break;
}
@@ -7243,7 +7247,8 @@ bool TMoverParameters::CreateBrakeSys()
{
WriteLog("XBT EStED");
Hamulec = new TEStED(MaxBrakePress[3], BrakeCylRadius, BrakeCylDist, BrakeVVolume,
BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA);
BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA,
PipePress, HighPipePress, LowPipePress, BrakePress, BrakeDelayFlag);
(static_cast<TEStED *>(Hamulec))->SetRM(RapidMult);
break;
}
@@ -7251,7 +7256,8 @@ bool TMoverParameters::CreateBrakeSys()
{
WriteLog("XBT EP2");
Hamulec = new TEStEP2(MaxBrakePress[3], BrakeCylRadius, BrakeCylDist, BrakeVVolume,
BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA);
BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA,
PipePress, HighPipePress, LowPipePress, BrakePress, BrakeDelayFlag);
(static_cast<TEStEP2 *>(Hamulec))->SetLP(Mass, MBPM, MaxBrakePress[1]);
break;
}
@@ -7260,20 +7266,23 @@ bool TMoverParameters::CreateBrakeSys()
{
WriteLog("XBT CV1");
Hamulec = new TCV1(MaxBrakePress[3], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo,
BrakeDelays, BrakeMethod, NAxles, NBpA);
BrakeDelays, BrakeMethod, NAxles, NBpA,
PipePress, HighPipePress, LowPipePress, BrakePress, BrakeDelayFlag);
break;
}
case CV1_L_TR:
{
WriteLog("XBT CV1_L_T");
Hamulec = new TCV1L_TR(MaxBrakePress[3], BrakeCylRadius, BrakeCylDist, BrakeVVolume,
BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA);
BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA,
PipePress, HighPipePress, LowPipePress, BrakePress, BrakeDelayFlag);
break;
}
default:
Hamulec = new TBrake(MaxBrakePress[3], BrakeCylRadius, BrakeCylDist, BrakeVVolume,
BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA);
BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA,
PipePress, HighPipePress, LowPipePress, BrakePress, BrakeDelayFlag);
}
Hamulec->SetASBP(MaxBrakePress[4]);
@@ -7402,7 +7411,7 @@ bool TMoverParameters::CreateBrakeSys()
// if(TrainType == dt_ET22)
// CompressorPower = 0;
Hamulec->Init(PipePress, HighPipePress, LowPipePress, BrakePress, BrakeDelayFlag);
//Hamulec->Init(PipePress, HighPipePress, LowPipePress, BrakePress, BrakeDelayFlag);
ScndPipePress = Compressor;