18
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-21 05:04:58 +01:00

feat(editor): area fill: Enter finishes an area, Esc drops the outline, a list of filled areas to change later (#241)

* feat(editor): fill_store, the filled areas kept in the scenery as //$f lines

* feat(editor): fill_store: reading and writing the filled areas

* build: editorFillStore.cpp

* feat(scene): //$f lines of the filled areas kept with the layer files

* feat(editor): area fill: the members of the list of filled areas

* lang(pl): area fill list

* feat(editor): area fill: Enter finishes an area, Esc drops the outline, filled areas listed to be changed later

* fix(editor): the filled areas kept as //$w lines, //$f being the fitted tracks of the profile tool

* fix(editor): a changed area keeps its own rotation and its layer; its models go to the layer of the area, on an undo as on a refill

Change + Enter took the rotation of the Functions panel instead of the area's own:
the area keeps it now, unless the rotation of the panel is changed while the area
is picked up.

The models of an area were made in the active layer, the area record stayed in its
own: on an undo of a change or a removal, with another layer active, they were
saved apart. create_model() takes the layer to put the model in (none: the active
one, as before), and the models of an area go to the layer of the area (the active
one if that's gone). The active layer isn't switched for it: Layers.active() also
shows and unlocks the layer it's given.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01DDcMn1Q7wdYkbxDUWscNHZ

* chore(editor): the seeded generator of the area fill marked as not security (Sonar cpp:S2245)

The fill must repeat from its seed (the same area filled again gets the
same objects), so a cryptographic generator is not wanted there.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01DDcMn1Q7wdYkbxDUWscNHZ

* ci(windows): build lua51.dll for the unit tests

(cherry picked from commit b3e6e02779)

* fix(editor): the filled areas kept under //$u, as //$w is the mark of the shared grade lines on master

After the review of jerrrrycho: on master //$w is the mark of the shared grade lines (scenelayers.cpp,
editormodegradeline.cpp), and both stores save through Layers.mark(Layer, Mark, Lines), which replaces the
lines of the mark. Once master reached this branch, a layer with a grade line and a filled area would have
kept only the lines of whichever store saved last; before that, a master build reads the lines of the areas
as grade lines it doesn't know.

The area fill takes //$u, free on master, on feat/gl46-migration and in the letters of the starters
(n d f i l a), and the same letter the ficzery2 builds the testers have already save the areas under, so
their sceneries keep their areas. A scenery saved by a build of this PR before this commit has its areas
under //$w: they are no longer read as areas; saved again, the editor keeps those lines as lines it doesn't
know.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QRgQ1K1Qu7TCsa74zsNURd

---------

Co-authored-by: miloszunio <miloszunio@users.noreply.github.com>
Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: Hirek193 <polomarket73@gmail.com>
This commit is contained in:
pol102
2026-11-20 03:56:13 +01:00
committed by GitHub
parent 793ff968de
commit c9c390017a
11 changed files with 779 additions and 105 deletions

View File

@@ -3309,6 +3309,57 @@ msgstr "Szacowana liczba obiektów: %.0f"
msgid "Fill area"
msgstr "Wypełnij obszar"
msgid "LMB: add outline point Backspace: remove last point Enter: fill and finish Esc: drop the outline"
msgstr "LPM: dodaj punkt obrysu Backspace: usuń ostatni punkt Enter: wypełnij i zakończ Esc: porzuć obrys"
msgid "Changing: %s"
msgstr "Zmieniasz: %s"
msgid "Fill area (Enter)"
msgstr "Wypełnij obszar (Enter)"
msgid "Fill again (Enter)"
msgstr "Wypełnij od nowa (Enter)"
msgid "Undo last fill"
msgstr "Cofnij ostatnie wypełnienie"
msgid "Area %zu"
msgstr "Obszar %zu"
msgid "%s: placed %zu of %zu objects"
msgstr "%s: postawiono %zu z %zu obiektów"
msgid "%s left as it was"
msgstr "%s zostaje bez zmian"
msgid "%s picked up: change the outline or the settings, Enter fills it anew, Esc leaves it as it was"
msgstr "%s do zmiany: popraw obrys albo ustawienia, Enter wypełnia od nowa, Esc zostawia bez zmian"
msgid "%s removed with its %zu objects"
msgstr "Usunięto %s razem z obiektami (%zu)"
msgid "%s back as it was, %zu objects"
msgstr "%s przywrócony, obiektów: %zu"
msgid "Filled areas: %zu"
msgstr "Wypełnione obszary: %zu"
msgid "None yet. Enter fills the outline and puts the area here, to be changed later"
msgstr "Jeszcze żadnego. Enter wypełnia obrys i dopisuje obszar tutaj, do późniejszej zmiany"
msgid "ha"
msgstr "ha"
msgid "Change"
msgstr "Zmień"
msgid "Its outline and settings back in the tool: move the points, change the models or the density, Enter fills it anew"
msgstr "Obrys i ustawienia wracają do narzędzia: przesuń punkty, zmień modele albo gęstość, Enter wypełnia od nowa"
msgid "The area and its models removed; Undo last fill brings them back"
msgstr "Usuwa obszar i jego modele; Cofnij ostatnie wypełnienie przywraca je"
msgid "Copies of the selected model, set out in a row"
msgstr "Kopie zaznaczonego modelu, ustawione w rzędzie"