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

Zmienione THandle na TDriverHandle. Usunięty namespace Hamulce.

Browse Source
This commit is contained in:
firleju
2016-10-07 12:07:24 +02:00
parent 8b3e5077fa
commit e41f53c00f
4 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
McZapkie/Oerlikon_ESt.h
View File

@@ -25,8 +25,6 @@ http://mozilla.org/MPL/2.0/.
#include <System.hpp> // Pascal unit #include <System.hpp> // Pascal unit
#include <string> #include <string>
using namespace Hamulce;
/* /*
(C) youBy (C) youBy
Co jest: Co jest:

12
McZapkie/hamulce.cpp
View File

@@ -2078,32 +2078,32 @@ void TKE::SetLBP(double P)
//---KRANY--- //---KRANY---
double THandle::GetPF(double i_bcp, double PP, double HP, double dt, double ep) double TDriverHandle::GetPF(double i_bcp, double PP, double HP, double dt, double ep)
{ {
return 0; return 0;
} }
void THandle::Init(double Press) void TDriverHandle::Init(double Press)
{ {
Time = false; Time = false;
TimeEP = false; TimeEP = false;
} }
void THandle::SetReductor(double nAdj) void TDriverHandle::SetReductor(double nAdj)
{ {
} }
double THandle::GetCP() double TDriverHandle::GetCP()
{ {
return 0; return 0;
} }
double THandle::GetSound(Byte i) double TDriverHandle::GetSound(Byte i)
{ {
return 0; return 0;
} }
double THandle::GetPos(Byte i) double TDriverHandle::GetPos(Byte i)
{ {
return 0; return 0;
} }

47
McZapkie/hamulce.h
View File

@@ -42,8 +42,6 @@ Knorr/West EP -
#include <System.hpp> // Pascal unit #include <System.hpp> // Pascal unit
namespace Hamulce
{
static int const LocalBrakePosNo = 10; /*ilosc nastaw hamulca recznego lub pomocniczego*/ static int const LocalBrakePosNo = 10; /*ilosc nastaw hamulca recznego lub pomocniczego*/
static int const MainBrakeMaxPos = 10; /*max. ilosc nastaw hamulca zasadniczego*/ static int const MainBrakeMaxPos = 10; /*max. ilosc nastaw hamulca zasadniczego*/
@@ -516,7 +514,7 @@ namespace Hamulce
//klasa obejmujaca krany //klasa obejmujaca krany
class THandle class TDriverHandle
{ {
private: private:
// BCP: integer; // BCP: integer;
@@ -536,7 +534,7 @@ namespace Hamulce
class TFV4a : public THandle class TFV4a : public TDriverHandle
{ {
private: private:
@@ -546,13 +544,13 @@ namespace Hamulce
double GetPF(double i_bcp, double PP, double HP, double dt, double ep)/*override*/; double GetPF(double i_bcp, double PP, double HP, double dt, double ep)/*override*/;
void Init(double Press)/*override*/; void Init(double Press)/*override*/;
inline TFV4a(void) : THandle() { } inline TFV4a(void) : TDriverHandle() { }
}; };
class TFV4aM : public THandle class TFV4aM : public TDriverHandle
{ {
private: private:
@@ -570,12 +568,12 @@ namespace Hamulce
double GetSound(Byte i)/*override*/; double GetSound(Byte i)/*override*/;
double GetPos(Byte i)/*override*/; double GetPos(Byte i)/*override*/;
inline TFV4aM(void) : THandle() { } inline TFV4aM(void) : TDriverHandle() { }
}; };
class TMHZ_EN57 : public THandle class TMHZ_EN57 : public TDriverHandle
{ {
private: private:
@@ -594,12 +592,12 @@ namespace Hamulce
double GetCP()/*override*/; double GetCP()/*override*/;
double GetEP(double pos); double GetEP(double pos);
inline TMHZ_EN57(void) : THandle() { } inline TMHZ_EN57(void) : TDriverHandle() { }
}; };
/* FBS2= class(TTHandle) /* FBS2= class(TTDriverHandle)
private private
CP, TP, RP: real; //zbiornik steruj¹cy, czasowy, redukcyjny CP, TP, RP: real; //zbiornik steruj¹cy, czasowy, redukcyjny
XP: real; //komora powietrzna w reduktorze — jest potrzebna do odwzorowania fali XP: real; //komora powietrzna w reduktorze — jest potrzebna do odwzorowania fali
@@ -614,7 +612,7 @@ namespace Hamulce
function GetPos(i: byte): real; override; function GetPos(i: byte): real; override;
end; */ end; */
/* TD2= class(TTHandle) /* TD2= class(TTDriverHandle)
private private
CP, TP, RP: real; //zbiornik steruj¹cy, czasowy, redukcyjny CP, TP, RP: real; //zbiornik steruj¹cy, czasowy, redukcyjny
XP: real; //komora powietrzna w reduktorze — jest potrzebna do odwzorowania fali XP: real; //komora powietrzna w reduktorze — jest potrzebna do odwzorowania fali
@@ -630,7 +628,7 @@ namespace Hamulce
end;*/ end;*/
class TM394 : public THandle class TM394 : public TDriverHandle
{ {
private: private:
@@ -644,12 +642,12 @@ namespace Hamulce
double GetCP()/*override*/; double GetCP()/*override*/;
double GetPos(Byte i)/*override*/; double GetPos(Byte i)/*override*/;
inline TM394(void) : THandle() { } inline TM394(void) : TDriverHandle() { }
}; };
class TH14K1 : public THandle class TH14K1 : public TDriverHandle
{ {
protected: protected:
@@ -663,7 +661,7 @@ namespace Hamulce
double GetCP()/*override*/; double GetCP()/*override*/;
double GetPos(Byte i)/*override*/; double GetPos(Byte i)/*override*/;
inline TH14K1(void) : THandle() { } inline TH14K1(void) : TDriverHandle() { }
}; };
@@ -685,7 +683,7 @@ namespace Hamulce
class Ttest : public THandle class Ttest : public TDriverHandle
{ {
private: private:
@@ -695,12 +693,12 @@ namespace Hamulce
double GetPF(double i_bcp, double PP, double HP, double dt, double ep)/*override*/; double GetPF(double i_bcp, double PP, double HP, double dt, double ep)/*override*/;
void Init(double Press)/*override*/; void Init(double Press)/*override*/;
inline Ttest(void) : THandle() { } inline Ttest(void) : TDriverHandle() { }
}; };
class TFD1 : public THandle class TFD1 : public TDriverHandle
{ {
private: private:
@@ -715,12 +713,12 @@ namespace Hamulce
void SetSpeed(double nSpeed); void SetSpeed(double nSpeed);
// procedure Init(press: real; MaxBP: real); overload; // procedure Init(press: real; MaxBP: real); overload;
inline TFD1(void) : THandle() { } inline TFD1(void) : TDriverHandle() { }
}; };
class TH1405 : public THandle class TH1405 : public TDriverHandle
{ {
private: private:
@@ -733,13 +731,13 @@ namespace Hamulce
double GetCP()/*override*/; double GetCP()/*override*/;
// procedure Init(press: real; MaxBP: real); overload; // procedure Init(press: real; MaxBP: real); overload;
inline TH1405(void) : THandle() { } inline TH1405(void) : TDriverHandle() { }
}; };
class TFVel6 : public THandle class TFVel6 : public TDriverHandle
{ {
private: private:
@@ -752,7 +750,7 @@ namespace Hamulce
double GetSound(Byte i)/*override*/; double GetSound(Byte i)/*override*/;
void Init(double Press)/*override*/; void Init(double Press)/*override*/;
inline TFVel6(void) : THandle() { } inline TFVel6(void) : TDriverHandle() { }
}; };
@@ -763,9 +761,8 @@ namespace Hamulce
extern double PFVd(double PH, double PL, double S, double LIM, double DP = 0.1); //zawor wypuszczajacy z PH do PL, PH do LIM extern double PFVd(double PH, double PL, double S, double LIM, double DP = 0.1); //zawor wypuszczajacy z PH do PL, PH do LIM
extern long lround(double value); //zastepuje funkcje nieobecna w C++99 extern long lround(double value); //zastepuje funkcje nieobecna w C++99
}
#if !defined(NO_IMPLICIT_NAMESPACE_USE) #if !defined(NO_IMPLICIT_NAMESPACE_USE)
using namespace Hamulce;
#endif #endif
#endif//INCLUDED_HAMULCE_H #endif//INCLUDED_HAMULCE_H
//END //END

2
Train.cpp
View File

@@ -3752,7 +3752,7 @@ bool TTrain::Update()
if ((mvOccupied->BrakeLocHandle == FD1)) if ((mvOccupied->BrakeLocHandle == FD1))
{ {
double b = Console::AnalogCalibrateGet(1); double b = Console::AnalogCalibrateGet(1);
b = Global::CutValueToRange(0.0, b, Hamulce::LocalBrakePosNo); // przyciêcie zmiennej do granic b = Global::CutValueToRange(0.0, b, LocalBrakePosNo); // przyciêcie zmiennej do granic
ggLocalBrake.UpdateValue(b); // przesów bez zaokr¹glenia ggLocalBrake.UpdateValue(b); // przesów bez zaokr¹glenia
mvOccupied->LocalBrakePos = mvOccupied->LocalBrakePos =
int(1.09 * b); // sposób zaokr¹glania jest do ustalenia int(1.09 * b); // sposób zaokr¹glania jest do ustalenia