mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-07-20 18:19:20 +02:00
build 180904. sunlight applied to clouds, cab control labels included in the localization system, minor bug fixes
This commit is contained in:
tmj-fstate
396
translation.cpp
396
translation.cpp
@@ -59,7 +59,99 @@ init() {
|
||||
"\nTemperatures:\n engine: %.2f, oil: %.2f, water: %.2f%c%.2f",
|
||||
"Brakes:\n train: %.2f, independent: %.2f, delay: %s, load flag: %d\nBrake cylinder pressures:\n train: %.2f, independent: %.2f, status: 0x%.2x\nPipe pressures:\n brake: %.2f (hat: %.2f), main: %.2f, control: %.2f\nTank pressures:\n auxiliary: %.2f, main: %.2f, control: %.2f",
|
||||
" pantograph: %.2f%cMT",
|
||||
"Forces:\n tractive: %.1f, brake: %.1f, friction: %.2f%s\nAcceleration:\n tangential: %.2f, normal: %.2f (path radius: %s)\nVelocity: %.2f, distance traveled: %.2f\nPosition: [%.2f, %.2f, %.2f]"
|
||||
"Forces:\n tractive: %.1f, brake: %.1f, friction: %.2f%s\nAcceleration:\n tangential: %.2f, normal: %.2f (path radius: %s)\nVelocity: %.2f, distance traveled: %.2f\nPosition: [%.2f, %.2f, %.2f]",
|
||||
|
||||
"master controller",
|
||||
"second controller",
|
||||
"shunt mode power",
|
||||
"reverser",
|
||||
"train brake",
|
||||
"independent brake",
|
||||
"manual brake",
|
||||
"emergency brake",
|
||||
"brake acting speed",
|
||||
"brake acting speed: cargo",
|
||||
"brake acting speed: rapid",
|
||||
"motor overload relay threshold",
|
||||
"water pump",
|
||||
"water pump breaker",
|
||||
"water heater",
|
||||
"water heater breaker",
|
||||
"water circuits link",
|
||||
"fuel pump",
|
||||
"oil pump",
|
||||
"line breaker",
|
||||
"line breaker",
|
||||
"alerter",
|
||||
"independent brake releaser",
|
||||
"sandbox",
|
||||
"wheelspin brake",
|
||||
"horn",
|
||||
"low tone horn",
|
||||
"high tone horn",
|
||||
"whistle",
|
||||
"motor overload relay reset",
|
||||
"converter overload relay reset",
|
||||
"motor connectors",
|
||||
"left door",
|
||||
"right door",
|
||||
"left door",
|
||||
"right door",
|
||||
"left door",
|
||||
"right door",
|
||||
"all doors",
|
||||
"departure signal",
|
||||
"upper headlight",
|
||||
"left headlight",
|
||||
"right headlight",
|
||||
"headlights dimmer",
|
||||
"left marker light",
|
||||
"right marker light",
|
||||
"light pattern",
|
||||
"rear upper headlight",
|
||||
"rear left headlight",
|
||||
"rear right headlight",
|
||||
"rear left marker light",
|
||||
"rear right marker light",
|
||||
"compressor",
|
||||
"local compressor",
|
||||
"converter",
|
||||
"local converter",
|
||||
"converter",
|
||||
"line breaker",
|
||||
"radio",
|
||||
"radio channel",
|
||||
"radio channel",
|
||||
"radio channel",
|
||||
"radiostop test",
|
||||
"radiostop",
|
||||
"pantograph A",
|
||||
"pantograph B",
|
||||
"pantograph A",
|
||||
"pantograph B",
|
||||
"all pantographs",
|
||||
"selected pantograph",
|
||||
"selected pantograph",
|
||||
"pantograph compressor",
|
||||
"pantograph 3 way valve",
|
||||
"heating",
|
||||
"braking indicator",
|
||||
"door locking",
|
||||
"current indicator source",
|
||||
"instrument light",
|
||||
"interior light",
|
||||
"interior light dimmer",
|
||||
"battery",
|
||||
"interactive part",
|
||||
"interactive part",
|
||||
"interactive part",
|
||||
"interactive part",
|
||||
"interactive part",
|
||||
"interactive part",
|
||||
"interactive part",
|
||||
"interactive part",
|
||||
"interactive part",
|
||||
"interactive part"
|
||||
}
|
||||
} );
|
||||
|
||||
@@ -99,21 +191,217 @@ init() {
|
||||
"\nTemperatury:\n silnik: %.2f, olej: %.2f, woda: %.2f%c%.2f",
|
||||
"Hamulce:\n zespolony: %.2f, pomocniczy: %.2f, nastawa: %s, ladunek: %d\nCisnienie w cylindrach:\n zespolony: %.2f, pomocniczy: %.2f, status: 0x%.2x\nCisnienia w przewodach:\n glowny: %.2f (kapturek: %.2f), zasilajacy: %.2f, kontrolny: %.2f\nCisnienia w zbiornikach:\n pomocniczy: %.2f, glowny: %.2f, sterujacy: %.2f",
|
||||
" pantograf: %.2f%cZG",
|
||||
"Sily:\n napedna: %.1f, hamowania: %.1f, tarcie: %.2f%s\nPrzyspieszenia:\n styczne: %.2f, normalne: %.2f (promien: %s)\nPredkosc: %.2f, pokonana odleglosc: %.2f\nPozycja: [%.2f, %.2f, %.2f]"
|
||||
"Sily:\n napedna: %.1f, hamowania: %.1f, tarcie: %.2f%s\nPrzyspieszenia:\n styczne: %.2f, normalne: %.2f (promien: %s)\nPredkosc: %.2f, pokonana odleglosc: %.2f\nPozycja: [%.2f, %.2f, %.2f]",
|
||||
|
||||
"nastawnik",
|
||||
"nastawnik dodatkowy",
|
||||
"sterowanie analogowe",
|
||||
"nastawnik jazdy",
|
||||
"hamulec zespolony",
|
||||
"hamulec pomocniczy",
|
||||
"hamulec reczny",
|
||||
"hamulec bezpieczenstwa",
|
||||
"nastawa hamulca",
|
||||
"nastawa hamulca: towarowy",
|
||||
"nastawa hamulca: pospieszny",
|
||||
"rozruch niski/wysoki",
|
||||
"pompa wody",
|
||||
"wylacznik samoczynny pompy wody",
|
||||
"podgrzewacz wody",
|
||||
"wylacznik samoczynny podgrzewacza wody",
|
||||
"zawor polaczenia obiegow wody",
|
||||
"pompa paliwa",
|
||||
"pompa oleju",
|
||||
"wylacznik szybki",
|
||||
"wylacznik szybki",
|
||||
"czuwak",
|
||||
"odluzniacz",
|
||||
"piasecznica",
|
||||
"hamulec przeciwposlizgowy",
|
||||
"syrena",
|
||||
"syrena (ton niski)",
|
||||
"syrena (ton wysoki)",
|
||||
"gwizdawka",
|
||||
"przekaznik nadmiarowy motorow trakcyjnych",
|
||||
"przekaznik nadmiarowy przetwornicy",
|
||||
"styczniki liniowe",
|
||||
"drzwi lewe",
|
||||
"drzwi prawe",
|
||||
"drzwi lewe",
|
||||
"drzwi prawe",
|
||||
"drzwi lewe",
|
||||
"drzwi prawe",
|
||||
"drzwi",
|
||||
"sygnal odjazdu",
|
||||
"reflektor gorny",
|
||||
"reflektor lewy",
|
||||
"reflektor prawy",
|
||||
"przyciemnienie reflektorow",
|
||||
"sygnal lewy",
|
||||
"sygnal prawy",
|
||||
"programator swiatel",
|
||||
"tylny reflektor gorny",
|
||||
"tylny reflektor lewy",
|
||||
"tylny reflektor prawy",
|
||||
"tylny sygnal lewy",
|
||||
"tylny sygnal prawy",
|
||||
"sprezarka",
|
||||
"sprezarka lokalna",
|
||||
"przetwornica",
|
||||
"przetwornica lokalna",
|
||||
"przetwornica",
|
||||
"wylacznik szybki",
|
||||
"radio",
|
||||
"kanal radia",
|
||||
"kanal radia",
|
||||
"kanal radia",
|
||||
"test radiostopu",
|
||||
"radiostop",
|
||||
"pantograf A",
|
||||
"pantograf B",
|
||||
"pantograf A",
|
||||
"pantograf B",
|
||||
"wszystkie pantografy",
|
||||
"wybrany pantograf",
|
||||
"wybrany pantograf",
|
||||
"sprezarka pantografow",
|
||||
"kurek trojdrogowy pantografow",
|
||||
"ogrzewanie pociagu",
|
||||
"sygnalizacja hamowania",
|
||||
"sygnalizacja blokady drzwi",
|
||||
"prady drugiego czlonu",
|
||||
"oswietlenie przyrzadow",
|
||||
"oswietlenie kabiny",
|
||||
"przyciemnienie oswietlenia kabiny",
|
||||
"bateria",
|
||||
"element ruchomy",
|
||||
"element ruchomy",
|
||||
"element ruchomy",
|
||||
"element ruchomy",
|
||||
"element ruchomy",
|
||||
"element ruchomy",
|
||||
"element ruchomy",
|
||||
"element ruchomy",
|
||||
"element ruchomy",
|
||||
"element ruchomy"
|
||||
}
|
||||
} );
|
||||
|
||||
auto const lookup = stringmap.find( Global.asLang );
|
||||
auto lookup { stringmap.find( Global.asLang ) };
|
||||
if( lookup == stringmap.end() ) {
|
||||
lookup = stringmap.find( "en" );
|
||||
}
|
||||
|
||||
locale::strings = (
|
||||
lookup != stringmap.end() ?
|
||||
lookup->second :
|
||||
stringmap.find( "en" )->second );
|
||||
locale::strings = lookup->second;
|
||||
|
||||
// prepare cab controls translation table
|
||||
{
|
||||
std::vector<std::string> cabcontrols = {
|
||||
"mainctrl:",
|
||||
"scndctrl:",
|
||||
"shuntmodepower:",
|
||||
"dirkey:",
|
||||
"brakectrl:",
|
||||
"localbrake:",
|
||||
"manualbrake:",
|
||||
"alarmchain:",
|
||||
"brakeprofile_sw:",
|
||||
"brakeprofileg_sw:",
|
||||
"brakeprofiler_sw:",
|
||||
"maxcurrent_sw:",
|
||||
"waterpump_sw:",
|
||||
"waterpumpbreaker_sw:",
|
||||
"waterheater_sw:",
|
||||
"waterheaterbreaker_sw:",
|
||||
"watercircuitslink_sw:",
|
||||
"fuelpump_sw:",
|
||||
"oilpump_sw:",
|
||||
"main_off_bt:",
|
||||
"main_on_bt:",
|
||||
"security_reset_bt:",
|
||||
"releaser_bt:",
|
||||
"sand_bt:",
|
||||
"antislip_bt:",
|
||||
"horn_bt:",
|
||||
"hornlow_bt:",
|
||||
"hornhigh_bt:",
|
||||
"whistle_bt:",
|
||||
"fuse_bt:",
|
||||
"converterfuse_bt:",
|
||||
"stlinoff_bt:",
|
||||
"door_left_sw:",
|
||||
"door_right_sw:",
|
||||
"doorlefton_sw:",
|
||||
"doorrighton_sw:",
|
||||
"doorleftoff_sw:",
|
||||
"doorrightoff_sw:",
|
||||
"dooralloff_sw:",
|
||||
"departure_signal_bt:",
|
||||
"upperlight_sw:",
|
||||
"leftlight_sw:",
|
||||
"rightlight_sw:",
|
||||
"dimheadlights_sw:",
|
||||
"leftend_sw:",
|
||||
"rightend_sw:",
|
||||
"lights_sw:",
|
||||
"rearupperlight_sw:",
|
||||
"rearleftlight_sw:",
|
||||
"rearrightlight_sw:",
|
||||
"rearleftend_sw:",
|
||||
"rearrightend_sw:",
|
||||
"compressor_sw:",
|
||||
"compressorlocal_sw:",
|
||||
"converter_sw:",
|
||||
"converterlocal_sw:",
|
||||
"converteroff_sw:",
|
||||
"main_sw:",
|
||||
"radio_sw:",
|
||||
"radiochannel_sw:",
|
||||
"radiochannelprev_sw:",
|
||||
"radiochannelnext_sw:",
|
||||
"radiotest_sw:",
|
||||
"radiostop_sw:",
|
||||
"pantfront_sw:",
|
||||
"pantrear_sw:",
|
||||
"pantfrontoff_sw:",
|
||||
"pantrearoff_sw:",
|
||||
"pantalloff_sw:",
|
||||
"pantselected_sw:",
|
||||
"pantselectedoff_sw:",
|
||||
"pantcompressor_sw:",
|
||||
"pantcompressorvalve_sw:",
|
||||
"trainheating_sw:",
|
||||
"signalling_sw:",
|
||||
"door_signalling_sw:",
|
||||
"nextcurrent_sw:",
|
||||
"instrumentlight_sw:",
|
||||
"cablight_sw:",
|
||||
"cablightdim_sw:",
|
||||
"battery_sw:",
|
||||
"universal0:",
|
||||
"universal1:",
|
||||
"universal2:",
|
||||
"universal3:",
|
||||
"universal4:",
|
||||
"universal5:",
|
||||
"universal6:",
|
||||
"universal7:",
|
||||
"universal8:",
|
||||
"universal9:"
|
||||
};
|
||||
|
||||
std::size_t stringidx { string::cab_mainctrl };
|
||||
for( auto const &cabcontrol : cabcontrols ) {
|
||||
m_cabcontrols.insert( { cabcontrol, strings[ stringidx++ ] } );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
std::string
|
||||
label_cab_control( std::string const &Label ) {
|
||||
|
||||
if( Label.empty() ) { return ""; }
|
||||
|
||||
auto const lookup = m_cabcontrols.find( Label );
|
||||
return (
|
||||
lookup != m_cabcontrols.end() ?
|
||||
@@ -123,99 +411,7 @@ label_cab_control( std::string const &Label ) {
|
||||
|
||||
std::vector<std::string> strings;
|
||||
|
||||
std::unordered_map<std::string, std::string> m_cabcontrols = {
|
||||
{ "mainctrl:", "master controller" },
|
||||
{ "scndctrl:", "second controller" },
|
||||
{ "shuntmodepower:", "shunt mode power" },
|
||||
{ "dirkey:" , "reverser" },
|
||||
{ "brakectrl:", "train brake" },
|
||||
{ "localbrake:", "independent brake" },
|
||||
{ "manualbrake:", "manual brake" },
|
||||
{ "alarmchain:", "emergency brake" },
|
||||
{ "brakeprofile_sw:", "brake acting speed" },
|
||||
{ "brakeprofileg_sw:", "brake acting speed: cargo" },
|
||||
{ "brakeprofiler_sw:", "brake acting speed: rapid" },
|
||||
{ "maxcurrent_sw:", "motor overload relay threshold" },
|
||||
{ "waterpump_sw:", "water pump" },
|
||||
{ "waterpumpbreaker_sw:", "water pump breaker" },
|
||||
{ "waterheater_sw:", "water heater" },
|
||||
{ "waterheaterbreaker_sw:", "water heater breaker" },
|
||||
{ "watercircuitslink_sw:", "water circuits link" },
|
||||
{ "fuelpump_sw:", "fuel pump" },
|
||||
{ "oilpump_sw:", "oil pump" },
|
||||
{ "main_off_bt:", "line breaker" },
|
||||
{ "main_on_bt:", "line breaker" },
|
||||
{ "security_reset_bt:", "alerter" },
|
||||
{ "releaser_bt:", "independent brake releaser" },
|
||||
{ "sand_bt:", "sandbox" },
|
||||
{ "antislip_bt:", "wheelspin brake" },
|
||||
{ "horn_bt:", "horn" },
|
||||
{ "hornlow_bt:", "low tone horn" },
|
||||
{ "hornhigh_bt:", "high tone horn" },
|
||||
{ "whistle_bt:", "whistle" },
|
||||
{ "fuse_bt:", "motor overload relay reset" },
|
||||
{ "converterfuse_bt:", "converter overload relay reset" },
|
||||
{ "stlinoff_bt:", "motor connectors" },
|
||||
{ "door_left_sw:", "left door" },
|
||||
{ "door_right_sw:", "right door" },
|
||||
{ "doorlefton_sw:", "left door" },
|
||||
{ "doorrighton_sw:", "right door" },
|
||||
{ "doorleftoff_sw:", "left door" },
|
||||
{ "doorrightoff_sw:", "right door" },
|
||||
{ "dooralloff_sw:", "all doors" },
|
||||
{ "departure_signal_bt:", "departure signal" },
|
||||
{ "upperlight_sw:", "upper headlight" },
|
||||
{ "leftlight_sw:", "left headlight" },
|
||||
{ "rightlight_sw:", "right headlight" },
|
||||
{ "dimheadlights_sw:", "headlights dimmer" },
|
||||
{ "leftend_sw:", "left marker light" },
|
||||
{ "rightend_sw:", "right marker light" },
|
||||
{ "lights_sw:", "light pattern" },
|
||||
{ "rearupperlight_sw:", "rear upper headlight" },
|
||||
{ "rearleftlight_sw:", "rear left headlight" },
|
||||
{ "rearrightlight_sw:", "rear right headlight" },
|
||||
{ "rearleftend_sw:", "rear left marker light" },
|
||||
{ "rearrightend_sw:", "rear right marker light" },
|
||||
{ "compressor_sw:", "compressor" },
|
||||
{ "compressorlocal_sw:", "local compressor" },
|
||||
{ "converter_sw:", "converter" },
|
||||
{ "converterlocal_sw:", "local converter" },
|
||||
{ "converteroff_sw:", "converter" },
|
||||
{ "main_sw:", "line breaker" },
|
||||
{ "radio_sw:", "radio" },
|
||||
{ "radiochannel_sw:", "radio channel" },
|
||||
{ "radiochannelprev_sw:", "radio channel" },
|
||||
{ "radiochannelnext_sw:", "radio channel" },
|
||||
{ "radiotest_sw:", "radiostop test" },
|
||||
{ "radiostop_sw:", "radiostop" },
|
||||
{ "pantfront_sw:", "pantograph A" },
|
||||
{ "pantrear_sw:", "pantograph B" },
|
||||
{ "pantfrontoff_sw:", "pantograph A" },
|
||||
{ "pantrearoff_sw:", "pantograph B" },
|
||||
{ "pantalloff_sw:", "all pantographs" },
|
||||
{ "pantselected_sw:", "selected pantograph" },
|
||||
{ "pantselectedoff_sw:", "selected pantograph" },
|
||||
{ "pantcompressor_sw:", "pantograph compressor" },
|
||||
{ "pantcompressorvalve_sw:", "pantograph 3 way valve" },
|
||||
{ "trainheating_sw:", "heating" },
|
||||
{ "signalling_sw:", "braking indicator" },
|
||||
{ "door_signalling_sw:", "door locking" },
|
||||
{ "nextcurrent_sw:", "current indicator source" },
|
||||
{ "instrumentlight_sw:", "instrument light" },
|
||||
{ "cablight_sw:", "interior light" },
|
||||
{ "cablightdim_sw:", "interior light dimmer" },
|
||||
{ "battery_sw:", "battery" },
|
||||
{ "universal0:", "generic" },
|
||||
{ "universal1:", "generic" },
|
||||
{ "universal2:", "generic" },
|
||||
{ "universal3:", "generic" },
|
||||
{ "universal4:", "generic" },
|
||||
{ "universal5:", "generic" },
|
||||
{ "universal6:", "generic" },
|
||||
{ "universal7:", "generic" },
|
||||
{ "universal8:", "generic" },
|
||||
{ "universal9:", "generic" }
|
||||
};
|
||||
std::unordered_map<std::string, std::string> m_cabcontrols;
|
||||
|
||||
} // namespace locale
|
||||
|
||||
|
||||
Reference in New Issue
Block a user