feat(editor): the automatic block both ways or mixed, and the lines out on the schematic

A block boundary of a line both ways has, on each track, the block signal of its trains 15 m before the joint and the one of the wrong-track trains 15 m beyond it, named after its twin with N, both on the outside of the line, the templates leaning the other way picked for the N ones, as on the lines of PKP PLK. The mixed block keeps the automatic block for the trains of the track and the semi-automatic one for the wrong-track ones: no N signals, a warning disc the braking distance before the entry signal of the wrong-track trains. A choice under the table of the lines sets either for the double-track lines of the station, kept in the record of the station, and by itself a line takes the mixed block where a warning disc stands for its wrong-track trains and no N signal does. Set the line signals places the N signals or the warning disc and takes the other away, a block boundary drawn places the N signals of a line both ways, and sbl_odstep.inc switches both block signals of a section with its 7th parameter. The name shown at the mouse while drawing takes the letter the block signal will get where its number stands already.

The station schematic shows the lines out to the next stations straightened: their block sections in the colours of their names with their lengths, the joints, the block signals and the warning discs with their km on the outside of the line, the axis in km; Lines fits them in, a section under the mouse tells its name, length and km, and a click on it flies there in the 3d view.

application/editormodesignal.cpp

@@ -938,7 +938,7 @@ bool editor_mode::signal_heads(std::vector<signal_head> &Heads, bool const Wait)
 		if (item.lamps.empty())
 			continue;
 		auto const kind{kind_index(item.kind)};
-		Heads.push_back({item.file, item.name, item.kind, item.mount, item.lamps, item.speeds, kind >= 0 && m_signal.chosen[kind] == index, item.aspects});
+		Heads.push_back({item.file, item.name, item.kind, item.mount, item.lamps, item.speeds, kind >= 0 && m_signal.chosen[kind] == index, item.aspects, item.lean});
 	}
 	return true;
 }

application/editormodesrk.h

@@ -80,6 +80,7 @@ class srk_tool final : public editor_tool
 		bool reversed{false}; // the km rise to the left of the schematic, the switches numbered from there
 		int braking{0}; // m, the braking distance of the line set by hand, 0: after its speed
 		std::map<std::string, block_kind> blocks; // of the lines by their entry signals, as set by hand
+		std::map<std::string, bool> ways; // the automatic block of the lines by their entry signals both ways, as set by hand
 	};
 	// the schematic: the chainage across, the offsets upwards, exaggerated
 	struct view
@@ -101,6 +102,7 @@ class srk_tool final : public editor_tool
 	std::size_t m_history_revision{0};
 	TTrack const *m_picked{nullptr}; // the track selected when the station was looked for
 	view m_view_state;
+	bool m_fit_lines{false}; // the schematic fits the lines out to the next stations too
 	int m_hover{-1}; // path of the layout under the mouse in the schematic
 	bool m_dragging{false};
 	std::vector<std::pair<std::string, std::size_t>> m_found; // the stations of the scenery: a switch and the count of them
@@ -193,16 +195,45 @@ class srk_tool final : public editor_tool
 		std::string next; // the entry signal of the next station facing out along it, shown; empty for none
 		bool station{false}; // ends at the next station rather than at the end of the tracks
 		std::size_t blocks{0}; // the block signals standing along it
-		std::vector<std::pair<double, std::string>> stops; // the same, out along it, shown
+		// the block boundaries of the same facing its trains, the joints they turn them to stop at, out along it, with the signal shown
+		std::vector<std::pair<double, std::string>> stops;
+		std::vector<std::pair<double, std::string>> wrong; // the block signals facing its wrong-track trains, out along it, shown
 		block_kind block{block_kind::semi};
 		block_reason why{block_reason::single}; // the block it has, so
 		block_kind own{block_kind::semi}; // the block it has by itself, unless set by hand
 		block_reason own_why{block_reason::single};
+		// the automatic block both ways: at each block boundary a block signal of each track either way, the wrong-track one with N
+		bool both{false};
+		bool both_hand{false}; // so set by hand
+		bool own_both{false}; // so by itself
 		// block signals stand along it, none switched by block sections of the editor: it keeps the block of the scenery as it stands
 		bool legacy{false};
 		double braking{0.0}; // m, the braking distance on it
 		std::string km_number; // the line of the kilometrage it runs along
 		bool rising{true}; // its trains run towards the higher km
+		bool km_known{false}; // the km out along it are known
+		// in the schematic, straightened: the chainage of the entry signal, 1 or -1 the way out along the chainage, the offset of the
+		// track there
+		double chainage{0.0};
+		double outward{1.0};
+		double offset{0.0};
+		struct run
+		{
+			double from{0.0}; // out along the line
+			double to{0.0};
+			std::string name;
+			double km_from{0.0};
+			double km_to{0.0};
+		};
+		std::vector<run> sections; // the track circuits along it, out from the station
+		struct post
+		{
+			double distance{0.0}; // out along the line
+			std::string name; // shown
+			bool wrong{false}; // facing the wrong-track trains
+			double km{0.0};
+		};
+		std::vector<post> posts; // the block signals along it
 		// the signals of the other block standing along it: warning discs on a line of the automatic block, block signals on one of the
 		// semi-automatic one, the first of them
 		std::size_t leftovers{0};
@@ -211,6 +242,7 @@ class srk_tool final : public editor_tool
 	};
 	std::vector<line_row> m_lines;
 	std::vector<station::line> m_line_ways; // of the lines listed
+	std::unordered_set<std::string> m_signal_names; // of the signals of the scenery, lowercase: a block signal drawn on one's number takes a letter
 	std::string m_lines_problem; // why the station has no lines listed
 	bool m_drawing{false}; // the block boundaries drawn by hand
 	// a block boundary under the mouse while they are drawn: block signals across the line there, or the ones standing taken away
@@ -219,10 +251,15 @@ class srk_tool final : public editor_tool
 		bool valid{false};
 		bool remove{false};
 		std::string entry; // of the line under the mouse, its entry signal shown
-		glm::dvec3 point{0.0}; // on its axis
-		std::vector<glm::dvec3> places; // of the signals, on the axes of the tracks
-		std::vector<glm::dvec3> ways; // the trains run there
-		std::vector<std::string> names;
+		glm::dvec3 point{0.0}; // the joint, on its axis
+		std::vector<std::pair<glm::dvec3, glm::dvec3>> joints; // of each track, on its axis, the way out along it
+		struct post
+		{
+			glm::dvec3 point{0.0}; // on the axis
+			glm::dvec3 side{1.0, 0.0, 0.0}; // the signal stands off the axis so
+			std::string name;
+		};
+		std::vector<post> posts; // of the block signals
 	};
 	boundary m_boundary;
 	// a block boundary drawn on a line of the automatic block of the open station
@@ -283,6 +320,9 @@ class srk_tool final : public editor_tool
 	// aspects where one of them has, else on a double-track line, of the aspects of the block signal chosen in the Signals tool, else
 	// the semi-automatic one; Own: the block it has by itself
 	block_kind block_of(station::line const &Line, std::string const &Entry, std::vector<standing_signal> const &Standing, std::vector<signal_head> const &Heads, block_reason &Why, block_kind &Own, block_reason &Own_why, std::size_t &Blocks) const;
+	// the automatic block of the double-track line both ways: as set by hand for its entry signal, else where block signals stand
+	// along it, when some of them face its wrong-track trains, else on a new line; Own: so by itself
+	bool both_ways(std::vector<station::line> const &Lines, std::size_t Index, std::string const &Entry, std::vector<standing_signal> const &Standing, bool &Hand, bool &Own) const;
 	// the line of the kilometrage a line out of the open station runs along: of the station, at a junction another one
 	std::string km_line(station::line const &Line) const;
 	// the km out along the line, Number: of the line of its kilometrage

application/editortool.h

@@ -117,6 +117,7 @@ struct signal_head
 	std::vector<int> speeds; // of the signal itself, km/h: -1 the highest allowed, 20 the substitute signal
 	bool chosen{false}; // the Signals tool places it for its kind
 	int aspects{0}; // of a block signal: 3, or 4 with the warning two signals ahead
+	std::string lean; // its head leans towards the track: left, standing on the right of it, right, or none
 };
 // one step of the history of the signalling: signals placed, standing ones renamed, other templates placed with them, the values
 // of standing ones replaced

lang/editor_pl.po

@@ -11278,8 +11278,47 @@ msgstr "Blokada szlaku, na obu torach dwutorowego taka sama. Samoczynna (SBL): s
 msgid "Draw the block boundaries"
 msgstr "Rysuj granice odstępów"
 
-msgid "LMB on a track of a line of the automatic block, beyond the entry signal: block signals across both tracks there, numbered after the hectometre ahead of them, the tracks cut 15 m beyond them and the new block sections named; LMB on a block boundary standing takes its signals away, the sections either side joined. A line whose block signals stand keeps them: Set the line signals places them evenly only on a line without any. One step of undo each"
-msgstr "LPM na torze szlaku z SBL, za semaforem wjazdowym: semafory SBL na obu torach w tym miejscu, numerowane po hektometrze przed nimi, tory przecięte 15 m za nimi i nazwane nowe odstępy. LPM na istniejącej granicy zabiera jej semafory, a odstępy po obu stronach łączą się w jeden. Szlak, na którym stoją już semafory SBL, je zachowuje: Ustaw sygnalizatory szlakowe rozstawia je równo tylko na szlaku bez żadnego. Każde kliknięcie to jeden krok cofania"
+msgid "LMB on a track of a line of the automatic block, beyond the entry signal: a block boundary there, the tracks cut across the line, block signals 15 m before the joint, numbered after the hectometre ahead of them, on a line both ways the wrong-track ones 15 m beyond it, with N, and the new block sections named; LMB on a block boundary standing takes its signals away, the sections either side joined. A line whose block signals stand keeps them: Set the line signals places them evenly only on a line without any. One step of undo each"
+msgstr "LPM na torze szlaku z SBL, za semaforem wjazdowym: granica odstępu w tym miejscu, tory przecięte w poprzek szlaku, semafory SBL 15 m przed złączem, numerowane po hektometrze przed nimi, na szlaku w obu kierunkach także semafory dla jazdy po torze lewym 15 m za złączem, z N, i nazwane nowe odstępy. LPM na istniejącej granicy zabiera jej semafory, a odstępy po obu stronach łączą się w jeden. Szlak, na którym stoją już semafory SBL, je zachowuje: Ustaw sygnalizatory szlakowe rozstawia je równo tylko na szlaku bez żadnego. Każde kliknięcie to jeden krok cofania"
+
+msgid "Wrong-track running"
+msgstr "Jazda po torze lewym"
+
+msgid "SBL both ways"
+msgstr "SBL dwukierunkowa"
+
+msgid "Mixed"
+msgstr "Mieszana"
+
+msgid "At each block boundary the block signals of both tracks either way: of the trains of the track 15 m before the joint, for the wrong-track ones 15 m beyond it, with N (523N), on the outside of the line, as on the lines of PKP PLK"
+msgstr "Na każdej granicy odstępu semafory SBL obu torów w obu kierunkach: dla jazdy po torze właściwym 15 m przed złączem, dla jazdy po torze lewym 15 m za nim, z N (523N), po zewnętrznej stronie szlaku, jak na liniach PKP PLK"
+
+msgid "The automatic block for the trains of the track, the semi-automatic one for the wrong-track ones: no N signals, a warning disc ToB the braking distance before the entry signal of the wrong-track trains, on the outside of the line. Set the line signals places it and takes the N signals away"
+msgstr "SBL dla jazdy po torze właściwym, blokada półsamoczynna dla jazdy po torze lewym: bez semaforów N, tarcza ostrzegawcza ToB w drodze hamowania przed semaforem wjazdowym z toru lewego, po zewnętrznej stronie szlaku. Ustaw sygnalizatory szlakowe ją stawia i zabiera semafory N"
+
+msgid "Each line as it stands: a choice sets all of them"
+msgstr "Każdy szlak tak, jak stoi: wybór ustawia wszystkie"
+
+msgid "Wrong-track running: SBL both ways, the block signals with N"
+msgstr "Jazda po torze lewym: SBL dwukierunkowa, semafory z N"
+
+msgid "Wrong-track running: the mixed block, a warning disc before the entry signal"
+msgstr "Jazda po torze lewym: blokada mieszana, tarcza ostrzegawcza przed semaforem wjazdowym"
+
+msgid "Shows the station with its lines out to the next stations: their block sections, the block signals with their km"
+msgstr "Pokazuje stację ze szlakami do sąsiednich stacji: ich odstępy i semafory SBL z kilometrażem"
+
+msgid "Block section %s, %.2f km"
+msgstr "Odstęp %s, %.2f km"
+
+msgid "km %.3f to %.3f"
+msgstr "km %.3f do %.3f"
+
+msgid "No track circuit here"
+msgstr "Tu nie ma odcinka izolowanego"
+
+msgid "LMB: show it in the 3d view"
+msgstr "LPM: pokaż w widoku 3d"
 
 msgid "LMB on a track of a line beyond the entry signal: a block boundary there; on one standing: taken away"
 msgstr "LPM na torze szlaku za semaforem wjazdowym: granica odstępu w tym miejscu; na istniejącej granicy: usunięcie"