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

Merge pull request #1085 from SiboVG/issue-1084

Browse Source 
[fixes #1084] Fix layout PhotoStudio Settings
This commit is contained in:
SiboVG 2022-02-05 01:01:27 +01:00 committed by GitHub
commit 1876fb88df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 62 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2153,7 +2153,7 @@ PhotoSettingsConfig.lbl.lightAlt = Light Altitude
PhotoSettingsConfig.lbl.sky = Sky PhotoSettingsConfig.lbl.sky = Sky
PhotoSettingsConfig.lbl.skyColor = Sky Color PhotoSettingsConfig.lbl.skyColor = Sky Color
PhotoSettingsConfig.lbl.skyImage = Sky Image PhotoSettingsConfig.lbl.skyImage = Sky Image
PhotoSettingsConfig.lbl.skyCredit = Image Credit: PhotoSettingsConfig.lbl.skyCredit = Image Credit
PhotoSettingsConfig.tab.effects = Effects PhotoSettingsConfig.tab.effects = Effects
PhotoSettingsConfig.lbl.smokeFlame = Smoke & Flame PhotoSettingsConfig.lbl.smokeFlame = Smoke & Flame

2
core/resources/l10n/messages_nl.properties
View File

@ -2101,7 +2101,7 @@ PhotoSettingsConfig.lbl.lightAlt = Lichte Hoogte
PhotoSettingsConfig.lbl.sky = Lucht PhotoSettingsConfig.lbl.sky = Lucht
PhotoSettingsConfig.lbl.skyColor = Luchtkleur PhotoSettingsConfig.lbl.skyColor = Luchtkleur
PhotoSettingsConfig.lbl.skyImage = Luchtafbeelding PhotoSettingsConfig.lbl.skyImage = Luchtafbeelding
PhotoSettingsConfig.lbl.skyCredit = Afbeelding Credit: PhotoSettingsConfig.lbl.skyCredit = Afbeelding Credit
PhotoSettingsConfig.tab.effects = Effecten PhotoSettingsConfig.tab.effects = Effecten
PhotoSettingsConfig.lbl.smokeFlame = Rook & Vlam PhotoSettingsConfig.lbl.smokeFlame = Rook & Vlam

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

@ -1943,7 +1943,7 @@ PhotoSettingsConfig.lbl.lightAlt = Light Altitude
PhotoSettingsConfig.lbl.sky = Sky PhotoSettingsConfig.lbl.sky = Sky
PhotoSettingsConfig.lbl.skyColor = Sky Color PhotoSettingsConfig.lbl.skyColor = Sky Color
PhotoSettingsConfig.lbl.skyImage = Sky Image PhotoSettingsConfig.lbl.skyImage = Sky Image
PhotoSettingsConfig.lbl.skyCredit = Image Credit: PhotoSettingsConfig.lbl.skyCredit = Image Credit
PhotoSettingsConfig.tab.effects = Effects PhotoSettingsConfig.tab.effects = Effects
PhotoSettingsConfig.lbl.smokeFlame = Smoke & Flame PhotoSettingsConfig.lbl.smokeFlame = Smoke & Flame

88
swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoSettingsConfig.java
View File

@ -160,83 +160,101 @@ public class PhotoSettingsConfig extends JTabbedPane {
smokeColorButton.addActionListener(new ColorActionListener(p, "SmokeColor")); smokeColorButton.addActionListener(new ColorActionListener(p, "SmokeColor"));
flameColorButton.addActionListener(new ColorActionListener(p, "FlameColor")); flameColorButton.addActionListener(new ColorActionListener(p, "FlameColor"));
addTab(trans.get("PhotoSettingsConfig.tab.orientation"), new JPanel(new MigLayout("fill")) { addTab(trans.get("PhotoSettingsConfig.tab.orientation"), new JPanel(new MigLayout("fill", "[]100[]5[]")) {
{ {
add(new StyledLabel(trans.get("PhotoSettingsConfig.lbl.rocket"), Style.BOLD)); // Rocket
add(new JSeparator(SwingConstants.HORIZONTAL), "span, wrap, growx"); add(new StyledLabel(trans.get("PhotoSettingsConfig.lbl.rocket"), Style.BOLD), "split, span, gapright para");
add(new JSeparator(SwingConstants.HORIZONTAL), "wrap, growx");
/// Pitch
add(new JLabel(trans.get("PhotoSettingsConfig.lbl.pitch"))); add(new JLabel(trans.get("PhotoSettingsConfig.lbl.pitch")));
DoubleModel pitchModel = new DoubleModel(p, "Pitch", UnitGroup.UNITS_ANGLE); DoubleModel pitchModel = new DoubleModel(p, "Pitch", UnitGroup.UNITS_ANGLE);
add(new EditableSpinner(pitchModel.getSpinnerModel()), "w 40"); add(new EditableSpinner(pitchModel.getSpinnerModel()), "growx");
add(new UnitSelector(pitchModel), "wrap"); add(new UnitSelector(pitchModel), "pushx, left, wrap");
/// Yaw
add(new JLabel(trans.get("PhotoSettingsConfig.lbl.yaw"))); add(new JLabel(trans.get("PhotoSettingsConfig.lbl.yaw")));
DoubleModel yawModel = new DoubleModel(p, "Yaw", UnitGroup.UNITS_ANGLE); DoubleModel yawModel = new DoubleModel(p, "Yaw", UnitGroup.UNITS_ANGLE);
add(new EditableSpinner(yawModel.getSpinnerModel()), "w 40"); add(new EditableSpinner(yawModel.getSpinnerModel()), "growx");
add(new UnitSelector(yawModel), "wrap"); add(new UnitSelector(yawModel), "wrap");
/// Roll
add(new JLabel(trans.get("PhotoSettingsConfig.lbl.roll"))); add(new JLabel(trans.get("PhotoSettingsConfig.lbl.roll")));
DoubleModel rollModel = new DoubleModel(p, "Roll", UnitGroup.UNITS_ANGLE); DoubleModel rollModel = new DoubleModel(p, "Roll", UnitGroup.UNITS_ANGLE);
add(new EditableSpinner(rollModel.getSpinnerModel()), "w 40"); add(new EditableSpinner(rollModel.getSpinnerModel()), "growx");
add(new UnitSelector(rollModel), "wrap"); add(new UnitSelector(rollModel), "wrap");
/// Advance
add(new JLabel(trans.get("PhotoSettingsConfig.lbl.advance"))); add(new JLabel(trans.get("PhotoSettingsConfig.lbl.advance")));
DoubleModel advanceModel = new DoubleModel(p, "Advance", UnitGroup.UNITS_LENGTH); DoubleModel advanceModel = new DoubleModel(p, "Advance", UnitGroup.UNITS_LENGTH);
add(new EditableSpinner(advanceModel.getSpinnerModel()), "w 40"); add(new EditableSpinner(advanceModel.getSpinnerModel()), "growx");
add(new UnitSelector(advanceModel), "wrap"); add(new UnitSelector(advanceModel), "wrap");
add(new StyledLabel(trans.get("PhotoSettingsConfig.lbl.camera"), Style.BOLD)); // Camera
add(new JSeparator(SwingConstants.HORIZONTAL), "span, wrap, growx"); add(new StyledLabel(trans.get("PhotoSettingsConfig.lbl.camera"), Style.BOLD), "split, gapright para, span");
add(new JSeparator(SwingConstants.HORIZONTAL), "wrap, growx");
/// View azimuth
add(new JLabel(trans.get("PhotoSettingsConfig.lbl.vAz"))); add(new JLabel(trans.get("PhotoSettingsConfig.lbl.vAz")));
DoubleModel viewAzModel = new DoubleModel(p, "ViewAz", UnitGroup.UNITS_ANGLE); DoubleModel viewAzModel = new DoubleModel(p, "ViewAz", UnitGroup.UNITS_ANGLE);
add(new EditableSpinner(viewAzModel.getSpinnerModel()), "w 40"); add(new EditableSpinner(viewAzModel.getSpinnerModel()), "growx");
add(new UnitSelector(viewAzModel), "wrap"); add(new UnitSelector(viewAzModel), "wrap");
/// View altitude
add(new JLabel(trans.get("PhotoSettingsConfig.lbl.vAlt"))); add(new JLabel(trans.get("PhotoSettingsConfig.lbl.vAlt")));
DoubleModel viewAltModle = new DoubleModel(p, "ViewAlt", UnitGroup.UNITS_ANGLE); DoubleModel viewAltModle = new DoubleModel(p, "ViewAlt", UnitGroup.UNITS_ANGLE);
add(new EditableSpinner(viewAltModle.getSpinnerModel()), "w 40"); add(new EditableSpinner(viewAltModle.getSpinnerModel()), "growx");
add(new UnitSelector(viewAltModle), "wrap"); add(new UnitSelector(viewAltModle), "wrap");
/// View distance
add(new JLabel(trans.get("PhotoSettingsConfig.lbl.vDist"))); add(new JLabel(trans.get("PhotoSettingsConfig.lbl.vDist")));
DoubleModel viewDistanceModel = new DoubleModel(p, "ViewDistance", UnitGroup.UNITS_LENGTH); DoubleModel viewDistanceModel = new DoubleModel(p, "ViewDistance", UnitGroup.UNITS_LENGTH);
add(new EditableSpinner(viewDistanceModel.getSpinnerModel()), "w 40"); add(new EditableSpinner(viewDistanceModel.getSpinnerModel()), "growx");
add(new UnitSelector(viewDistanceModel), "wrap"); add(new UnitSelector(viewDistanceModel), "wrap");
/// FoV
add(new JLabel(trans.get("PhotoSettingsConfig.lbl.fov"))); add(new JLabel(trans.get("PhotoSettingsConfig.lbl.fov")));
DoubleModel fovModel = new DoubleModel(p, "Fov", UnitGroup.UNITS_ANGLE); DoubleModel fovModel = new DoubleModel(p, "Fov", UnitGroup.UNITS_ANGLE);
add(new EditableSpinner(fovModel.getSpinnerModel()), "w 40"); add(new EditableSpinner(fovModel.getSpinnerModel()), "growx");
add(new UnitSelector(fovModel), "wrap"); add(new UnitSelector(fovModel), "wrap");
} }
}); });
addTab(trans.get("PhotoSettingsConfig.tab.environment"), new JPanel(new MigLayout("fill")) { addTab(trans.get("PhotoSettingsConfig.tab.environment"), new JPanel(new MigLayout("fill", "[]100[]5[]")) {
{ {
add(new StyledLabel(trans.get("PhotoSettingsConfig.lbl.light"), Style.BOLD)); // Light
add(new JSeparator(SwingConstants.HORIZONTAL), "span, wrap, growx"); add(new StyledLabel(trans.get("PhotoSettingsConfig.lbl.light"), Style.BOLD), "split, span, gapright para");
add(new JSeparator(SwingConstants.HORIZONTAL), "wrap, growx");
/// Sun light
add(new JLabel(trans.get("PhotoSettingsConfig.lbl.sun"))); add(new JLabel(trans.get("PhotoSettingsConfig.lbl.sun")));
add(sunLightColorButton, "wrap"); add(sunLightColorButton, "wrap");
/// Ambiance
add(new JLabel(trans.get("PhotoSettingsConfig.lbl.amb"))); add(new JLabel(trans.get("PhotoSettingsConfig.lbl.amb")));
DoubleModel ambianceModel = new DoubleModel(p, "Ambiance", 100, UnitGroup.UNITS_NONE, 0, 100); DoubleModel ambianceModel = new DoubleModel(p, "Ambiance", 100, UnitGroup.UNITS_NONE, 0, 100);
add(new EditableSpinner(ambianceModel.getSpinnerModel()), "wrap"); add(new EditableSpinner(ambianceModel.getSpinnerModel()), "wrap");
/// Light azimuth
add(new JLabel(trans.get("PhotoSettingsConfig.lbl.lightAz"))); add(new JLabel(trans.get("PhotoSettingsConfig.lbl.lightAz")));
DoubleModel lightAzModel = new DoubleModel(p, "LightAz", UnitGroup.UNITS_ANGLE); DoubleModel lightAzModel = new DoubleModel(p, "LightAz", UnitGroup.UNITS_ANGLE);
add(new EditableSpinner(lightAzModel.getSpinnerModel()), "w 40"); add(new EditableSpinner(lightAzModel.getSpinnerModel()), "split 2");
add(new UnitSelector(lightAzModel), "wrap"); add(new UnitSelector(lightAzModel), "pushx, left, wrap");
/// Light altitude
add(new JLabel(trans.get("PhotoSettingsConfig.lbl.lightAlt"))); add(new JLabel(trans.get("PhotoSettingsConfig.lbl.lightAlt")));
DoubleModel lightAltModle = new DoubleModel(p, "LightAlt", UnitGroup.UNITS_ANGLE); DoubleModel lightAltModle = new DoubleModel(p, "LightAlt", UnitGroup.UNITS_ANGLE);
add(new EditableSpinner(lightAltModle.getSpinnerModel()), "wrap"); add(new EditableSpinner(lightAltModle.getSpinnerModel()), "wrap");
add(new StyledLabel(trans.get("PhotoSettingsConfig.lbl.sky"), Style.BOLD)); // Sky
add(new JSeparator(SwingConstants.HORIZONTAL), "span, wrap, growx"); add(new StyledLabel(trans.get("PhotoSettingsConfig.lbl.sky"), Style.BOLD), "split, span, gapright para");
add(new JSeparator(SwingConstants.HORIZONTAL), "wrap, growx");
/// Sky color
add(new JLabel(trans.get("PhotoSettingsConfig.lbl.skyColor"))); add(new JLabel(trans.get("PhotoSettingsConfig.lbl.skyColor")));
add(skyColorButton, "wrap"); add(skyColorButton, "wrap");
/// Sky image
add(new JLabel(trans.get("PhotoSettingsConfig.lbl.skyImage"))); add(new JLabel(trans.get("PhotoSettingsConfig.lbl.skyImage")));
Sky noSky = new Sky() { // Dummy sky for 'none' selection option Sky noSky = new Sky() { // Dummy sky for 'none' selection option
@ -276,8 +294,9 @@ public class PhotoSettingsConfig extends JTabbedPane {
} }
}, "wrap"); }, "wrap");
/// Image credit
final JLabel creditLabel = new JLabel(trans.get("PhotoSettingsConfig.lbl.skyCredit")); final JLabel creditLabel = new JLabel(trans.get("PhotoSettingsConfig.lbl.skyCredit"));
add(creditLabel, "wrap"); add(creditLabel);
final JTextArea credit = new JTextArea(); final JTextArea credit = new JTextArea();
credit.setEditable(false); credit.setEditable(false);
@ -285,7 +304,7 @@ public class PhotoSettingsConfig extends JTabbedPane {
credit.setOpaque(false); credit.setOpaque(false);
credit.setFocusable(false); credit.setFocusable(false);
credit.setFont(creditLabel.getFont()); credit.setFont(creditLabel.getFont());
add(credit, "span, gap left 10px"); add(credit);
final StateChangeListener skyChange = new StateChangeListener() { final StateChangeListener skyChange = new StateChangeListener() {
@Override @Override
@ -304,24 +323,28 @@ public class PhotoSettingsConfig extends JTabbedPane {
} }
}); });
addTab(trans.get("PhotoSettingsConfig.tab.effects"), new JPanel(new MigLayout("fill")) { addTab(trans.get("PhotoSettingsConfig.tab.effects"), new JPanel(new MigLayout("fill", "[]100[]5[]")) {
{ {
add(new StyledLabel(trans.get("PhotoSettingsConfig.lbl.smokeFlame"), Style.BOLD)); // Smoke & Flame
add(new JSeparator(SwingConstants.HORIZONTAL), "span, wrap, growx"); add(new StyledLabel(trans.get("PhotoSettingsConfig.lbl.smokeFlame"), Style.BOLD), "split, span, gapright para");
add(new JSeparator(SwingConstants.HORIZONTAL), "wrap, growx");
/// Smoke
add(new JLabel(trans.get("PhotoSettingsConfig.lbl.smoke"))); add(new JLabel(trans.get("PhotoSettingsConfig.lbl.smoke")));
BooleanModel smokeModel = new BooleanModel(p, "Smoke"); BooleanModel smokeModel = new BooleanModel(p, "Smoke");
add(new JCheckBox(smokeModel), "split 2, w 15"); add(new JCheckBox(smokeModel), "split 2, w 15");
add(smokeColorButton, "wrap"); add(smokeColorButton, "pushx, left, wrap");
smokeModel.addEnableComponent(smokeColorButton); smokeModel.addEnableComponent(smokeColorButton);
/// Smoke opacity
add(new JLabel(trans.get("PhotoSettingsConfig.lbl.smokeOpacity"))); add(new JLabel(trans.get("PhotoSettingsConfig.lbl.smokeOpacity")));
DoubleModel smokeOpacityModel = new DoubleModel(p, "SmokeOpacity", 100, UnitGroup.UNITS_NONE, 0, 100); DoubleModel smokeOpacityModel = new DoubleModel(p, "SmokeOpacity", 100, UnitGroup.UNITS_NONE, 0, 100);
EditableSpinner opacitySpinner = new EditableSpinner(smokeOpacityModel.getSpinnerModel()); EditableSpinner opacitySpinner = new EditableSpinner(smokeOpacityModel.getSpinnerModel());
add(opacitySpinner, "wrap"); add(opacitySpinner, "wrap");
smokeModel.addEnableComponent(opacitySpinner); smokeModel.addEnableComponent(opacitySpinner);
/// Flame
add(new JLabel(trans.get("PhotoSettingsConfig.lbl.flame"))); add(new JLabel(trans.get("PhotoSettingsConfig.lbl.flame")));
BooleanModel fireModel = new BooleanModel(p, "Flame"); BooleanModel fireModel = new BooleanModel(p, "Flame");
add(new JCheckBox(fireModel), "split 2, w 15"); add(new JCheckBox(fireModel), "split 2, w 15");
@ -329,6 +352,7 @@ public class PhotoSettingsConfig extends JTabbedPane {
add(flameColorButton, "wrap"); add(flameColorButton, "wrap");
fireModel.addEnableComponent(flameColorButton); fireModel.addEnableComponent(flameColorButton);
/// Flame aspect ratio
add(new JLabel(trans.get("PhotoSettingsConfig.lbl.flameAspect"))); add(new JLabel(trans.get("PhotoSettingsConfig.lbl.flameAspect")));
DoubleModel flameAspectModel = new DoubleModel(p, "FlameAspectRatio", 100, UnitGroup.UNITS_NONE, 25, DoubleModel flameAspectModel = new DoubleModel(p, "FlameAspectRatio", 100, UnitGroup.UNITS_NONE, 25,
250); 250);
@ -336,12 +360,14 @@ public class PhotoSettingsConfig extends JTabbedPane {
add(flameAspectSpinner, "wrap"); add(flameAspectSpinner, "wrap");
fireModel.addEnableComponent(flameAspectSpinner); fireModel.addEnableComponent(flameAspectSpinner);
/// Sparks
add(new JLabel(trans.get("PhotoSettingsConfig.lbl.sparks"))); add(new JLabel(trans.get("PhotoSettingsConfig.lbl.sparks")));
BooleanModel sparksModel = new BooleanModel(p, "Sparks"); BooleanModel sparksModel = new BooleanModel(p, "Sparks");
JCheckBox sparksCheck = new JCheckBox(sparksModel); JCheckBox sparksCheck = new JCheckBox(sparksModel);
add(sparksCheck, "wrap"); add(sparksCheck, "wrap");
fireModel.addEnableComponent(sparksCheck); fireModel.addEnableComponent(sparksCheck);
/// Sparks concentration
add(new JLabel(trans.get("PhotoSettingsConfig.lbl.sparkConcentration"))); add(new JLabel(trans.get("PhotoSettingsConfig.lbl.sparkConcentration")));
DoubleModel sparkConcentrationModel = new DoubleModel(p, "SparkConcentration", 100, DoubleModel sparkConcentrationModel = new DoubleModel(p, "SparkConcentration", 100,
UnitGroup.UNITS_NONE, 0, 100); UnitGroup.UNITS_NONE, 0, 100);
@ -349,19 +375,23 @@ public class PhotoSettingsConfig extends JTabbedPane {
add(sparkConcentrationSpinner, "wrap"); add(sparkConcentrationSpinner, "wrap");
sparksModel.addEnableComponent(sparkConcentrationSpinner); sparksModel.addEnableComponent(sparkConcentrationSpinner);
/// Spark weight
add(new JLabel(trans.get("PhotoSettingsConfig.lbl.sparkWeight"))); add(new JLabel(trans.get("PhotoSettingsConfig.lbl.sparkWeight")));
DoubleModel sparkWeightModel = new DoubleModel(p, "SparkWeight", 100, UnitGroup.UNITS_NONE, 0, 100); DoubleModel sparkWeightModel = new DoubleModel(p, "SparkWeight", 100, UnitGroup.UNITS_NONE, 0, 100);
EditableSpinner sparkWeightSpinner = new EditableSpinner(sparkWeightModel.getSpinnerModel()); EditableSpinner sparkWeightSpinner = new EditableSpinner(sparkWeightModel.getSpinnerModel());
add(sparkWeightSpinner, "wrap"); add(sparkWeightSpinner, "wrap");
sparksModel.addEnableComponent(sparkWeightSpinner); sparksModel.addEnableComponent(sparkWeightSpinner);
/// Exhaust scale
add(new JLabel(trans.get("PhotoSettingsConfig.lbl.exhaustScale"))); add(new JLabel(trans.get("PhotoSettingsConfig.lbl.exhaustScale")));
DoubleModel exhaustScaleModel = new DoubleModel(p, "ExhaustScale", 100, UnitGroup.UNITS_NONE, 0, 1000); DoubleModel exhaustScaleModel = new DoubleModel(p, "ExhaustScale", 100, UnitGroup.UNITS_NONE, 0, 1000);
add(new EditableSpinner(exhaustScaleModel.getSpinnerModel()), "wrap"); add(new EditableSpinner(exhaustScaleModel.getSpinnerModel()), "wrap");
add(new StyledLabel(trans.get("PhotoSettingsConfig.lbl.effects"), Style.BOLD)); // Effects
add(new JSeparator(SwingConstants.HORIZONTAL), "span, wrap, growx"); add(new StyledLabel(trans.get("PhotoSettingsConfig.lbl.effects"), Style.BOLD), "split, span, gapright para");
add(new JSeparator(SwingConstants.HORIZONTAL), "wrap, growx");
/// Speed
add(new JLabel(trans.get("PhotoSettingsConfig.lbl.speed"))); add(new JLabel(trans.get("PhotoSettingsConfig.lbl.speed")));
add(new JCheckBox(new BooleanModel(p, "MotionBlurred")), "wrap"); add(new JCheckBox(new BooleanModel(p, "MotionBlurred")), "wrap");
} }