16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 10:29:19 +02:00

Merge branch 'tmj-dev' into milek-dev

This commit is contained in:
milek7
2018-04-06 22:33:08 +02:00
13 changed files with 908 additions and 806 deletions

View File

@@ -519,7 +519,7 @@ private:
return mMatrix.readArray(); };
inline double * Matrix() {
return mMatrix.getArray(); };
inline double GetVelocity() {
inline double GetVelocity() const {
return MoverParameters->Vel; };
inline double GetLength() const {
return MoverParameters->Dim.L; };
@@ -562,7 +562,7 @@ private:
float GetEPP(); // wyliczanie sredniego cisnienia w PG
int DirectionSet(int d); // ustawienie kierunku w składzie
// odczyt kierunku w składzie
int DirectionGet() {
int DirectionGet() const {
return iDirection + iDirection - 1; };
int DettachStatus(int dir);
int Dettach(int dir);