eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-28 18:07:29 +01:00
Code Issues 154 Wiki Activity

feat(editor): digitizing takes a line whose tracks lie up to 0.5 m off the curves read from them: the record keeps how far as fit in its source line and counts the tracks within it as lying on it, so they aren't shown as departed; a record whose elements differ from the ones its design makes only by elements of no length is no longer reported as differing

Browse Source
This commit is contained in:
maj00r
2026-10-12 17:42:40 +02:00
parent 096122bcc3
commit 95c3842748
3 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
application/editormodetrack.cpp
View File

@@ -121,6 +121,7 @@ double const kLaySnapRadius{5.0};
float const kSnapPixels{16.0f};
double const kSwitchReach{6.0}; // a press farther from the selected track selects another one instead of placing the switch
double const kLineReach{2000.0}; // how far each way the Curve tab follows the line
double const kDigitizeFit{0.5};
double const kDrawnReach{100000.0};
double const kJointRange{400.0}; // the ends of the paths are drawn for the tracks this close to the camera
ImU32 const kJointColor{IM_COL32(255, 255, 255, 200)};
@@ -1865,6 +1866,8 @@ bool editor_mode::digitize_chain(editor_track::chain const &Chain, std::string *
auto const preferred{m_route.design.shape};
auto const other{preferred == alignment::transition_shape::clothoid ? alignment::transition_shape::cubic_parabola : alignment::transition_shape::clothoid};
alignment::result result;
alignment::design best;
alignment::result bestresult;
double closest{std::numeric_limits<double>::max()};
TTrack *farthest{nullptr};
bool fits{false};
@@ -1906,8 +1909,18 @@ bool editor_mode::digitize_chain(editor_track::chain const &Chain, std::string *
{
closest = away;
farthest = worst;
best = design;
bestresult = result;
}
}
double fit{0.0};
if (false == fits && closest <= kDigitizeFit)
{
design = best;
result = bestresult;
fit = closest;
fits = true;
}
if (false == fits)
{
if (Reason != nullptr)
@@ -1933,7 +1946,7 @@ bool editor_mode::digitize_chain(editor_track::chain const &Chain, std::string *
auto const layer{covered.empty() ? alignment_store::layer_of(*Chain.tracks.front()) : records[*covered.begin()].layer};
for (auto index{covered.rbegin()}; index != covered.rend(); ++index)
alignment_store::forget(*index);
alignment_store::store(design, result, origin, layer, "drawn");
alignment_store::store(design, result, origin, layer, "drawn", fit);
return true;
}