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

fix(editor): a point taken out of a grade line leaves its neighbours with the radius of the limits, and paths meeting at a sharp break keep their own grades

Browse Source 
The points of a grade line read from the tracks keep the radius measured there; once a point between them was taken out, the
breaks of its neighbours changed while their radii stayed, so a break without a curve read as 0.4 per mille became one of
9 per mille with no curve, and the tracks took it as a kink. The neighbours of the point taken out follow the limits now,
with the button, Del and the self-test alike (profile_remove_point).

Applying a line with a break without a curve gave the path which ends at the break the grade of the element after it, so
its Hermite heights bowed 0.12 m off the line over 100 m before the break; each path takes the grade on its own side now.

Self-test commands vprofilerun, vprofiledel and vprofileput.
This commit is contained in:
maj00r
2026-10-21 17:25:17 +02:00
parent d2d06817bc
commit e86a536a9d
4 changed files with 78 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
application/editormodeprofile.cpp
View File

@@ -630,6 +630,20 @@ void editor_mode::profile_edited()
first_step_done(first_step::profile_point);
}
void editor_mode::profile_remove_point(int const Index)
{
auto &state{m_profile};
auto &points{state.line.points};
if (Index <= 0 || Index + 1 >= static_cast<int>(points.size()))
return;
points.erase(points.begin() + Index);
for (auto const neighbour : {Index - 1, Index})
if (neighbour > 0 && neighbour + 1 < static_cast<int>(points.size()) && false == points[neighbour].joint)
points[neighbour].automatic = true;
state.selected = -1;
profile_edited();
}
void editor_mode::profile_open(TTrack *From, TTrack *To)
{
auto &state{m_profile};
@@ -2086,9 +2100,8 @@ void editor_mode::render_profile_point()
ImGui::SameLine();
if (ImGui::Button(STR_C("Remove Del")))
{
points.erase(points.begin() + index);
state.selected = -1;
changed = true;
profile_remove_point(index);
return;
}
}
}
@@ -2513,11 +2526,7 @@ bool editor_mode::profile_canvas_edit(profile_view const &View, bool const Hover
else
state.curve_grip = -1;
if ((Hovered || ImGui::IsWindowFocused()) && state.selected > 0 && state.selected + 1 < static_cast<int>(points.size()) && false == points[state.selected].joint && ImGui::IsKeyPressed(ImGuiKey_Delete))
{
points.erase(points.begin() + state.selected);
state.selected = -1;
changed = true;
}
profile_remove_point(state.selected);
return changed;
}