hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1011 from SiboVG/issue-877

Browse Source 
[fixes #877] Fix deprecated 'position upwind' FlightDataEvent
This commit is contained in:
Joe Pfeiffer 2021-10-15 11:16:06 -06:00 committed by GitHub
commit 8a305b4778
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 53 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/resources/l10n/messages.properties
View File

@ -388,7 +388,7 @@ simedtdlg.checkbox.ttip.Intowind2 = A zero launchrod angle will point directly u
simedtdlg.checkbox.ttip.Intowind3 = A negative launchrod angle will launch with the wind.<br>If you uncheck this box you can point the launchrod any direction you please. simedtdlg.checkbox.ttip.Intowind3 = A negative launchrod angle will launch with the wind.<br>If you uncheck this box you can point the launchrod any direction you please.
simedtdlg.checkbox.ttip.Intowind4 = If you uncheck this box you can point the launchrod any direction you please. simedtdlg.checkbox.ttip.Intowind4 = If you uncheck this box you can point the launchrod any direction you please.
simedtdlg.lbl.Angle = Angle: simedtdlg.lbl.Angle = Angle:
simedtdlg.lbl.ttip.Angle = <html>The angle of the launch rod from vertical.<br> Positive angles point upwind. simedtdlg.lbl.ttip.Angle = <html>The angle of the launch rod from vertical.<br> Positive angles point North of launch.
simedtdlg.lbl.Direction = Direction: simedtdlg.lbl.Direction = Direction:
simedtdlg.lbl.ttip.Direction1 = <html>Direction of the launch rod relative to the wind.<br> simedtdlg.lbl.ttip.Direction1 = <html>Direction of the launch rod relative to the wind.<br>
simedtdlg.lbl.ttip.Direction2 = - simedtdlg.lbl.ttip.Direction2 = -
@ -1654,6 +1654,7 @@ FlightDataType.TYPE_VELOCITY_TOTAL = Total velocity
FlightDataType.TYPE_ACCELERATION_TOTAL = Total acceleration FlightDataType.TYPE_ACCELERATION_TOTAL = Total acceleration
FlightDataType.TYPE_POSITION_X = Position East of launch FlightDataType.TYPE_POSITION_X = Position East of launch
FlightDataType.TYPE_POSITION_Y = Position North of launch FlightDataType.TYPE_POSITION_Y = Position North of launch
FlightDataType.TYPE_UPWIND = Position upwind
FlightDataType.TYPE_POSITION_XY = Lateral distance FlightDataType.TYPE_POSITION_XY = Lateral distance
FlightDataType.TYPE_POSITION_DIRECTION = Lateral direction FlightDataType.TYPE_POSITION_DIRECTION = Lateral direction
FlightDataType.TYPE_VELOCITY_XY = Lateral velocity FlightDataType.TYPE_VELOCITY_XY = Lateral velocity

5
core/resources/l10n/messages_cs.properties
View File

@ -1255,9 +1255,10 @@ FlightDataType.TYPE_VELOCITY_Z = Svisl
FlightDataType.TYPE_ACCELERATION_Z = Svislé zrychlení FlightDataType.TYPE_ACCELERATION_Z = Svislé zrychlení
FlightDataType.TYPE_VELOCITY_TOTAL = Celková rychlost FlightDataType.TYPE_VELOCITY_TOTAL = Celková rychlost
FlightDataType.TYPE_ACCELERATION_TOTAL = Celkové zrychlení FlightDataType.TYPE_ACCELERATION_TOTAL = Celkové zrychlení
FlightDataType.TYPE_POSITION_X = Pozice proti vetru FlightDataType.TYPE_POSITION_X = Pozice v\u00fdchodn\u011b od startu
FlightDataType.TYPE_POSITION_Y = Pozice po vetru FlightDataType.TYPE_POSITION_Y = Pozice severn\u011b od startu
FlightDataType.TYPE_POSITION_XY = Bocní vzdálenost FlightDataType.TYPE_POSITION_XY = Bocní vzdálenost
FlightDataType.TYPE_UPWIND = Pozice proti vetru
FlightDataType.TYPE_POSITION_DIRECTION = Bocní smer FlightDataType.TYPE_POSITION_DIRECTION = Bocní smer
FlightDataType.TYPE_VELOCITY_XY = Bocní rychlost FlightDataType.TYPE_VELOCITY_XY = Bocní rychlost
FlightDataType.TYPE_ACCELERATION_XY = Bocní zrychlení FlightDataType.TYPE_ACCELERATION_XY = Bocní zrychlení

5
core/resources/l10n/messages_de.properties
View File

@ -1314,8 +1314,9 @@ FlightDataType.TYPE_VELOCITY_Z = Vertikalgeschwindigkeit
FlightDataType.TYPE_ACCELERATION_Z = Vertikalbeschleunigung FlightDataType.TYPE_ACCELERATION_Z = Vertikalbeschleunigung
FlightDataType.TYPE_VELOCITY_TOTAL = Gesamtgeschwindigkeit FlightDataType.TYPE_VELOCITY_TOTAL = Gesamtgeschwindigkeit
FlightDataType.TYPE_ACCELERATION_TOTAL = Gesamtbeschleunigung FlightDataType.TYPE_ACCELERATION_TOTAL = Gesamtbeschleunigung
FlightDataType.TYPE_POSITION_X = Position upwind FlightDataType.TYPE_POSITION_X = Position East of launch
FlightDataType.TYPE_POSITION_Y = Position parallel to wind FlightDataType.TYPE_POSITION_Y = Position North of launch
FlightDataType.TYPE_UPWIND = Position upwind
FlightDataType.TYPE_POSITION_XY = Lateral distance FlightDataType.TYPE_POSITION_XY = Lateral distance
FlightDataType.TYPE_POSITION_DIRECTION = Lateral direction FlightDataType.TYPE_POSITION_DIRECTION = Lateral direction
FlightDataType.TYPE_VELOCITY_XY = Lateral velocity FlightDataType.TYPE_VELOCITY_XY = Lateral velocity

5
core/resources/l10n/messages_es.properties
View File

@ -311,9 +311,10 @@ FlightDataType.TYPE_PITCH_DAMPING_MOMENT_COEFF = Coeficiente de amortiguaci\u00f
FlightDataType.TYPE_PITCH_MOMENT_COEFF = Coeficiente del momento del cabeceo FlightDataType.TYPE_PITCH_MOMENT_COEFF = Coeficiente del momento del cabeceo
FlightDataType.TYPE_PITCH_RATE = Tasa de cabeceo FlightDataType.TYPE_PITCH_RATE = Tasa de cabeceo
FlightDataType.TYPE_POSITION_DIRECTION = Direcci\u00f3n lateral FlightDataType.TYPE_POSITION_DIRECTION = Direcci\u00f3n lateral
FlightDataType.TYPE_POSITION_X = Posici\u00f3n contra el viento FlightDataType.TYPE_POSITION_X = Posici\u00f3n al este del lanzamiento
FlightDataType.TYPE_POSITION_XY = Distancia lateral FlightDataType.TYPE_POSITION_XY = Distancia lateral
FlightDataType.TYPE_POSITION_Y = Posici\u00f3n a favor del viento FlightDataType.TYPE_POSITION_Y = Posici\u00f3n al norte del lanzamiento
FlightDataType.TYPE_UPWIND = Posici\u00f3n contra el viento
FlightDataType.TYPE_PRESSURE_DRAG_COEFF = Presi\u00f3n del Coeficiente de rozamiento FlightDataType.TYPE_PRESSURE_DRAG_COEFF = Presi\u00f3n del Coeficiente de rozamiento
FlightDataType.TYPE_MOTOR_MASS = Masa del propulsor FlightDataType.TYPE_MOTOR_MASS = Masa del propulsor
FlightDataType.TYPE_REFERENCE_AREA = \u00c1rea de referencia FlightDataType.TYPE_REFERENCE_AREA = \u00c1rea de referencia

5
core/resources/l10n/messages_fr.properties
View File

@ -302,9 +302,10 @@ FlightDataType.TYPE_PITCH_DAMPING_MOMENT_COEFF = Coefficient d'amortissement de
FlightDataType.TYPE_PITCH_MOMENT_COEFF = Coefficient de moment de tangage FlightDataType.TYPE_PITCH_MOMENT_COEFF = Coefficient de moment de tangage
FlightDataType.TYPE_PITCH_RATE = Taux de tangage FlightDataType.TYPE_PITCH_RATE = Taux de tangage
FlightDataType.TYPE_POSITION_DIRECTION = Direction lat\u00E9rale FlightDataType.TYPE_POSITION_DIRECTION = Direction lat\u00E9rale
FlightDataType.TYPE_POSITION_X = Position contre le vent FlightDataType.TYPE_POSITION_X = Position \u00e0 l'est du lancement
FlightDataType.TYPE_POSITION_XY = Distance lat\u00E9rale FlightDataType.TYPE_POSITION_XY = Distance lat\u00E9rale
FlightDataType.TYPE_POSITION_Y = Position parall\u00E8le au vent FlightDataType.TYPE_POSITION_Y = Position au nord du lancement
FlightDataType.TYPE_UPWIND = Position contre le vent
FlightDataType.TYPE_PRESSURE_DRAG_COEFF = Coefficient de tra\u00EEn\u00E9e de pression FlightDataType.TYPE_PRESSURE_DRAG_COEFF = Coefficient de tra\u00EEn\u00E9e de pression
FlightDataType.TYPE_MOTOR_MASS = Masse du propergol FlightDataType.TYPE_MOTOR_MASS = Masse du propergol
FlightDataType.TYPE_REFERENCE_AREA = Surface de r\u00E9f\u00E9rence FlightDataType.TYPE_REFERENCE_AREA = Surface de r\u00E9f\u00E9rence

5
core/resources/l10n/messages_it.properties
View File

@ -1318,9 +1318,10 @@ FlightDataType.TYPE_VELOCITY_Z = Velocita' verticale
FlightDataType.TYPE_ACCELERATION_Z = Accelerazione verticale FlightDataType.TYPE_ACCELERATION_Z = Accelerazione verticale
FlightDataType.TYPE_VELOCITY_TOTAL = Velocita' totale FlightDataType.TYPE_VELOCITY_TOTAL = Velocita' totale
FlightDataType.TYPE_ACCELERATION_TOTAL = Accelerazione totale FlightDataType.TYPE_ACCELERATION_TOTAL = Accelerazione totale
FlightDataType.TYPE_POSITION_X = Posizione sopravento FlightDataType.TYPE_POSITION_X = Posizione a est del lancio
FlightDataType.TYPE_POSITION_Y = Posizione parallela al vento FlightDataType.TYPE_POSITION_Y = Posizione a nord di lancio
FlightDataType.TYPE_POSITION_XY = Distanza laterale FlightDataType.TYPE_POSITION_XY = Distanza laterale
FlightDataType.TYPE_UPWIND = Posizione sopravento
FlightDataType.TYPE_POSITION_DIRECTION = Direzione laterale FlightDataType.TYPE_POSITION_DIRECTION = Direzione laterale
FlightDataType.TYPE_VELOCITY_XY = Velocita' laterale FlightDataType.TYPE_VELOCITY_XY = Velocita' laterale
FlightDataType.TYPE_ACCELERATION_XY = Accelerazione laterale FlightDataType.TYPE_ACCELERATION_XY = Accelerazione laterale

5
core/resources/l10n/messages_ja.properties
View File

@ -1376,8 +1376,9 @@ FlightDataType.TYPE_VELOCITY_Z = \u5782\u76F4\u65B9\u5411\u901F\u5EA6
FlightDataType.TYPE_ACCELERATION_Z = \u5782\u76F4\u65B9\u5411\u52A0\u901F\u5EA6 FlightDataType.TYPE_ACCELERATION_Z = \u5782\u76F4\u65B9\u5411\u52A0\u901F\u5EA6
FlightDataType.TYPE_VELOCITY_TOTAL = Total \u901F\u5EA6 FlightDataType.TYPE_VELOCITY_TOTAL = Total \u901F\u5EA6
FlightDataType.TYPE_ACCELERATION_TOTAL = Total \u52A0\u901F\u5EA6 FlightDataType.TYPE_ACCELERATION_TOTAL = Total \u52A0\u901F\u5EA6
FlightDataType.TYPE_POSITION_X = \u98A8\u4E0A\u65B9\u5411\u4F4D\u7F6E FlightDataType.TYPE_POSITION_Y = \u98A8\u4E0A\u65B9\u5411\u4F4D\u7F6E
FlightDataType.TYPE_POSITION_Y = \u98A8\u3068\u5782\u76F4\u65B9\u5411\u4F4D\u7F6E FlightDataType.TYPE_POSITION_X = \u98A8\u3068\u5782\u76F4\u65B9\u5411\u4F4D\u7F6E
FlightDataType.TYPE_UPWIND = \u98A8\u4E0A\u65B9\u5411\u4F4D\u7F6E
FlightDataType.TYPE_POSITION_XY = \u6C34\u5E73\u65B9\u5411\u8DDD\u96E2 FlightDataType.TYPE_POSITION_XY = \u6C34\u5E73\u65B9\u5411\u8DDD\u96E2
FlightDataType.TYPE_POSITION_DIRECTION = \u6C34\u5E73\u65B9\u5411\u5411\u304D FlightDataType.TYPE_POSITION_DIRECTION = \u6C34\u5E73\u65B9\u5411\u5411\u304D
FlightDataType.TYPE_VELOCITY_XY = \u901F\u5EA6\uFF08\u5074\u9762\uFF09 FlightDataType.TYPE_VELOCITY_XY = \u901F\u5EA6\uFF08\u5074\u9762\uFF09

5
core/resources/l10n/messages_pl.properties
View File

@ -1259,8 +1259,9 @@
FlightDataType.TYPE_ACCELERATION_Z = Przyspieszenie pionowe FlightDataType.TYPE_ACCELERATION_Z = Przyspieszenie pionowe
FlightDataType.TYPE_VELOCITY_TOTAL = Pr\u0119dko\u015B\u0107 ca\u0142kowita FlightDataType.TYPE_VELOCITY_TOTAL = Pr\u0119dko\u015B\u0107 ca\u0142kowita
FlightDataType.TYPE_ACCELERATION_TOTAL = Przyspieszenie ca\u0142kowite FlightDataType.TYPE_ACCELERATION_TOTAL = Przyspieszenie ca\u0142kowite
FlightDataType.TYPE_POSITION_X = Pozycja do nawietrznej FlightDataType.TYPE_POSITION_X = Pozycja na wsch\u00f3d od startu
FlightDataType.TYPE_POSITION_Y = Pozycja równoleg\u0142a do wiatru FlightDataType.TYPE_POSITION_Y = Pozycja na p\u00f3\u0142noc od startu
FlightDataType.TYPE_UPWIND = Pozycja do nawietrznej
FlightDataType.TYPE_POSITION_XY = Odleg\u0142o\u015B\u0107 boczna FlightDataType.TYPE_POSITION_XY = Odleg\u0142o\u015B\u0107 boczna
FlightDataType.TYPE_POSITION_DIRECTION = Kierunek boczny FlightDataType.TYPE_POSITION_DIRECTION = Kierunek boczny
FlightDataType.TYPE_VELOCITY_XY = Pr\u0119dko\u015B\u0107 boczna FlightDataType.TYPE_VELOCITY_XY = Pr\u0119dko\u015B\u0107 boczna

5
core/resources/l10n/messages_pt.properties
View File

@ -291,9 +291,10 @@ FlightDataType.TYPE_PITCH_DAMPING_MOMENT_COEFF = Coeficiente de arremesso de amo
FlightDataType.TYPE_PITCH_MOMENT_COEFF = Coeficiente de momento de Pitch FlightDataType.TYPE_PITCH_MOMENT_COEFF = Coeficiente de momento de Pitch
FlightDataType.TYPE_PITCH_RATE = Taxa de arremesso FlightDataType.TYPE_PITCH_RATE = Taxa de arremesso
FlightDataType.TYPE_POSITION_DIRECTION = Dire\u00e7\u00e3o lateral FlightDataType.TYPE_POSITION_DIRECTION = Dire\u00e7\u00e3o lateral
FlightDataType.TYPE_POSITION_X = Posi\u00e7\u00e3o a favor do vento FlightDataType.TYPE_POSITION_X = Posi\u00e7\u00e3o a Este do lan\u00e7amento
FlightDataType.TYPE_POSITION_XY = Dist\u00e2ncia lateral FlightDataType.TYPE_POSITION_XY = Dist\u00e2ncia lateral
FlightDataType.TYPE_POSITION_Y = Posi\u00e7\u00e3o paralela ao vento FlightDataType.TYPE_POSITION_Y = Posi\u00e7\u00e3o Norte do lan\u00e7amento
FlightDataType.TYPE_UPWIND = Posi\u00e7\u00e3o a favor do vento
FlightDataType.TYPE_PRESSURE_DRAG_COEFF = Coeficiente de arrasto de press\u00e3o FlightDataType.TYPE_PRESSURE_DRAG_COEFF = Coeficiente de arrasto de press\u00e3o
FlightDataType.TYPE_MOTOR_MASS = Massa do propelente FlightDataType.TYPE_MOTOR_MASS = Massa do propelente
FlightDataType.TYPE_REFERENCE_AREA = \u00c1rea de refer\u00eancia FlightDataType.TYPE_REFERENCE_AREA = \u00c1rea de refer\u00eancia

5
core/resources/l10n/messages_ru.properties
View File

@ -1468,8 +1468,9 @@ FlightDataType.TYPE_VELOCITY_Z = \u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043
FlightDataType.TYPE_ACCELERATION_Z = \u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u043e\u0435 \u0443\u0441\u043a\u043e\u0440\u0435\u043d\u0438\u0435 FlightDataType.TYPE_ACCELERATION_Z = \u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u043e\u0435 \u0443\u0441\u043a\u043e\u0440\u0435\u043d\u0438\u0435
FlightDataType.TYPE_VELOCITY_TOTAL = \u041e\u0431\u0449\u0430\u044f \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c FlightDataType.TYPE_VELOCITY_TOTAL = \u041e\u0431\u0449\u0430\u044f \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c
FlightDataType.TYPE_ACCELERATION_TOTAL = \u041e\u0431\u0449\u0435\u0435 \u0443\u0441\u043a\u043e\u0440\u0435\u043d\u0438\u0435 FlightDataType.TYPE_ACCELERATION_TOTAL = \u041e\u0431\u0449\u0435\u0435 \u0443\u0441\u043a\u043e\u0440\u0435\u043d\u0438\u0435
FlightDataType.TYPE_POSITION_X = \u041f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u043f\u0440\u043e\u0442\u0438\u0432 \u0432\u0435\u0442\u0440\u0430 FlightDataType.TYPE_POSITION_Y = \u041f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u043f\u0440\u043e\u0442\u0438\u0432 \u0432\u0435\u0442\u0440\u0430
FlightDataType.TYPE_POSITION_Y = \u041f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u043f\u043e \u0432\u0435\u0442\u0440\u0443 FlightDataType.TYPE_POSITION_X = \u041f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u043f\u043e \u0432\u0435\u0442\u0440\u0443
FlightDataType.TYPE_UPWIND = \u041f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u043f\u0440\u043e\u0442\u0438\u0432 \u0432\u0435\u0442\u0440\u0430
FlightDataType.TYPE_POSITION_XY = \u0411\u043e\u043a\u043e\u0432\u0430\u044f \u0434\u0438\u0441\u0442\u0430\u043d\u0446\u0438\u044f FlightDataType.TYPE_POSITION_XY = \u0411\u043e\u043a\u043e\u0432\u0430\u044f \u0434\u0438\u0441\u0442\u0430\u043d\u0446\u0438\u044f
FlightDataType.TYPE_POSITION_DIRECTION = \u0411\u043e\u043a\u043e\u0432\u043e\u0435 \u043d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 FlightDataType.TYPE_POSITION_DIRECTION = \u0411\u043e\u043a\u043e\u0432\u043e\u0435 \u043d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435
FlightDataType.TYPE_VELOCITY_XY = \u0411\u043e\u043a\u043e\u0432\u0430\u044f \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c FlightDataType.TYPE_VELOCITY_XY = \u0411\u043e\u043a\u043e\u0432\u0430\u044f \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c

5
core/resources/l10n/messages_uk_UA.properties
View File

@ -1474,8 +1474,9 @@ FlightDataType.TYPE_VELOCITY_Z = Vertical velocity
FlightDataType.TYPE_ACCELERATION_Z = Vertical acceleration FlightDataType.TYPE_ACCELERATION_Z = Vertical acceleration
FlightDataType.TYPE_VELOCITY_TOTAL = Total velocity FlightDataType.TYPE_VELOCITY_TOTAL = Total velocity
FlightDataType.TYPE_ACCELERATION_TOTAL = Total acceleration FlightDataType.TYPE_ACCELERATION_TOTAL = Total acceleration
FlightDataType.TYPE_POSITION_X = Position upwind FlightDataType.TYPE_POSITION_X = Position East of launch
FlightDataType.TYPE_POSITION_Y = Position parallel to wind FlightDataType.TYPE_POSITION_Y = Position North of launch
FlightDataType.TYPE_UPWIND = Position upwind
FlightDataType.TYPE_POSITION_XY = Lateral distance FlightDataType.TYPE_POSITION_XY = Lateral distance
FlightDataType.TYPE_POSITION_DIRECTION = Lateral direction FlightDataType.TYPE_POSITION_DIRECTION = Lateral direction
FlightDataType.TYPE_VELOCITY_XY = Lateral velocity FlightDataType.TYPE_VELOCITY_XY = Lateral velocity

5
core/resources/l10n/messages_zh_CN.properties
View File

@ -327,9 +327,10 @@ FlightDataType.TYPE_PITCH_DAMPING_MOMENT_COEFF = \u4FEF\u4EF0\u963B\u5C3C\u7CFB\
FlightDataType.TYPE_PITCH_MOMENT_COEFF = \u4FEF\u4EF0\u529B\u77E9\u7CFB\u6570 FlightDataType.TYPE_PITCH_MOMENT_COEFF = \u4FEF\u4EF0\u529B\u77E9\u7CFB\u6570
FlightDataType.TYPE_PITCH_RATE = \u4FEF\u4EF0\u89D2\u901F\u5EA6 FlightDataType.TYPE_PITCH_RATE = \u4FEF\u4EF0\u89D2\u901F\u5EA6
FlightDataType.TYPE_POSITION_DIRECTION = \u6C34\u5E73\u65B9\u5411 FlightDataType.TYPE_POSITION_DIRECTION = \u6C34\u5E73\u65B9\u5411
FlightDataType.TYPE_POSITION_X = \u8FCE\u98CE\u4F4D\u7F6E FlightDataType.TYPE_POSITION_Y = \u8FCE\u98CE\u4F4D\u7F6E
FlightDataType.TYPE_POSITION_XY = \u6A2A\u5411\u8DE8\u8DDD FlightDataType.TYPE_POSITION_XY = \u6A2A\u5411\u8DE8\u8DDD
FlightDataType.TYPE_POSITION_Y = \u5E73\u884C\u98CE\u4F4D\u7F6E FlightDataType.TYPE_POSITION_X = \u5E73\u884C\u98CE\u4F4D\u7F6E
FlightDataType.TYPE_UPWIND = \u8FCE\u98CE\u4F4D\u7F6E
FlightDataType.TYPE_PRESSURE_DRAG_COEFF = \u538B\u5DEE\u963B\u529B\u7CFB\u6570 FlightDataType.TYPE_PRESSURE_DRAG_COEFF = \u538B\u5DEE\u963B\u529B\u7CFB\u6570
FlightDataType.TYPE_MOTOR_MASS = \u63A8\u8FDB\u5242\u8D28\u91CF FlightDataType.TYPE_MOTOR_MASS = \u63A8\u8FDB\u5242\u8D28\u91CF
FlightDataType.TYPE_REFERENCE_AREA = \u53C2\u8003\u9762\u79EF FlightDataType.TYPE_REFERENCE_AREA = \u53C2\u8003\u9762\u79EF

8
core/src/net/sf/openrocket/file/openrocket/importt/FlightDataBranchHandler.java
View File

@ -7,11 +7,13 @@ import net.sf.openrocket.file.DocumentLoadingContext;
import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.AbstractElementHandler;
import net.sf.openrocket.file.simplesax.ElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler;
import net.sf.openrocket.file.simplesax.PlainTextHandler; import net.sf.openrocket.file.simplesax.PlainTextHandler;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.simulation.FlightDataBranch; import net.sf.openrocket.simulation.FlightDataBranch;
import net.sf.openrocket.simulation.FlightDataType; import net.sf.openrocket.simulation.FlightDataType;
import net.sf.openrocket.simulation.FlightEvent; import net.sf.openrocket.simulation.FlightEvent;
import net.sf.openrocket.simulation.FlightEvent.Type; import net.sf.openrocket.simulation.FlightEvent.Type;
import net.sf.openrocket.simulation.customexpression.CustomExpression; import net.sf.openrocket.simulation.customexpression.CustomExpression;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.UnitGroup;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -25,6 +27,7 @@ class FlightDataBranchHandler extends AbstractElementHandler {
private static final Logger log = LoggerFactory.getLogger(FlightDataBranchHandler.class); private static final Logger log = LoggerFactory.getLogger(FlightDataBranchHandler.class);
private final SingleSimulationHandler simHandler; private final SingleSimulationHandler simHandler;
private static final Translator trans = Application.getTranslator();
public FlightDataBranchHandler(String name, String typeList, SingleSimulationHandler simHandler, DocumentLoadingContext context) { public FlightDataBranchHandler(String name, String typeList, SingleSimulationHandler simHandler, DocumentLoadingContext context) {
this.simHandler = simHandler; this.simHandler = simHandler;
@ -80,6 +83,11 @@ class FlightDataBranchHandler extends AbstractElementHandler {
return t; return t;
} }
} }
// Replace deprecated 'Position upwind' with new 'Position North of launch' option
if (name.equals(trans.get("FlightDataType.TYPE_UPWIND"))) {
return FlightDataType.TYPE_POSITION_Y;
}
// Look in custom expressions // Look in custom expressions
for (CustomExpression exp : simHandler.getDocument().getCustomExpressions()) { for (CustomExpression exp : simHandler.getDocument().getCustomExpressions()) {

4
core/src/net/sf/openrocket/simulation/FlightDataType.java
View File

@ -57,9 +57,9 @@ public class FlightDataType implements Comparable<FlightDataType> {
//// Lateral position and motion //// Lateral position and motion
//// Position upwind //// Position East of launch
public static final FlightDataType TYPE_POSITION_X = newType(trans.get("FlightDataType.TYPE_POSITION_X"), "Px", UnitGroup.UNITS_DISTANCE, 30); public static final FlightDataType TYPE_POSITION_X = newType(trans.get("FlightDataType.TYPE_POSITION_X"), "Px", UnitGroup.UNITS_DISTANCE, 30);
//// Position parallel to wind //// Position North of launch
public static final FlightDataType TYPE_POSITION_Y = newType(trans.get("FlightDataType.TYPE_POSITION_Y"), "Py", UnitGroup.UNITS_DISTANCE, 31); public static final FlightDataType TYPE_POSITION_Y = newType(trans.get("FlightDataType.TYPE_POSITION_Y"), "Py", UnitGroup.UNITS_DISTANCE, 31);
//// Lateral distance //// Lateral distance
public static final FlightDataType TYPE_POSITION_XY = newType(trans.get("FlightDataType.TYPE_POSITION_XY"), "Pl", UnitGroup.UNITS_DISTANCE, 32); public static final FlightDataType TYPE_POSITION_XY = newType(trans.get("FlightDataType.TYPE_POSITION_XY"), "Pl", UnitGroup.UNITS_DISTANCE, 32);

10
core/test-writing/asimple.ork
View File

@ -233,7 +233,7 @@
<timestep>0.05</timestep> <timestep>0.05</timestep>
</conditions> </conditions>
<flightdata maxaltitude="48.01" maxvelocity="28.387" maxacceleration="88.894" maxmach="0.084235" timetoapogee="3.2507" flighttime="15.509" groundhitvelocity="4.01" launchrodvelocity="15.602" deploymentvelocity="3.6853"> <flightdata maxaltitude="48.01" maxvelocity="28.387" maxacceleration="88.894" maxmach="0.084235" timetoapogee="3.2507" flighttime="15.509" groundhitvelocity="4.01" launchrodvelocity="15.602" deploymentvelocity="3.6853">
<databranch name="MAIN" types="Time,Altitude,Vertical velocity,Vertical acceleration,Total velocity,Total acceleration,Position upwind,Position parallel to wind,Lateral distance,Lateral direction,Lateral velocity,Lateral acceleration,Latitude,Longitude,Angle of attack,Roll rate,Pitch rate,Yaw rate,Mass,Longitudinal moment of inertia,Rotational moment of inertia,CP location,CG location,Stability margin calibers,Mach number,Reynolds number,Thrust,Drag force,Drag coefficient,Axial drag coefficient,Friction drag coefficient,Pressure drag coefficient,Base drag coefficient,Normal force coefficient,Pitch moment coefficient,Yaw moment coefficient,Side force coefficient,Roll moment coefficient,Roll forcing coefficient,Roll damping coefficient,Pitch damping coefficient,Reference length,Reference area,Vertical orientation (zenith),Lateral orientation (azimuth),Wind velocity,Air temperature,Air pressure,Speed of sound,Simulation time step,Computation time"> <databranch name="MAIN" types="Time,Altitude,Vertical velocity,Vertical acceleration,Total velocity,Total acceleration,Position North of launch,Position parallel to wind,Lateral distance,Lateral direction,Lateral velocity,Lateral acceleration,Latitude,Longitude,Angle of attack,Roll rate,Pitch rate,Yaw rate,Mass,Longitudinal moment of inertia,Rotational moment of inertia,CP location,CG location,Stability margin calibers,Mach number,Reynolds number,Thrust,Drag force,Drag coefficient,Axial drag coefficient,Friction drag coefficient,Pressure drag coefficient,Base drag coefficient,Normal force coefficient,Pitch moment coefficient,Yaw moment coefficient,Side force coefficient,Roll moment coefficient,Roll forcing coefficient,Roll damping coefficient,Pitch damping coefficient,Reference length,Reference area,Vertical orientation (zenith),Lateral orientation (azimuth),Wind velocity,Air temperature,Air pressure,Speed of sound,Simulation time step,Computation time">
<event time="0" type="launch"/> <event time="0" type="launch"/>
<event time="0" type="ignition"/> <event time="0" type="ignition"/>
<event time="0.11" type="liftoff"/> <event time="0.11" type="liftoff"/>
@ -311,7 +311,7 @@
<timestep>0.05</timestep> <timestep>0.05</timestep>
</conditions> </conditions>
<flightdata maxaltitude="122.92" maxvelocity="51.139" maxacceleration="54.016" maxmach="0.15068" timetoapogee="5.0346" flighttime="35.188" groundhitvelocity="3.9279" launchrodvelocity="17.216" deploymentvelocity="1.3814"> <flightdata maxaltitude="122.92" maxvelocity="51.139" maxacceleration="54.016" maxmach="0.15068" timetoapogee="5.0346" flighttime="35.188" groundhitvelocity="3.9279" launchrodvelocity="17.216" deploymentvelocity="1.3814">
<databranch name="MAIN" types="Time,Altitude,Vertical velocity,Vertical acceleration,Total velocity,Total acceleration,Position upwind,Position parallel to wind,Lateral distance,Lateral direction,Lateral velocity,Lateral acceleration,Latitude,Longitude,Angle of attack,Roll rate,Pitch rate,Yaw rate,Mass,Longitudinal moment of inertia,Rotational moment of inertia,CP location,CG location,Stability margin calibers,Mach number,Reynolds number,Thrust,Drag force,Drag coefficient,Axial drag coefficient,Friction drag coefficient,Pressure drag coefficient,Base drag coefficient,Normal force coefficient,Pitch moment coefficient,Yaw moment coefficient,Side force coefficient,Roll moment coefficient,Roll forcing coefficient,Roll damping coefficient,Pitch damping coefficient,Reference length,Reference area,Vertical orientation (zenith),Lateral orientation (azimuth),Wind velocity,Air temperature,Air pressure,Speed of sound,Simulation time step,Computation time"> <databranch name="MAIN" types="Time,Altitude,Vertical velocity,Vertical acceleration,Total velocity,Total acceleration,Position North of launch,Position parallel to wind,Lateral distance,Lateral direction,Lateral velocity,Lateral acceleration,Latitude,Longitude,Angle of attack,Roll rate,Pitch rate,Yaw rate,Mass,Longitudinal moment of inertia,Rotational moment of inertia,CP location,CG location,Stability margin calibers,Mach number,Reynolds number,Thrust,Drag force,Drag coefficient,Axial drag coefficient,Friction drag coefficient,Pressure drag coefficient,Base drag coefficient,Normal force coefficient,Pitch moment coefficient,Yaw moment coefficient,Side force coefficient,Roll moment coefficient,Roll forcing coefficient,Roll damping coefficient,Pitch damping coefficient,Reference length,Reference area,Vertical orientation (zenith),Lateral orientation (azimuth),Wind velocity,Air temperature,Air pressure,Speed of sound,Simulation time step,Computation time">
<event time="0" type="launch"/> <event time="0" type="launch"/>
<event time="0" type="ignition"/> <event time="0" type="ignition"/>
<event time="0.08" type="liftoff"/> <event time="0.08" type="liftoff"/>
@ -436,7 +436,7 @@
</conditions> </conditions>
<flightdata maxaltitude="251.16" maxvelocity="88.283" maxacceleration="74.725" maxmach="0.2602" timetoapogee="5.3184" flighttime="66.255" groundhitvelocity="4.4004" launchrodvelocity="18.298" deploymentvelocity="20.469"> <flightdata maxaltitude="251.16" maxvelocity="88.283" maxacceleration="74.725" maxmach="0.2602" timetoapogee="5.3184" flighttime="66.255" groundhitvelocity="4.4004" launchrodvelocity="18.298" deploymentvelocity="20.469">
<warning>Recovery device deployment at high speed (24.1 m/s).</warning> <warning>Recovery device deployment at high speed (24.1 m/s).</warning>
<databranch name="MAIN" types="Time,Altitude,Vertical velocity,Vertical acceleration,Total velocity,Total acceleration,Position upwind,Position parallel to wind,Lateral distance,Lateral direction,Lateral velocity,Lateral acceleration,Latitude,Longitude,Angle of attack,Roll rate,Pitch rate,Yaw rate,Mass,Longitudinal moment of inertia,Rotational moment of inertia,CP location,CG location,Stability margin calibers,Mach number,Reynolds number,Thrust,Drag force,Drag coefficient,Axial drag coefficient,Friction drag coefficient,Pressure drag coefficient,Base drag coefficient,Normal force coefficient,Pitch moment coefficient,Yaw moment coefficient,Side force coefficient,Roll moment coefficient,Roll forcing coefficient,Roll damping coefficient,Pitch damping coefficient,Reference length,Reference area,Vertical orientation (zenith),Lateral orientation (azimuth),Wind velocity,Air temperature,Air pressure,Speed of sound,Simulation time step,Computation time"> <databranch name="MAIN" types="Time,Altitude,Vertical velocity,Vertical acceleration,Total velocity,Total acceleration,Position North of launch,Position parallel to wind,Lateral distance,Lateral direction,Lateral velocity,Lateral acceleration,Latitude,Longitude,Angle of attack,Roll rate,Pitch rate,Yaw rate,Mass,Longitudinal moment of inertia,Rotational moment of inertia,CP location,CG location,Stability margin calibers,Mach number,Reynolds number,Thrust,Drag force,Drag coefficient,Axial drag coefficient,Friction drag coefficient,Pressure drag coefficient,Base drag coefficient,Normal force coefficient,Pitch moment coefficient,Yaw moment coefficient,Side force coefficient,Roll moment coefficient,Roll forcing coefficient,Roll damping coefficient,Pitch damping coefficient,Reference length,Reference area,Vertical orientation (zenith),Lateral orientation (azimuth),Wind velocity,Air temperature,Air pressure,Speed of sound,Simulation time step,Computation time">
<event time="0" type="launch"/> <event time="0" type="launch"/>
<event time="0" type="ignition"/> <event time="0" type="ignition"/>
<event time="0.08" type="liftoff"/> <event time="0.08" type="liftoff"/>
@ -633,7 +633,7 @@
<timestep>0.05</timestep> <timestep>0.05</timestep>
</conditions> </conditions>
<flightdata maxaltitude="274" maxvelocity="86.784" maxacceleration="74.957" maxmach="0.2558" timetoapogee="7.0425" flighttime="73.462" groundhitvelocity="3.9825" launchrodvelocity="18.307" deploymentvelocity="3.8536"> <flightdata maxaltitude="274" maxvelocity="86.784" maxacceleration="74.957" maxmach="0.2558" timetoapogee="7.0425" flighttime="73.462" groundhitvelocity="3.9825" launchrodvelocity="18.307" deploymentvelocity="3.8536">
<databranch name="MAIN" types="Time,Altitude,Vertical velocity,Vertical acceleration,Total velocity,Total acceleration,Position upwind,Position parallel to wind,Lateral distance,Lateral direction,Lateral velocity,Lateral acceleration,Latitude,Longitude,Angle of attack,Roll rate,Pitch rate,Yaw rate,Mass,Longitudinal moment of inertia,Rotational moment of inertia,CP location,CG location,Stability margin calibers,Mach number,Reynolds number,Thrust,Drag force,Drag coefficient,Axial drag coefficient,Friction drag coefficient,Pressure drag coefficient,Base drag coefficient,Normal force coefficient,Pitch moment coefficient,Yaw moment coefficient,Side force coefficient,Roll moment coefficient,Roll forcing coefficient,Roll damping coefficient,Pitch damping coefficient,Reference length,Reference area,Vertical orientation (zenith),Lateral orientation (azimuth),Wind velocity,Air temperature,Air pressure,Speed of sound,Simulation time step,Computation time"> <databranch name="MAIN" types="Time,Altitude,Vertical velocity,Vertical acceleration,Total velocity,Total acceleration,Position North of launch,Position parallel to wind,Lateral distance,Lateral direction,Lateral velocity,Lateral acceleration,Latitude,Longitude,Angle of attack,Roll rate,Pitch rate,Yaw rate,Mass,Longitudinal moment of inertia,Rotational moment of inertia,CP location,CG location,Stability margin calibers,Mach number,Reynolds number,Thrust,Drag force,Drag coefficient,Axial drag coefficient,Friction drag coefficient,Pressure drag coefficient,Base drag coefficient,Normal force coefficient,Pitch moment coefficient,Yaw moment coefficient,Side force coefficient,Roll moment coefficient,Roll forcing coefficient,Roll damping coefficient,Pitch damping coefficient,Reference length,Reference area,Vertical orientation (zenith),Lateral orientation (azimuth),Wind velocity,Air temperature,Air pressure,Speed of sound,Simulation time step,Computation time">
<event time="0" type="launch"/> <event time="0" type="launch"/>
<event time="0" type="ignition"/> <event time="0" type="ignition"/>
<event time="0.08" type="liftoff"/> <event time="0.08" type="liftoff"/>
@ -850,7 +850,7 @@
<timestep>0.05</timestep> <timestep>0.05</timestep>
</conditions> </conditions>
<flightdata maxaltitude="274.09" maxvelocity="86.758" maxacceleration="75.683" maxmach="0.25563" timetoapogee="7.1736" flighttime="71.694" groundhitvelocity="3.8711" launchrodvelocity="18.331" deploymentvelocity="11.693"> <flightdata maxaltitude="274.09" maxvelocity="86.758" maxacceleration="75.683" maxmach="0.25563" timetoapogee="7.1736" flighttime="71.694" groundhitvelocity="3.8711" launchrodvelocity="18.331" deploymentvelocity="11.693">
<databranch name="MAIN" types="Time,Altitude,Vertical velocity,Vertical acceleration,Total velocity,Total acceleration,Position upwind,Position parallel to wind,Lateral distance,Lateral direction,Lateral velocity,Lateral acceleration,Latitude,Longitude,Angle of attack,Roll rate,Pitch rate,Yaw rate,Mass,Longitudinal moment of inertia,Rotational moment of inertia,CP location,CG location,Stability margin calibers,Mach number,Reynolds number,Thrust,Drag force,Drag coefficient,Axial drag coefficient,Friction drag coefficient,Pressure drag coefficient,Base drag coefficient,Normal force coefficient,Pitch moment coefficient,Yaw moment coefficient,Side force coefficient,Roll moment coefficient,Roll forcing coefficient,Roll damping coefficient,Pitch damping coefficient,Reference length,Reference area,Vertical orientation (zenith),Lateral orientation (azimuth),Wind velocity,Air temperature,Air pressure,Speed of sound,Simulation time step,Computation time"> <databranch name="MAIN" types="Time,Altitude,Vertical velocity,Vertical acceleration,Total velocity,Total acceleration,Position North of launch,Position parallel to wind,Lateral distance,Lateral direction,Lateral velocity,Lateral acceleration,Latitude,Longitude,Angle of attack,Roll rate,Pitch rate,Yaw rate,Mass,Longitudinal moment of inertia,Rotational moment of inertia,CP location,CG location,Stability margin calibers,Mach number,Reynolds number,Thrust,Drag force,Drag coefficient,Axial drag coefficient,Friction drag coefficient,Pressure drag coefficient,Base drag coefficient,Normal force coefficient,Pitch moment coefficient,Yaw moment coefficient,Side force coefficient,Roll moment coefficient,Roll forcing coefficient,Roll damping coefficient,Pitch damping coefficient,Reference length,Reference area,Vertical orientation (zenith),Lateral orientation (azimuth),Wind velocity,Air temperature,Air pressure,Speed of sound,Simulation time step,Computation time">
<event time="0" type="launch"/> <event time="0" type="launch"/>
<event time="0" type="ignition"/> <event time="0" type="ignition"/>
<event time="0.08" type="liftoff"/> <event time="0.08" type="liftoff"/>

3
swing/src/net/sf/openrocket/gui/plot/SimulationPlot.java
View File

@ -158,6 +158,9 @@ public class SimulationPlot {
for (int i = 0; i < typeCount; i++) { for (int i = 0; i < typeCount; i++) {
// Get info // Get info
FlightDataType type = filled.getType(i); FlightDataType type = filled.getType(i);
if (Objects.equals(type.getName(), "Position upwind")) {
type = FlightDataType.TYPE_POSITION_Y;
}
Unit unit = filled.getUnit(i); Unit unit = filled.getUnit(i);
int axis = filled.getAxis(i); int axis = filled.getAxis(i);
String name = getLabel(type, unit); String name = getLabel(type, unit);