gfgit
/
ModelRailroadTimetablePlanner
2
1
Fork 0
Code Issues 16 Pull Requests Packages Projects Releases 6 Wiki Activity

RSCouplingInterface: minor optimization 

Do not check for rollingstock traction type if we already know next
railway segment is electrified (so it accepts all types of engine).
This commit is contained in:
Filippo Gentile 2023-01-10 17:45:51 +01:00
parent 7fb7271745
commit 49c7f60c94
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/jobs/jobeditor/model/rscouplinginterface.cpp
View File

@ -121,7 +121,7 @@ bool RSCouplingInterface::coupleRS(db_id rsId, const QString& rsName, bool on, b
}
}
if(checkTractionType)
if(checkTractionType && !stopsModel->isRailwayElectrifiedAfterStop(m_stopId))
{
//Query RS type
query q_getRSType(mDb, "SELECT rs_models.type,rs_models.sub_type"
@ -140,19 +140,15 @@ bool RSCouplingInterface::coupleRS(db_id rsId, const QString& rsName, bool on, b
if(type == RsType::Engine && subType == RsEngineSubType::Electric)
{
bool electrified = stopsModel->isRailwayElectrifiedAfterStop(m_stopId);
if(!electrified)
{
int but = QMessageBox::warning(qApp->activeWindow(),
tr("Warning"),
tr("Rollingstock %1 is an Electric engine but the line is not electrified\n"
"This engine will not be albe to move a train.\n"
"Do you still want to couple it?")
.arg(rsName),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
if(but == QMessageBox::No)
return false; //Abort
}
int but = QMessageBox::warning(qApp->activeWindow(),
tr("Warning"),
tr("Rollingstock %1 is an Electric engine but the line is not electrified\n"
"This engine will not be albe to move a train.\n"
"Do you still want to couple it?")
.arg(rsName),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
if(but == QMessageBox::No)
return false; //Cancel coupling operation
}
}