From 692152e34eadeacc28cacb97a57bdd1431b0e1e5 Mon Sep 17 00:00:00 2001 From: JoePfeiffer Date: Sun, 28 Jan 2024 14:51:23 -0700 Subject: [PATCH] Change simulation warning when recovery is deployed while still under thrust to a simulation abort. --- core/resources/l10n/messages.properties | 3 ++- core/resources/l10n/messages_ar.properties | 2 +- core/resources/l10n/messages_es.properties | 3 ++- core/resources/l10n/messages_fr.properties | 3 ++- core/resources/l10n/messages_it.properties | 2 +- core/resources/l10n/messages_ja.properties | 2 +- core/resources/l10n/messages_nl.properties | 2 +- core/resources/l10n/messages_pl.properties | 4 ++-- core/resources/l10n/messages_pt.properties | 3 ++- core/resources/l10n/messages_ru.properties | 3 ++- core/resources/l10n/messages_uk_UA.properties | 5 ++--- core/resources/l10n/messages_zh_CN.properties | 2 +- core/src/net/sf/openrocket/logging/SimulationAbort.java | 5 ++++- core/src/net/sf/openrocket/logging/Warning.java | 3 --- .../sf/openrocket/simulation/BasicEventSimulationEngine.java | 2 +- 15 files changed, 24 insertions(+), 20 deletions(-) diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties index 6019f66f5..2b889315d 100644 --- a/core/resources/l10n/messages.properties +++ b/core/resources/l10n/messages.properties @@ -668,6 +668,7 @@ SimulationAbort.activeLengthZero = Active airframe has length 0 SimulationAbort.noCP = Can't calculate Center of Pressure SimulationAbort.activeMassZero = Total mass of active stages is 0 SimulationAbort.tumbleUnderThrust = Stage began to tumble under thrust. +SimulationAbort.deployUnderThrust = Recovery system deployed while still under thrust SimulationModifierTree.OptimizationParameters = Optimization Parameters @@ -2132,7 +2133,7 @@ Warning.THICK_FIN = Thick fins may not simulate accurately Warning.JAGGED_EDGED_FIN = Jagged-edged fin predictions may be inaccurate Warning.ZERO_AREA_FIN = Fins with zero area will not affect aerodynamics Warning.LISTENERS_AFFECTED = Listeners modified the flight simulation -Warning.RECOVERY_DEPLOYMENT_WHILE_BURNING = Recovery device opened while motor still burning. +Warning.RECOVERY_DEPLOYMENT_WHILE_BURNING = Warning.FILE_INVALID_PARAMETER = Invalid parameter encountered, ignoring. Warning.PARALLEL_FINS = Too many parallel fins Warning.SUPERSONIC = Body calculations may not be entirely accurate at supersonic speeds. diff --git a/core/resources/l10n/messages_ar.properties b/core/resources/l10n/messages_ar.properties index 7bbebd0af..86b215a77 100644 --- a/core/resources/l10n/messages_ar.properties +++ b/core/resources/l10n/messages_ar.properties @@ -561,6 +561,7 @@ BasicEventSimulationEngine.error.NaNResult = .لم ينتج عن المحاكا RK4SimulationStepper.error.valuesTooLarge = .قيم المحاكاة تجاوزت الحدود. حاول تحديد خطوة زمنية أقصر SimulationAbort.tumbleUnderThrust = .بدأت المرحلة تتعثر تحت ضغط الدفع +SimulationAbort.deployUnderThrust = .فتح جهاز الإسترداد بينما لا يزال المحرك يحترق SimulationModifierTree.OptimizationParameters = معايير التحسين ! SimulationExportPanel @@ -1830,7 +1831,6 @@ Warning.DISCONTINUITY = إنقطاع في قطر جسم الصاروخ Warning.THICK_FIN = .قد لا يتم نموذجة الزعانف السميكة بدقة Warning.JAGGED_EDGED_FIN = .قد تكون توقعات الزعانف ذات الحواف الخشنة غير دقيقة Warning.LISTENERS_AFFECTED = قام المستمعون بتعديل محاكاة الطيران -Warning.RECOVERY_DEPLOYMENT_WHILE_BURNING = .فتح جهاز الإسترداد بينما لا يزال المحرك يحترق Warning.FILE_INVALID_PARAMETER = .تمت مصادفة إعداد غير صالحة, تم التجاهل Warning.PARALLEL_FINS = عدد كبير جدًا من الزعانف المتوازية Warning.SUPERSONIC = .قد لا تكون حسابات الجسم دقيقة تمامًا عند السرعات فوق الصوتية diff --git a/core/resources/l10n/messages_es.properties b/core/resources/l10n/messages_es.properties index 6e01fa2a1..313ebf684 100644 --- a/core/resources/l10n/messages_es.properties +++ b/core/resources/l10n/messages_es.properties @@ -758,6 +758,8 @@ PrintSettingsDialog.lbl.Templatefillcolor = Plantilla de colores: !PrintSettingsDialog PrintSettingsDialog.title = Configuraci\u00f3n de la impresi\u00f3n +SimulationAbort.deployUnderThrust = Sistema de recuperaci\u00f3n abierto en fase de impulso, mientras el motor a\u00fan empujaba + RK4SimulationStepper.error.valuesTooLarge = Los valores de la simulaci\u00f3n exceden los l\u00edmites. Pruebe a seleccionar un intervalo de tiempo m\u00e1s corto. RecoveryConfigurationPanel.table.deployment.default = Por defecto ({0}) @@ -1223,7 +1225,6 @@ Warning.LISTENERS_AFFECTED = Las Extensiones se ejecutaron con la Warning.LargeAOA.str1 = \u00c1ngulo de ataque muy grande. Warning.LargeAOA.str2 = La amplitud del \u00e1ngulo de ataque es excesiva ( Warning.PARALLEL_FINS = Demasiadas aletas paralelas -Warning.RECOVERY_DEPLOYMENT_WHILE_BURNING = Sistema de recuperaci\u00f3n abierto en fase de impulso, mientras el motor a\u00fan empujaba Warning.RECOVERY_HIGH_SPEED = Despliegue del sistema de recuperaci\u00f3n con velocidad alta Warning.RECOVERY_LAUNCH_ROD = Despliegue del sistema de recuperaci\u00f3n en rampa de lanzamiento Warning.SUPERSONIC = Los c\u00e1lculos en el Cuerpo pueden no ser precisos con velocidades supers\u00f3nicas. diff --git a/core/resources/l10n/messages_fr.properties b/core/resources/l10n/messages_fr.properties index 1041d5686..e7ddabf40 100644 --- a/core/resources/l10n/messages_fr.properties +++ b/core/resources/l10n/messages_fr.properties @@ -980,6 +980,8 @@ SimExpPan.checkbox.Includesimudesc = Inclure la description de la simulati SimExpPan.checkbox.ttip.Incflightevents = Inclure une ligne de commentaire pour chaque \u00E9v\u00E8nement de vol. SimExpPan.checkbox.ttip.Includefielddesc = Inclure une ligne de commentaire avec la description des variables export\u00E9es. SimExpPan.checkbox.ttip.Includesimudesc = Inclure un commentaire au d\u00E9but du fichier pour d\u00E9crire la simulation. + +SimulationAbort.deployUnderThrust = Le dispositif de r\u00E9cup\u00E9ration s'est ouvert alors que la combustion du moteur n'\u00E9tait pas finie. ! SimulationExportPanel SimExpPan.lbl.Commentchar = Symbole pour les commentaires: SimExpPan.lbl.Fieldsepstr = S\u00E9parateur de champ: @@ -1217,7 +1219,6 @@ Warning.LISTENERS_AFFECTED = Les \u00E9couteurs ont modifi\u00E9 Warning.LargeAOA.str1 = Grand angle d'attaque rencontr\u00E9. Warning.LargeAOA.str2 = Grand angle d'attaque rencontr\u00E9 ( Warning.PARALLEL_FINS = Beaucoup trop d'ailerons en parall\u00E8le -Warning.RECOVERY_DEPLOYMENT_WHILE_BURNING = Le dispositif de r\u00E9cup\u00E9ration s'est ouvert alors que la combustion du moteur n'\u00E9tait pas finie. Warning.RECOVERY_HIGH_SPEED = Deploiement du systeme de recuperation \u00E0 grande vitesse Warning.RECOVERY_LAUNCH_ROD = Le dispositif de r\u00E9cup\u00E9ration d\u00E9ploy\u00E9 pendant que l'on \u00E9tait sur la rampe. Warning.SUPERSONIC = Les calculs du corps ne seront peut \u00EAtre pas tr\u00E8s pr\u00E9cis aux vitesses supersonique. diff --git a/core/resources/l10n/messages_it.properties b/core/resources/l10n/messages_it.properties index ff1ddd384..a12bb136a 100644 --- a/core/resources/l10n/messages_it.properties +++ b/core/resources/l10n/messages_it.properties @@ -410,6 +410,7 @@ SimuRunDlg.msg.AssertionError2 = Per favore riporta questo come bug insieme ai d SimuRunDlg.msg.unknownerror1 = E' accaduto un errore sconosciuto durante la simulazione: SimuRunDlg.msg.unknownerror2 = Il programma potrebbe essere instabile, dovresti salvare tutti i tuoi disegni e riavviare OpenRocket desso! +SimulationAbort.deployUnderThrust = Il dispositivo di recupero si e' azionato mentre il motore stava ancora bruciando. RK4SimulationStepper.error.valuesTooLarge = I valori di simulazione anno ecceduto i limiti.Prova selezionando un tempo piu' breve. @@ -1373,7 +1374,6 @@ Warning.DISCONTINUITY = Discontinuita' nel diametro del tubo del corpo Warning.THICK_FIN = Le pinne sottili potrebbero non essere modellate in modo accurato. Warning.JAGGED_EDGED_FIN = Jagged-edged fin Le predizioni per le pinne potrebbero non essere accurate. Warning.LISTENERS_AFFECTED = Gli osservatori possono modificare le condizioni di simulazione -Warning.RECOVERY_DEPLOYMENT_WHILE_BURNING = Il dispositivo di recupero si e' azionato mentre il motore stava ancora bruciando. Warning.FILE_INVALID_PARAMETER = Incontrato un parametro non valido, lo ignoro. diff --git a/core/resources/l10n/messages_ja.properties b/core/resources/l10n/messages_ja.properties index c2db3200c..f069e0746 100644 --- a/core/resources/l10n/messages_ja.properties +++ b/core/resources/l10n/messages_ja.properties @@ -414,6 +414,7 @@ SimuRunDlg.msg.AssertionError2 = \u30D0\u30B0\u30EC\u30DD\u30FC\u30C8\u3092\u30 SimuRunDlg.msg.unknownerror1 = \u30B7\u30DF\u30E5\u30EC\u30FC\u30B7\u30E7\u30F3\u6700\u4E2D\u306B\u672A\u77E5\u306E\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F SimuRunDlg.msg.unknownerror2 = \u30D7\u30ED\u30B0\u30E9\u30E0\u304C\u4E0D\u5B89\u5B9A\u3067\u3059\u3002\u30C7\u30B6\u30A4\u30F3\u3092\u4FDD\u5B58\u3057\u3066OpenRocket\u3092\u518D\u8D77\u52D5\u6642\u3057\u3066\u304F\u3060\u3055\u3044\uFF01 +SimulationAbort.deployUnderThrust = \u30EA\u30D0\u30AB\u30EA\u30FC\u88C5\u7F6E\u304C\u71C3\u713C\u4E2D\u306B\u958B\u3044\u3066\u3044\u307E\u3059 RK4SimulationStepper.error.valuesTooLarge = \u30B7\u30DF\u30E5\u30EC\u30FC\u30B7\u30E7\u30F3\u306E\u5024\u304C\u9650\u754C\u3092\u8D85\u3048\u3066\u3044\u307E\u3059\u3002time step\u3092\u77ED\u304F\u3057\u3066\u304F\u3060\u3055\u3044\u3002 @@ -1431,7 +1432,6 @@ Warning.DISCONTINUITY = \u30DC\u30C7\u30A3\u306E\u76F4\u5F84\u304C\u4E0D\u9023\ Warning.THICK_FIN = \u539A\u3044\u30D5\u30A3\u30F3\u306F\u6B63\u78BA\u306B\u30E2\u30C7\u30EA\u30F3\u30B0\u3067\u304D\u307E\u305B\u3093 Warning.JAGGED_EDGED_FIN = \u30AE\u30B6\u30AE\u30B6\u306E\u7E01\u306E\u30D5\u30A3\u30F3\u306E\u4E88\u6E2C\u306F\u6B63\u78BA\u306B\u3067\u304D\u307E\u305B\u3093 Warning.LISTENERS_AFFECTED = Listeners modified the flight simulation -Warning.RECOVERY_DEPLOYMENT_WHILE_BURNING = \u30EA\u30D0\u30AB\u30EA\u30FC\u88C5\u7F6E\u304C\u71C3\u713C\u4E2D\u306B\u958B\u3044\u3066\u3044\u307E\u3059 Warning.FILE_INVALID_PARAMETER = \u7121\u52B9\u306A\u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u3059\uFF0C\u7121\u8996\u3057\u307E\u3059 Warning.PARALLEL_FINS = \u30D5\u30A3\u30F3\u304C\u591A\u3059\u304E\u307E\u3059 Warning.SUPERSONIC = \u8D85\u97F3\u901F\u3067\u306E\u30DC\u30C7\u30A3\u306E\u8A08\u7B97\u306F\u5168\u304F\u6B63\u78BA\u3067\u306F\u3042\u308A\u307E\u305B\u3093 diff --git a/core/resources/l10n/messages_nl.properties b/core/resources/l10n/messages_nl.properties index 8b973a025..79986bd1e 100644 --- a/core/resources/l10n/messages_nl.properties +++ b/core/resources/l10n/messages_nl.properties @@ -534,6 +534,7 @@ BasicEventSimulationEngine.error.NaNResult = Simulatie resulteerde in een waarde RK4SimulationStepper.error.valuesTooLarge = Simulatiewaarden overschreden limieten. Probeer een kortere tijdstap te kiezen. SimulationAbort.tumbleUnderThrust = Trap begon te tuimelen onder stuwkracht. +SimulationAbort.deployUnderThrust = Terugvorderingsapparaat geopend terwijl motor nog onstoken is. SimulationModifierTree.OptimizationParameters = Optimalisatieparameters @@ -1753,7 +1754,6 @@ Warning.DISCONTINUITY = Discontinuïteit in raketromp diameter Warning.THICK_FIN = Dikke vinnen worden mogelijk niet nauwkeurig gemodelleerd. Warning.JAGGED_EDGED_FIN = De voorspellingen van gekartelde vinnen kunnen onnauwkeurig zijn. Warning.LISTENERS_AFFECTED = Luisteraars veranderden de vluchtsimulatie -Warning.RECOVERY_DEPLOYMENT_WHILE_BURNING = Terugvorderingsapparaat geopend terwijl motor nog onstoken is. Warning.FILE_INVALID_PARAMETER = Ongeldige parameter tegengekomen, negeren. Warning.PARALLEL_FINS = Te veel parallelle vinnen Warning.SUPERSONIC = Rompberekeningen zijn misschien niet helemaal accuraat bij supersonische snelheden. diff --git a/core/resources/l10n/messages_pl.properties b/core/resources/l10n/messages_pl.properties index 473ce1aa2..5d5a762ab 100644 --- a/core/resources/l10n/messages_pl.properties +++ b/core/resources/l10n/messages_pl.properties @@ -407,7 +407,8 @@ update.dlg.latestVersion = Korzystasz z najnowszej wersji OpenRocket: %s. SimuRunDlg.msg.unknownerror1 = Podczas symulacji wyst\u0105pi\u0142 nieznany b\u0142\u0105d. SimuRunDlg.msg.unknownerror2 = Program mo\u017Ce by\u0107 niestabilny. Zapisz wszystkie projekty i uruchom ponownie OpenRocket! - + SimulationAbort.deployUnderThrust = Uk\u0142ad odzysku zosta\u0142 aktywowany przy wci\u0105\u017C pracuj\u0105cym silniku. + RK4SimulationStepper.error.valuesTooLarge = Warto\u015Bci w symulacji wykroczy\u0142y poza dopuszczalne granice. Sprbuj ustawi\u0107 mniejszy krok czasowy. @@ -1314,7 +1315,6 @@ ComponentInfo.EngineBlock = Blokada silnika unieruchamia silnik wewn\u01 Warning.THICK_FIN = Grube stateczniki mog\u0105 nie by\u0107 modelowane dok\u0142adnie. Warning.JAGGED_EDGED_FIN = Stateczniki o nieregularnych kraw\u0119dziach mog\u0105 zmniejszy\u0107 dok\u0142adno\u015B\u0107 prognoz. Warning.LISTENERS_AFFECTED = Detektory zmodyfikowa\u0142y symulacj\u0119 lotu - Warning.RECOVERY_DEPLOYMENT_WHILE_BURNING = Uk\u0142ad odzysku zosta\u0142 aktywowany przy wci\u0105\u017C pracuj\u0105cym silniku. Warning.FILE_INVALID_PARAMETER = Wyst\u0105pi\u0142 niew\u0142a\u015Bciwy parametr - zignorowano. diff --git a/core/resources/l10n/messages_pt.properties b/core/resources/l10n/messages_pt.properties index a0f843f7e..4bf0268df 100644 --- a/core/resources/l10n/messages_pt.properties +++ b/core/resources/l10n/messages_pt.properties @@ -734,6 +734,8 @@ PrintSettingsDialog.lbl.Templatefillcolor = Cor modelo de preenchimento: # PrintSettingsDialog PrintSettingsDialog.title = Configura\u00e7\u00f5es para impress\u00e3o +SimulationAbort.deployUnderThrust = Dispositivo de recupera\u00e7\u00e3o aberto enquanto o motor ainda est\u00e1 queimando. + RK4SimulationStepper.error.valuesTooLarge = Valores de simula\u00e7\u00e3o excedeu os limites. Tente selecionar um passo de tempo mais curto. RecoveryConfigurationPanel.table.deployment.default = Default ({0}) @@ -1180,7 +1182,6 @@ Warning.LISTENERS_AFFECTED = Observador modificou a simula\u00e7\ Warning.LargeAOA.str1 = Grande \u00e2ngulo de ataque encontrado. Warning.LargeAOA.str2 = Grande \u00e2ngulo de ataque encontrou ( Warning.PARALLEL_FINS = Muitas aletas paralelas -Warning.RECOVERY_DEPLOYMENT_WHILE_BURNING = Dispositivo de recupera\u00e7\u00e3o aberto enquanto o motor ainda est\u00e1 queimando. Warning.RECOVERY_HIGH_SPEED = Implanta\u00e7\u00e3o recupera\u00e7\u00e3o do dispositivo a alta velocidade Warning.RECOVERY_LAUNCH_ROD = Dispositivo de recupera\u00e7\u00e3o implantado, enquanto na guia de lan\u00e7amento. Warning.SUPERSONIC = C\u00e1lculos do corpo pode n\u00e3o ser totalmente precisos em velocidades supers\u00f4nicas. diff --git a/core/resources/l10n/messages_ru.properties b/core/resources/l10n/messages_ru.properties index 50b84632f..0204ef617 100644 --- a/core/resources/l10n/messages_ru.properties +++ b/core/resources/l10n/messages_ru.properties @@ -548,6 +548,8 @@ BasicEventSimulationEngine.error.NaNResult = \u0420\u0430\u0441\u0447\u0435\u044 RK4SimulationStepper.error.valuesTooLarge = \u0417\u043D\u0430\u0447\u0435\u043D\u0438\u044F \u0432 \u0440\u0430\u0441\u0447\u0435\u0442\u0430\u0445 \u043F\u0440\u0435\u0432\u044B\u0441\u0438\u043B\u0438 \u0433\u0440\u0430\u043D\u0438\u0446\u044B. \u041F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u0432\u044B\u0431\u0440\u0430\u0442\u044C \u0431\u043E\u043B\u0435\u0435 \u043A\u043E\u0440\u043E\u0442\u043A\u0438\u0439 \u0432\u0440\u0435\u043C\u0435\u043D\u043D\u043E\u0439 \u0448\u0430\u0433. SimulationAbort.tumbleUnderThrust = \u0421\u0442\u0443\u043F\u0435\u043D\u044C \u043D\u0430\u0447\u0430\u043B\u0430 \u043A\u0443\u0432\u044B\u0440\u044C\u043A\u0430\u0442\u044C\u0441\u044F \u043F\u043E\u0434 \u0442\u044F\u0433\u043E\u0439. +SimulationAbort.deployUnderThrust = \u0421\u0440\u0430\u0431\u0430\u0442\u044B\u0432\u0430\u043D\u0438\u0435 \u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u0430 \u0441\u043F\u0430\u0441\u0435\u043D\u0438\u044F \u043F\u0440\u0438 \u0440\u0430\u0431\u043E\u0442\u0430\u044E\u0449\u0435\u043C \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043B\u0435. + SimulationModifierTree.OptimizationParameters = \u041E\u043F\u0442\u0438\u043C\u0438\u0437\u0438\u0440\u0443\u0435\u043C\u044B\u0435 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B ! SimulationExportPanel @@ -1802,7 +1804,6 @@ Warning.DISCONTINUITY = \u0420\u0430\u0441\u0445\u043E\u0436\u0434\u0435\u043D\u Warning.THICK_FIN = \u0422\u043E\u043B\u0441\u0442\u044B\u0435 \u0441\u0442\u0430\u0431\u0438\u043B\u0438\u0437\u0430\u0442\u043E\u0440\u044B \u043C\u043E\u0433\u0443\u0442 \u0431\u044B\u0442\u044C \u0441\u043C\u043E\u0434\u0435\u043B\u0438\u0440\u043E\u0432\u0430\u043D\u044B \u0441 \u043E\u0448\u0438\u0431\u043A\u0430\u043C\u0438. Warning.JAGGED_EDGED_FIN = \u0421\u0442\u0430\u0431\u0438\u043B\u0438\u0437\u0430\u0442\u043E\u0440\u044B \u0441 \u0437\u0430\u043E\u0441\u0442\u0440\u0435\u043D\u043D\u044B\u043C\u0438 \u043A\u0440\u0430\u044F\u043C\u0438 \u043C\u043E\u0433\u0443\u0442 \u0431\u044B\u0442\u044C \u0441\u043C\u043E\u0434\u0435\u043B\u0438\u0440\u043E\u0432\u0430\u043D\u044B \u0441 \u043E\u0448\u0438\u0431\u043A\u0430\u043C\u0438. Warning.LISTENERS_AFFECTED = \u0421\u043B\u0443\u0448\u0430\u0442\u0435\u043B\u0438 \u0438\u0437\u043C\u0435\u043D\u0438\u043B\u0438 \u0440\u0430\u0441\u0447\u0435\u0442 \u043F\u043E\u043B\u0435\u0442\u0430 -Warning.RECOVERY_DEPLOYMENT_WHILE_BURNING = \u0421\u0440\u0430\u0431\u0430\u0442\u044B\u0432\u0430\u043D\u0438\u0435 \u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u0430 \u0441\u043F\u0430\u0441\u0435\u043D\u0438\u044F \u043F\u0440\u0438 \u0440\u0430\u0431\u043E\u0442\u0430\u044E\u0449\u0435\u043C \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043B\u0435. Warning.FILE_INVALID_PARAMETER = \u0412\u0441\u0442\u0440\u0435\u0442\u0438\u043B\u0441\u044F \u043D\u0435\u0432\u0435\u0440\u043D\u044B\u0439 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440, \u0438\u0433\u043D\u043E\u0440\u0438\u0440\u0443\u044E. Warning.PARALLEL_FINS = \u0421\u043B\u0438\u0448\u043A\u043E\u043C \u043C\u043D\u043E\u0433\u043E \u043F\u0430\u0440\u0430\u043B\u043B\u0435\u043B\u044C\u043D\u044B\u0445 \u0441\u0442\u0430\u0431\u0438\u043B\u0438\u0437\u0430\u0442\u043E\u0440\u043E\u0432. Warning.SUPERSONIC = \u0420\u0430\u0441\u0447\u0435\u0442\u044B \u043A\u043E\u0440\u043F\u0443\u0441\u0430 \u043F\u0440\u0438 \u0441\u0432\u0435\u0440\u0445\u0437\u0432\u0443\u043A\u043E\u0432\u044B\u0445 \u0441\u043A\u043E\u0440\u043E\u0441\u0442\u044F\u0445 \u043C\u043E\u0433\u0443\u0442 \u0431\u044B\u0442\u044C \u043D\u0435\u043C\u043D\u043E\u0433\u043E \u043D\u0435\u0442\u043E\u0447\u043D\u044B. diff --git a/core/resources/l10n/messages_uk_UA.properties b/core/resources/l10n/messages_uk_UA.properties index 003a6dfe3..72c45b44e 100644 --- a/core/resources/l10n/messages_uk_UA.properties +++ b/core/resources/l10n/messages_uk_UA.properties @@ -465,8 +465,8 @@ BasicEventSimulationEngine.error.NaNResult = Simulation resulted in not-a-number RK4SimulationStepper.error.valuesTooLarge = Simulation values exceeded limits. Try selecting a shorter time step. -SimulationAbort.tumbleUnderThrust =Stage began to tumble under thrust. - +SimulationAbort.tumbleUnderThrust = Stage began to tumble under thrust +SimulationAbort.deployUnderThrust = Recovery system deployed while still under thrust SimulationModifierTree.OptimizationParameters = Optimization Parameters ! SimulationExportPanel @@ -1526,7 +1526,6 @@ Warning.DISCONTINUITY = Discontinuity in rocket body diameter Warning.THICK_FIN = Thick fins may not simulate accurately. Warning.JAGGED_EDGED_FIN = Jagged-edged fin predictions may be inaccurate. Warning.LISTENERS_AFFECTED = Listeners modified the flight simulation -Warning.RECOVERY_DEPLOYMENT_WHILE_BURNING = Recovery device opened while motor still burning. Warning.FILE_INVALID_PARAMETER = Invalid parameter encountered, ignoring. Warning.PARALLEL_FINS = Too many parallel fins Warning.SUPERSONIC = Body calculations may not be entirely accurate at supersonic speeds. diff --git a/core/resources/l10n/messages_zh_CN.properties b/core/resources/l10n/messages_zh_CN.properties index 5171a75d4..61456230c 100644 --- a/core/resources/l10n/messages_zh_CN.properties +++ b/core/resources/l10n/messages_zh_CN.properties @@ -825,6 +825,7 @@ PrintSettingsDialog.title = \u6253\u5370\u8BBE\u7F6E RK4SimulationStepper.error.valuesTooLarge = \u4EFF\u771F\u6570\u503C\u8D85\u51FA\u9650\u5236. \u8BF7\u7F29\u5C0F\u65F6\u95F4\u6B65\u957F. SimulationAbort.tumbleUnderThrust = \u706B\u7BAD\u7EA7\u5728\u63A8\u529B\u4F5C\u7528\u4E0B\u5F00\u59CB\u503E\u8986. +SimulationAbort.deployUnderThrust = \u5728\u5F15\u64CE\u4ECD\u7136\u5DE5\u4F5C\u7684\u65F6\u5019\u56DE\u6536\u8BBE\u5907\u6253\u5F00. RecoveryConfigurationPanel.table.deployment.default = \u9ED8\u8BA4 ({0}) @@ -1299,7 +1300,6 @@ Warning.LISTENERS_AFFECTED = \u76D1\u542C\u5668\u4FEE\u6539\u4E86 Warning.LargeAOA.str1 = \u653B\u89D2\u592A\u5927. Warning.LargeAOA.str2 = \u653B\u89D2\u592A\u5927 ( Warning.PARALLEL_FINS = \u592A\u591A\u5E73\u884C\u7684\u5C3E\u7FFC -Warning.RECOVERY_DEPLOYMENT_WHILE_BURNING = \u5728\u5F15\u64CE\u4ECD\u7136\u5DE5\u4F5C\u7684\u65F6\u5019\u56DE\u6536\u8BBE\u5907\u6253\u5F00. Warning.RECOVERY_HIGH_SPEED = \u56DE\u6536\u88C5\u7F6E\u5206\u79BB\u65F6\u901F\u5EA6\u592A\u9AD8 Warning.RECOVERY_LAUNCH_ROD = \u56DE\u6536\u88C5\u7F6E\u5728\u53D1\u5C04\u67B6\u4E0A\u89E6\u53D1. Warning.SUPERSONIC = \u8D85\u97F3\u901F\u73AF\u5883\u4E0B\u7684\u8BA1\u7B97\u7ED3\u679C\u53EF\u80FD\u4E0D\u51C6\u786E. diff --git a/core/src/net/sf/openrocket/logging/SimulationAbort.java b/core/src/net/sf/openrocket/logging/SimulationAbort.java index 1196e8204..a5d34180e 100644 --- a/core/src/net/sf/openrocket/logging/SimulationAbort.java +++ b/core/src/net/sf/openrocket/logging/SimulationAbort.java @@ -49,7 +49,10 @@ public class SimulationAbort extends Message { ACTIVE_MASS_ZERO(trans.get("SimulationAbort.activeMassZero")), // Stage is tumbling under thrust - TUMBLE_UNDER_THRUST(trans.get("SimulationAbort.tumbleUnderThrust")); + TUMBLE_UNDER_THRUST(trans.get("SimulationAbort.tumbleUnderThrust")), + + // Recovery system deployed while motor is still burning + DEPLOY_UNDER_THRUST(trans.get("SimulationAbort.deployUnderThrust")); private final String name; diff --git a/core/src/net/sf/openrocket/logging/Warning.java b/core/src/net/sf/openrocket/logging/Warning.java index 3269672d7..0f085fb8d 100644 --- a/core/src/net/sf/openrocket/logging/Warning.java +++ b/core/src/net/sf/openrocket/logging/Warning.java @@ -413,9 +413,6 @@ public abstract class Warning extends Message { ////Listeners modified the flight simulation public static final Warning LISTENERS_AFFECTED = new Other(trans.get("Warning.LISTENERS_AFFECTED")); - ////Recovery device opened while motor still burning. - public static final Warning RECOVERY_DEPLOYMENT_WHILE_BURNING = new Other(trans.get("Warning.RECOVERY_DEPLOYMENT_WHILE_BURNING")); - ////No recovery device for simulation public static final Warning NO_RECOVERY_DEVICE = new Other(trans.get("Warning.NO_RECOVERY_DEVICE")); diff --git a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java index 59a44dd65..de9e0ca17 100644 --- a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java +++ b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java @@ -566,7 +566,7 @@ public class BasicEventSimulationEngine implements SimulationEngine { if (state.isDelaying() || state.isSpent()) { continue; } - currentStatus.getWarnings().add(Warning.RECOVERY_DEPLOYMENT_WHILE_BURNING); + currentStatus.abortSimulation(SimulationAbort.Cause.DEPLOY_UNDER_THRUST); } // Check for launch rod