eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-17 20:19:20 +02:00
Code Issues 151 Wiki Activity

fix(editor): the route design keeps its whole fragment after Apply: the last path of the line is the one holding the last piece, not the original end path holding the first piece of its group, so a second Apply (e.g. after changing the share of a compound curve) no longer re-lays only the front part and leaves the old tail lying next to the new paths; the same for the curve laid with the straight tool

Browse Source
This commit is contained in:
maj00r
2026-10-11 17:46:38 +02:00
parent 11aa67378d
commit 3b503ede0c
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
application/editormodetrack.cpp
View File

@@ -2943,9 +2943,9 @@ void editor_mode::route_apply()
{
auto pieces{alignment::pieces(route.result, route.design, chain.tracks.size())};
editor_track::keep_heights(chain, pieces);
relaid = editor_track::relay(chain, pieces);
relaid = editor_track::relay(chain, pieces, &to);
}
else if (false == route_relay_through_switches(chain, states, relaid))
else if (false == route_relay_through_switches(chain, states, relaid, to))
{
undo();
return;
@@ -2978,7 +2978,7 @@ void editor_mode::route_apply()
}
// the switches of the chain are moved as a whole onto the designed line, the regular paths between them re-laid
bool editor_mode::route_relay_through_switches(editor_track::chain const &Chain, std::vector<std::pair<TTrack *, editor_track::state>> &States, std::vector<TTrack *> &Created)
bool editor_mode::route_relay_through_switches(editor_track::chain const &Chain, std::vector<std::pair<TTrack *, editor_track::state>> &States, std::vector<TTrack *> &Created, TTrack *&Last)
{
auto &route{m_route};
auto const &result{route.result};
@@ -3100,7 +3100,10 @@ bool editor_mode::route_relay_through_switches(editor_track::chain const &Chain,
{
auto group{groups[i]};
editor_track::keep_heights(parts[i], group);
auto const added{editor_track::relay(parts[i], group)};
TTrack *last{nullptr};
auto const added{editor_track::relay(parts[i], group, &last)};
if (last != nullptr && parts[i].tracks.back() == Chain.tracks.back())
Last = last;
Created.insert(Created.end(), added.begin(), added.end());
}
return true;
@@ -4402,7 +4405,7 @@ void editor_mode::straight_reshape(editor_track::straight const &Line, double co
}
auto pieces{alignment::pieces(m_route.result, m_route.design, m_route.chain.tracks.size())};
editor_track::keep_heights(m_route.chain, pieces);
auto created{editor_track::relay(m_route.chain, pieces)};
auto created{editor_track::relay(m_route.chain, pieces, &m_route.to)};
editor_track::commit(tracks);
for (auto const &entry : splitstates)
{