From 67815379ddf4ad6c75aeaba6178651cec228477b Mon Sep 17 00:00:00 2001 From: firleju Date: Fri, 6 Jan 2017 21:05:33 +0100 Subject: [PATCH] =?UTF-8?q?B=C5=82=C4=85d=20w=20TPrzek=C5=82adnik=20za?= =?UTF-8?q?=C5=82atany?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- McZapkie/Oerlikon_ESt.cpp | 10 +++++++++- McZapkie/Oerlikon_ESt.h | 12 ++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/McZapkie/Oerlikon_ESt.cpp b/McZapkie/Oerlikon_ESt.cpp index 953982df..950a73c9 100644 --- a/McZapkie/Oerlikon_ESt.cpp +++ b/McZapkie/Oerlikon_ESt.cpp @@ -527,7 +527,7 @@ void TNESt3::SetSize(int size, std::string params) // ustawianie dysz (rozmiaru else Przekladniki[2] = new TRura(); - if ((params.find("3d") + params.find("4d") != std::string::npos)) + if ((params.find("3d") + params.find("4d")) != std::string::npos) autom = false; else autom = true; @@ -549,6 +549,7 @@ void TNESt3::SetSize(int size, std::string params) // ustawianie dysz (rozmiaru Nozzles[dPm] = 1.25; Nozzles[dPO] = Nozzles[dON]; Nozzles[dPT] = Nozzles[dTN]; + break; } case 14: { // dON,dOO,dTN,dTO,dP,dS @@ -561,6 +562,7 @@ void TNESt3::SetSize(int size, std::string params) // ustawianie dysz (rozmiaru Nozzles[dPm] = 1.10; Nozzles[dPO] = Nozzles[dON]; Nozzles[dPT] = Nozzles[dTN]; + break; } case 12: { // dON,dOO,dTN,dTO,dP,dS @@ -573,6 +575,7 @@ void TNESt3::SetSize(int size, std::string params) // ustawianie dysz (rozmiaru Nozzles[dPm] = 0.85; Nozzles[dPO] = Nozzles[dON]; Nozzles[dPT] = Nozzles[dTN]; + break; } case 10: { // dON,dOO,dTN,dTO,dP,dS @@ -585,6 +588,7 @@ void TNESt3::SetSize(int size, std::string params) // ustawianie dysz (rozmiaru Nozzles[dPm] = 0.7; Nozzles[dPO] = Nozzles[dON]; Nozzles[dPT] = Nozzles[dTN]; + break; } case 200: { // dON,dOO,dTN,dTO,dP,dS @@ -597,6 +601,7 @@ void TNESt3::SetSize(int size, std::string params) // ustawianie dysz (rozmiaru Nozzles[dPm] = 2.5; Nozzles[dPO] = 7.28; Nozzles[dPT] = 2.96; + break; } case 375: { // dON,dOO,dTN,dTO,dP,dS @@ -609,6 +614,7 @@ void TNESt3::SetSize(int size, std::string params) // ustawianie dysz (rozmiaru Nozzles[dPm] = 4.4; Nozzles[dPO] = 9.92; Nozzles[dPT] = 3.99; + break; } case 150: { // dON,dOO,dTN,dTO,dP,dS @@ -621,6 +627,7 @@ void TNESt3::SetSize(int size, std::string params) // ustawianie dysz (rozmiaru Nozzles[dPm] = 1.9; Nozzles[dPO] = 6.33; Nozzles[dPT] = 2.58; + break; } case 100: { // dON,dOO,dTN,dTO,dP,dS @@ -633,6 +640,7 @@ void TNESt3::SetSize(int size, std::string params) // ustawianie dysz (rozmiaru Nozzles[dPm] = 1.4; Nozzles[dPO] = 5.19; Nozzles[dPT] = 2.14; + break; } default: { diff --git a/McZapkie/Oerlikon_ESt.h b/McZapkie/Oerlikon_ESt.h index f0bbfbbe..90bc6d18 100644 --- a/McZapkie/Oerlikon_ESt.h +++ b/McZapkie/Oerlikon_ESt.h @@ -77,12 +77,12 @@ class TPrzekladnik : public TReservoir // przekladnik (powtarzacz) TPrzekladnik() : TReservoir() {}; virtual void Update(double dt); - void SetPoslizg(bool flag) {}; - void SetP(double P) {}; - void SetMult(double m) {}; - void SetLBP(double P) {}; - void SetRapidParams(double mult, double size) {}; - void SetRapidStatus(bool rs) {}; + virtual void SetPoslizg(bool flag) {}; + virtual void SetP(double P) {}; + virtual void SetMult(double m) {}; + virtual void SetLBP(double P) {}; + virtual void SetRapidParams(double mult, double size) {}; + virtual void SetRapidStatus(bool rs) {}; }; class TRura : public TPrzekladnik // nieprzekladnik, rura laczaca