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

Added python vars for display more vehicles in train.

Browse Source 
Added missing python libs.
This commit is contained in:
Firleju
2015-05-06 21:23:25 +02:00
parent d1e0dcc737
commit 85e65bfe66
4 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Dokumentacja zmiennych Python.docx
View File

Binary file not shown.

1
PyInt.h
View File

@@ -11,6 +11,7 @@
#define PyGetFloat(param) PyFloat_FromDouble(param >= 0 ? param : -param) #define PyGetFloat(param) PyFloat_FromDouble(param >= 0 ? param : -param)
#define PyGetInt(param) PyInt_FromLong(param) #define PyGetInt(param) PyInt_FromLong(param)
#define PyGetFloatS(param) PyFloat_FromDouble(param)
#define PyGetBool(param) param ? Py_True : Py_False #define PyGetBool(param) param ? Py_True : Py_False
struct ltstr struct ltstr

13
Train.cpp
View File

@@ -290,6 +290,15 @@ PyObject *TTrain::GetTrainState()
PyDict_SetItemString(dict, "minutes", PyGetInt(GlobalTime->mm)); PyDict_SetItemString(dict, "minutes", PyGetInt(GlobalTime->mm));
PyDict_SetItemString(dict, "seconds", PyGetInt(GlobalTime->mr)); PyDict_SetItemString(dict, "seconds", PyGetInt(GlobalTime->mr));
PyDict_SetItemString(dict, "velocity_desired", PyGetFloat(DynamicObject->Mechanik->VelDesired)); PyDict_SetItemString(dict, "velocity_desired", PyGetFloat(DynamicObject->Mechanik->VelDesired));
Char* TXTT[10] = { "fd", "fdt", "fdb", "pd", "pdt", "pdb", "itothv", "1", "2", "3" };
Char* TXTC[10] = { "fr", "frt", "frb", "pr", "prt", "prb", "im", "vm", "ihv", "uhv" };
for (int j = 0; j<10; j++)
PyDict_SetItemString(dict, (AnsiString("eimp_t_") + AnsiString(TXTT[j])).c_str(), PyGetFloatS(fEIMParams[0][j]));
for (int i = 0; i<8; i++)
for (int j = 0; j<10; j++)
PyDict_SetItemString(dict, (AnsiString("eimp_c") + IntToStr(i + 1) + AnsiString("_") + AnsiString(TXTC[j])).c_str(), PyGetFloatS(fEIMParams[i + 1][j]));
PyDict_SetItemString(dict, "car_no", PyGetInt(iCarNo));
PyDict_SetItemString(dict, "power_no", PyGetInt(iPowerNo));
return dict; return dict;
} }
@@ -2572,6 +2581,8 @@ bool TTrain::Update()
TDynamicObject *p = DynamicObject->GetFirstDynamic(mvOccupied->ActiveCab < 0 ? 1 : 0); TDynamicObject *p = DynamicObject->GetFirstDynamic(mvOccupied->ActiveCab < 0 ? 1 : 0);
int in = 0; int in = 0;
fEIMParams[0][6] = 0; fEIMParams[0][6] = 0;
iCarNo = 0;
iPowerNo = 0;
for (int i = 0; i < 20; i++) for (int i = 0; i < 20; i++)
{ {
if (p) if (p)
@@ -2595,8 +2606,10 @@ bool TTrain::Update()
fEIMParams[1 + in][9] = p->MoverParameters->Voltage; fEIMParams[1 + in][9] = p->MoverParameters->Voltage;
fEIMParams[0][6] += fEIMParams[1 + in][8]; fEIMParams[0][6] += fEIMParams[1 + in][8];
in++; in++;
iPowerNo = in;
} }
p = p->NextC(4); p = p->NextC(4);
iCarNo = i;
} }
else else
{ {

1
Train.h
View File

@@ -379,6 +379,7 @@ class TTrain
float fHCurrent[4]; // pr?dy: suma i amperomierze 1,2,3 float fHCurrent[4]; // pr?dy: suma i amperomierze 1,2,3
float fEngine[4]; // obroty te? trzeba pobra? float fEngine[4]; // obroty te? trzeba pobra?
float fPress[20][3]; // cisnienia dla wszystkich czlonow float fPress[20][3]; // cisnienia dla wszystkich czlonow
int iCarNo, iPowerNo; //liczba pojazdow i czlonow napednych
bool bDoors[20]; // drzwi dla wszystkich czlonow bool bDoors[20]; // drzwi dla wszystkich czlonow
// McZapkie: do syczenia // McZapkie: do syczenia
float fPPress, fNPress; float fPPress, fNPress;