eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-06 00:02:26 +01:00
Code Issues 150 Wiki Activity

refactor(sonar): remove redundant parentheses (cpp:S1110)

Browse Source
This commit is contained in:
jerrrrycho
2026-10-10 15:55:46 +02:00
parent 413009e59e
commit 9aa7e658ac
5 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
McZapkie/Mover.cpp
View File

@@ -592,7 +592,7 @@ bool TMoverParameters::Attach(int ConnectNo, int ConnectToNr, TMoverParameters *
} }
auto &coupler{Couplers[ConnectNo]}; auto &coupler{Couplers[ConnectNo]};
auto &othercoupler = ConnectTo->Couplers[(ConnectToNr != 2 ? ConnectToNr : coupler.ConnectedNr)]; auto &othercoupler = ConnectTo->Couplers[ConnectToNr != 2 ? ConnectToNr : coupler.ConnectedNr];
auto const distance{CouplerDist(this, ConnectTo) - (coupler.adapter_length + othercoupler.adapter_length)}; auto const distance{CouplerDist(this, ConnectTo) - (coupler.adapter_length + othercoupler.adapter_length)};
@@ -1836,7 +1836,7 @@ void TMoverParameters::PowerCouplersCheck(double const /*Deltatime*/, coupling c
auto &coupler{Couplers[side]}; auto &coupler{Couplers[side]};
// NOTE: in the loop we actually update the state of the coupler on the opposite end of the vehicle // NOTE: in the loop we actually update the state of the coupler on the opposite end of the vehicle
auto &oppositecoupler{Couplers[(side == end::front ? end::rear : end::front)]}; auto &oppositecoupler{Couplers[side == end::front ? end::rear : end::front]};
bool oppositecouplingispresent; bool oppositecouplingispresent;
bool localpowerexportisenabled; bool localpowerexportisenabled;
@@ -1953,7 +1953,7 @@ void TMoverParameters::PowerCouplersCheck(double const /*Deltatime*/, coupling c
continue; continue;
} }
auto const &connectedothercoupler{coupler.Connected->Couplers[(coupler.ConnectedNr == end::front ? end::rear : end::front)]}; auto const &connectedothercoupler{coupler.Connected->Couplers[coupler.ConnectedNr == end::front ? end::rear : end::front]};
auto const *connectedothercoupling = Coupling == coupling::highvoltage ? &connectedothercoupler.power_high : auto const *connectedothercoupling = Coupling == coupling::highvoltage ? &connectedothercoupler.power_high :
Coupling == coupling::power110v ? &connectedothercoupler.power_110v : Coupling == coupling::power110v ? &connectedothercoupler.power_110v :
Coupling == coupling::power24v ? &connectedothercoupler.power_24v : Coupling == coupling::power24v ? &connectedothercoupler.power_24v :
@@ -4917,7 +4917,7 @@ void TMoverParameters::ComputeConstans(void)
// drag calculation // drag calculation
{ {
// NOTE: draft effect of previous vehicle is simplified and doesn't have much to do with reality // NOTE: draft effect of previous vehicle is simplified and doesn't have much to do with reality
auto const *previousvehicle{Couplers[(V >= 0.0 ? end::front : end::rear)].Connected}; auto const *previousvehicle{Couplers[V >= 0.0 ? end::front : end::rear].Connected};
auto dragarea{Dim.W * Dim.H}; auto dragarea{Dim.W * Dim.H};
if (previousvehicle) if (previousvehicle)
{ {
@@ -5478,7 +5478,7 @@ double TMoverParameters::TractionForce(double dt)
if (EIMCtrlType > 0) // sterowanie cyfrowe if (EIMCtrlType > 0) // sterowanie cyfrowe
tmp = (DElist[0].RPM + (DElist[MainCtrlPosNo].RPM - DElist[0].RPM) * std::max(0.0, eimic_real)) / 60.0; tmp = (DElist[0].RPM + (DElist[MainCtrlPosNo].RPM - DElist[0].RPM) * std::max(0.0, eimic_real)) / 60.0;
else else
tmp = DElist[(ControlPressureSwitch ? MainCtrlNoPowerPos() : MainCtrlPos)].RPM / 60.0; tmp = DElist[ControlPressureSwitch ? MainCtrlNoPowerPos() : MainCtrlPos].RPM / 60.0;
if (true == HeatingAllow && HeatingPower > 0 && EngineHeatingRPM > 0) if (true == HeatingAllow && HeatingPower > 0 && EngineHeatingRPM > 0)
{ {
@@ -12565,7 +12565,7 @@ bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CV
auto const inputcab{(static_cast<int>(CValue1) & 0x40) != 0 ? 1 : 0}; auto const inputcab{(static_cast<int>(CValue1) & 0x40) != 0 ? 1 : 0};
auto const inputoperation{static_cast<int>(CValue1) & ~(0x80 | 0x40)}; auto const inputoperation{static_cast<int>(CValue1) & ~(0x80 | 0x40)};
auto const noswap{TrainType == dt_EZT || TrainType == dt_ET41}; auto const noswap{TrainType == dt_EZT || TrainType == dt_ET41};
auto swap{false == noswap && TestFlag(Couplers[(CValue2 == -1 ? end::rear : end::front)].CouplingFlag, coupling::control)}; auto swap{false == noswap && TestFlag(Couplers[CValue2 == -1 ? end::rear : end::front].CouplingFlag, coupling::control)};
if (auto const reversed{inputcab != (CabActive != -1 ? 1 : 0)}; reversed) if (auto const reversed{inputcab != (CabActive != -1 ? 1 : 0)}; reversed)
{ {
swap = !swap; swap = !swap;

4
rendering/particles.h
View File

@@ -56,7 +56,7 @@ public:
return ( return (
m_valuechangemodifier == nullptr ? m_valuechangemodifier == nullptr ?
m_valuechange : m_valuechange :
m_valuechange / *( m_valuechangemodifier ) ); } m_valuechange / *m_valuechangemodifier ); }
private: private:
//types //types
@@ -212,7 +212,7 @@ fixedstep_modifier<Type_>::update( Type_ &Variable, double const Timedelta ) con
auto const valuechange { ( auto const valuechange { (
m_valuechangemodifier == nullptr ? m_valuechangemodifier == nullptr ?
m_valuechange : m_valuechange :
m_valuechange / *( m_valuechangemodifier ) ) }; m_valuechange / *m_valuechangemodifier ) };
Variable += ( valuechange * static_cast<float>( Timedelta ) ); Variable += ( valuechange * static_cast<float>( Timedelta ) );
// clamp down to allowed value range // clamp down to allowed value range
Variable = glm::max( Variable, m_valuelimits[ value_limit::min ] ); Variable = glm::max( Variable, m_valuelimits[ value_limit::min ] );

24
vehicle/Train.cpp
View File

@@ -8405,14 +8405,14 @@ bool TTrain::Update(double const Deltatime)
{ {
m_doors = DynamicObject->Mechanik->IsAnyDoorOpen[side::right] || DynamicObject->Mechanik->IsAnyDoorOpen[side::left]; m_doors = DynamicObject->Mechanik->IsAnyDoorOpen[side::right] || DynamicObject->Mechanik->IsAnyDoorOpen[side::left];
m_doorpermits = DynamicObject->Mechanik->IsAnyDoorPermitActive[side::right] || DynamicObject->Mechanik->IsAnyDoorPermitActive[side::left]; m_doorpermits = DynamicObject->Mechanik->IsAnyDoorPermitActive[side::right] || DynamicObject->Mechanik->IsAnyDoorPermitActive[side::left];
m_doorspermitleft = mvOccupied->Doors.instances[(cab_to_end() == end::front ? side::left : side::right)].open_permit && m_doorspermitleft = mvOccupied->Doors.instances[cab_to_end() == end::front ? side::left : side::right].open_permit &&
(simulation::Time.data().wSecond % 2 < 1 || mvOccupied->DoorsPermitLightBlinking < 1 || (simulation::Time.data().wSecond % 2 < 1 || mvOccupied->DoorsPermitLightBlinking < 1 ||
mvOccupied->DoorsPermitLightBlinking < 2 && DynamicObject->Mechanik->IsAnyDoorOpen[(cab_to_end() == end::front ? side::left : side::right)] || mvOccupied->DoorsPermitLightBlinking < 2 && DynamicObject->Mechanik->IsAnyDoorOpen[cab_to_end() == end::front ? side::left : side::right] ||
(mvOccupied->DoorsPermitLightBlinking < 3 && DynamicObject->Mechanik->IsAnyDoorOnlyOpen[(cab_to_end() == end::front ? side::left : side::right)])); (mvOccupied->DoorsPermitLightBlinking < 3 && DynamicObject->Mechanik->IsAnyDoorOnlyOpen[cab_to_end() == end::front ? side::left : side::right]));
m_doorspermitright = mvOccupied->Doors.instances[(cab_to_end() == end::front ? side::right : side::left)].open_permit && m_doorspermitright = mvOccupied->Doors.instances[cab_to_end() == end::front ? side::right : side::left].open_permit &&
(simulation::Time.data().wSecond % 2 < 1 || mvOccupied->DoorsPermitLightBlinking < 1 || (simulation::Time.data().wSecond % 2 < 1 || mvOccupied->DoorsPermitLightBlinking < 1 ||
mvOccupied->DoorsPermitLightBlinking < 2 && DynamicObject->Mechanik->IsAnyDoorOpen[(cab_to_end() == end::front ? side::right : side::left)] || mvOccupied->DoorsPermitLightBlinking < 2 && DynamicObject->Mechanik->IsAnyDoorOpen[cab_to_end() == end::front ? side::right : side::left] ||
(mvOccupied->DoorsPermitLightBlinking < 3 && DynamicObject->Mechanik->IsAnyDoorOnlyOpen[(cab_to_end() == end::front ? side::right : side::left)])); (mvOccupied->DoorsPermitLightBlinking < 3 && DynamicObject->Mechanik->IsAnyDoorOnlyOpen[cab_to_end() == end::front ? side::right : side::left]));
} }
m_dirforward = mvControlled->DirActive > 0; m_dirforward = mvControlled->DirActive > 0;
m_dirneutral = mvControlled->DirActive == 0; m_dirneutral = mvControlled->DirActive == 0;
@@ -9015,8 +9015,8 @@ bool TTrain::Update(double const Deltatime)
// NBMX wrzesien 2003 - drzwi oraz sygnał odjazdu // NBMX wrzesien 2003 - drzwi oraz sygnał odjazdu
if (DynamicObject->Mechanik != nullptr) if (DynamicObject->Mechanik != nullptr)
{ {
btLampkaDoorLeft.Turn(DynamicObject->Mechanik->IsAnyDoorOpen[(cab_to_end() == end::front ? side::left : side::right)]); btLampkaDoorLeft.Turn(DynamicObject->Mechanik->IsAnyDoorOpen[cab_to_end() == end::front ? side::left : side::right]);
btLampkaDoorRight.Turn(DynamicObject->Mechanik->IsAnyDoorOpen[(cab_to_end() == end::front ? side::right : side::left)]); btLampkaDoorRight.Turn(DynamicObject->Mechanik->IsAnyDoorOpen[cab_to_end() == end::front ? side::right : side::left]);
} }
btLampkaBlokadaDrzwi.Turn(mvOccupied->Doors.is_locked); btLampkaBlokadaDrzwi.Turn(mvOccupied->Doors.is_locked);
btLampkaDoorLockOff.Turn(false == mvOccupied->Doors.lock_enabled); btLampkaDoorLockOff.Turn(false == mvOccupied->Doors.lock_enabled);
@@ -11344,16 +11344,16 @@ void TTrain::set_cab_controls(int const Cab)
// doors permits // doors permits
if (false == ggDoorLeftPermitButton.is_push()) if (false == ggDoorLeftPermitButton.is_push())
{ {
ggDoorLeftPermitButton.PutValue(mvOccupied->Doors.instances[(cab_to_end() == end::front ? side::left : side::right)].open_permit ? 1.f : 0.f); ggDoorLeftPermitButton.PutValue(mvOccupied->Doors.instances[cab_to_end() == end::front ? side::left : side::right].open_permit ? 1.f : 0.f);
} }
if (false == ggDoorRightPermitButton.is_push()) if (false == ggDoorRightPermitButton.is_push())
{ {
ggDoorRightPermitButton.PutValue(mvOccupied->Doors.instances[(cab_to_end() == end::front ? side::right : side::left)].open_permit ? 1.f : 0.f); ggDoorRightPermitButton.PutValue(mvOccupied->Doors.instances[cab_to_end() == end::front ? side::right : side::left].open_permit ? 1.f : 0.f);
} }
ggDoorPermitPresetButton.PutValue(static_cast<float>(mvOccupied->Doors.permit_preset)); ggDoorPermitPresetButton.PutValue(static_cast<float>(mvOccupied->Doors.permit_preset));
// door controls // door controls
ggDoorLeftButton.PutValue(mvOccupied->Doors.instances[(cab_to_end() == end::front ? side::left : side::right)].is_closed ? 0.f : 1.f); ggDoorLeftButton.PutValue(mvOccupied->Doors.instances[cab_to_end() == end::front ? side::left : side::right].is_closed ? 0.f : 1.f);
ggDoorRightButton.PutValue(mvOccupied->Doors.instances[(cab_to_end() == end::front ? side::right : side::left)].is_closed ? 0.f : 1.f); ggDoorRightButton.PutValue(mvOccupied->Doors.instances[cab_to_end() == end::front ? side::right : side::left].is_closed ? 0.f : 1.f);
// door lock // door lock
ggDoorSignallingButton.PutValue(mvOccupied->Doors.lock_enabled ? 1.f : 0.f); ggDoorSignallingButton.PutValue(mvOccupied->Doors.lock_enabled ? 1.f : 0.f);
// door step // door step

16
widgets/trainingcard.cpp
View File

@@ -63,16 +63,16 @@ void trainingcard_panel::save_thread_func()
if (in_line.compare(0, magic.size(), magic) == 0) if (in_line.compare(0, magic.size(), magic) == 0)
{ {
temp << "<div><b>Miejsce: </b>" << (std::string(place.c_str())) << "</div><br />" << std::endl; temp << "<div><b>Miejsce: </b>" << (std::string(place.c_str())) << "</div><br />" << std::endl;
temp << "<div><b>Data: </b>" << (date) << "</div><br />" << std::endl; temp << "<div><b>Data: </b>" << date << "</div><br />" << std::endl;
temp << "<div><b>Czas: </b>" << (from) << " - " << (to) << "</div><br />" << std::endl; temp << "<div><b>Czas: </b>" << from << " - " << to << "</div><br />" << std::endl;
temp << "<div><b>Imię (imiona) i nazwisko szkolonego: </b>" << (trainee_name) << "</div><br />" << std::endl; temp << "<div><b>Imię (imiona) i nazwisko szkolonego: </b>" << trainee_name << "</div><br />" << std::endl;
temp << "<div><b>Data urodzenia: </b>" << (trainee_birthdate) << "</div><br />" << std::endl; temp << "<div><b>Data urodzenia: </b>" << trainee_birthdate << "</div><br />" << std::endl;
temp << "<div><b>Firma: </b>" << (trainee_company) << "</div><br />" << std::endl; temp << "<div><b>Firma: </b>" << trainee_company << "</div><br />" << std::endl;
temp << "<div><b>Imię i nazwisko instruktora: </b>" << (instructor_name) << "</div><br />" << std::endl; temp << "<div><b>Imię i nazwisko instruktora: </b>" << instructor_name << "</div><br />" << std::endl;
temp << "<div><b>Odcinek trasy: </b>" << (track_segment) << "</div><br />" << std::endl; temp << "<div><b>Odcinek trasy: </b>" << track_segment << "</div><br />" << std::endl;
if (distance > 0.0f) if (distance > 0.0f)
temp << "<div><b>Przebyta odległość: </b>" << std::round(distance) << " km</div><br />" << std::endl; temp << "<div><b>Przebyta odległość: </b>" << std::round(distance) << " km</div><br />" << std::endl;
temp << "<div><b>Uwagi: </b><br />" << (remarks) << "</div>" << std::endl; temp << "<div><b>Uwagi: </b><br />" << remarks << "</div>" << std::endl;
} }
else else
{ {

2
world/Segment.cpp
View File

@@ -242,7 +242,7 @@ double TSegment::FastGetTFromS(double const s) const
double const h01 = -2.0 * u3 + 3.0 * u2; double const h01 = -2.0 * u3 + 3.0 * u2;
double const t = ( ( 1.0 - h01 ) * fTsBuffer[ i ] + double const t = ( ( 1.0 - h01 ) * fTsBuffer[ i ] +
( u3 - 2.0 * u2 + u ) * fTsSlope [ i ] + ( u3 - 2.0 * u2 + u ) * fTsSlope [ i ] +
( h01 ) * fTsBuffer[ i + 1 ] + h01 * fTsBuffer[ i + 1 ] +
( u3 - u2 ) * fTsSlope [ i + 1 ] ); ( u3 - u2 ) * fTsSlope [ i + 1 ] );
return t; return t;
} }