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

StopModel: do not skip stops when setting type in a range.

Browse source 
If we skip a stop, arrival of next stops might get shifted wrongly.
Insetead just do not set Transit type on stops which (un)couple
rollingstock items but still shift them as needed.
This commit is contained in:
Filippo Gentile 2022-09-10 13:02:22 +02:00
parent 1bc031cae6
commit 42a468a1b5
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/jobs/jobeditor/model/stopmodel.cpp
View file

@ -1016,6 +1016,7 @@ bool StopModel::setStopTypeRange(int firstRow, int lastRow, StopType type)
}
//Cannot couple or uncouple in transits
bool canBeTransit = true;
if(destType == StopType::Transit)
{
q_getCoupled.bind(1, s.stopId);
@ -1026,7 +1027,7 @@ bool StopModel::setStopTypeRange(int firstRow, int lastRow, StopType type)
{
qWarning() << "Error: trying to set Transit on stop:" << s.stopId << "Job:" << mJobId
<< "while having coupling operation for this stop";
continue;
canBeTransit = false;
}
if(res != SQLITE_OK && res != SQLITE_DONE)
{
@ -1052,7 +1053,7 @@ bool StopModel::setStopTypeRange(int firstRow, int lastRow, StopType type)
s.departure = s.arrival.addMSecs(defaultStopMsec);
}
}
else
else if(canBeTransit)
{
s.type = StopType::Transit;
//Transit don't stop so departure is the same of arrival -> stop time = 0 minutes