Rough & Ugly appearance editor.

core/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java

@@ -0,0 +1,215 @@
+package net.sf.openrocket.gui.configdialog;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.lang.reflect.Method;
+import java.util.EventListener;
+import java.util.EventObject;
+
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JColorChooser;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.JSpinner;
+import javax.swing.SwingConstants;
+
+import net.miginfocom.swing.MigLayout;
+import net.sf.openrocket.appearance.Appearance;
+import net.sf.openrocket.appearance.AppearanceBuilder;
+import net.sf.openrocket.appearance.Decal.EdgeMode;
+import net.sf.openrocket.gui.SpinnerEditor;
+import net.sf.openrocket.gui.adaptors.BooleanModel;
+import net.sf.openrocket.gui.adaptors.DoubleModel;
+import net.sf.openrocket.gui.adaptors.EnumModel;
+import net.sf.openrocket.gui.adaptors.IntegerModel;
+import net.sf.openrocket.gui.components.BasicSlider;
+import net.sf.openrocket.gui.components.ColorIcon;
+import net.sf.openrocket.gui.components.StyledLabel;
+import net.sf.openrocket.gui.components.UnitSelector;
+import net.sf.openrocket.gui.components.StyledLabel.Style;
+import net.sf.openrocket.gui.util.ColorConversion;
+import net.sf.openrocket.l10n.Translator;
+import net.sf.openrocket.rocketcomponent.RocketComponent;
+import net.sf.openrocket.startup.Application;
+import net.sf.openrocket.unit.UnitGroup;
+import java.awt.Color;
+import net.sf.openrocket.util.LineStyle;
+import net.sf.openrocket.util.StateChangeListener;
+
+public class AppearancePanel extends JPanel {
+	private static final Translator trans = Application.getTranslator();
+
+	private AppearanceBuilder ab;
+
+	private class ColorActionListener implements ActionListener {
+		private final String valueName;
+		private final Object o;
+
+		ColorActionListener(final Object o, final String valueName) {
+			this.valueName = valueName;
+			this.o = o;
+		}
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			try {
+				Method getMethod = o.getClass().getMethod("get" + valueName);
+				Method setMethod = o.getClass().getMethod("set" + valueName, net.sf.openrocket.util.Color.class);
+				net.sf.openrocket.util.Color c = (net.sf.openrocket.util.Color) getMethod.invoke(o);
+				Color awtColor = ColorConversion.toAwtColor(c);
+				awtColor = JColorChooser.showDialog( //
+						AppearancePanel.this, //
+						trans.get("RocketCompCfg.lbl.Choosecolor"), //
+						awtColor);
+				if (awtColor == null)
+					return;
+				setMethod.invoke(o, ColorConversion.fromAwtColor(awtColor));
+			} catch (Throwable e1) {
+				// TODO Auto-generated catch block
+				e1.printStackTrace();
+			}
+
+		}
+
+	}
+
+	public AppearancePanel(final RocketComponent c) {
+		super(new MigLayout("fill", "[150][grow][150][grow]"));
+
+		ab = new AppearanceBuilder(c.getAppearance());
+
+		net.sf.openrocket.util.Color figureColor = c.getColor();
+		if (figureColor == null) {
+			figureColor = Application.getPreferences().getDefaultColor(c.getClass());
+		}
+		final JButton figureColorButton = new JButton(new ColorIcon(figureColor));
+		final JButton diffuseColorButton = new JButton(new ColorIcon(ab.getDiffuse()));
+		final JButton ambientColorButton = new JButton(new ColorIcon(ab.getAmbient()));
+		final JButton specularColorButton = new JButton(new ColorIcon(ab.getSpecular()));
+
+		ab.addChangeListener(new StateChangeListener() {
+			@Override
+			public void stateChanged(EventObject e) {
+				figureColorButton.setIcon(new ColorIcon(c.getColor()));
+				diffuseColorButton.setIcon(new ColorIcon(ab.getDiffuse()));
+				ambientColorButton.setIcon(new ColorIcon(ab.getAmbient()));
+				specularColorButton.setIcon(new ColorIcon(ab.getSpecular()));
+				c.setAppearance(ab.getAppearance());
+			}
+		});
+
+		c.addChangeListener(new StateChangeListener() {
+			@Override
+			public void stateChanged(EventObject e) {
+				figureColorButton.setIcon(new ColorIcon(c.getColor()));
+			}
+		});
+
+		figureColorButton.addActionListener(new ColorActionListener(c, "Color"));
+		diffuseColorButton.addActionListener(new ColorActionListener(ab, "Diffuse"));
+		ambientColorButton.addActionListener(new ColorActionListener(ab, "Ambient"));
+		specularColorButton.addActionListener(new ColorActionListener(ab, "Specular"));
+
+		add(new StyledLabel("Figure Style", Style.BOLD));
+		add(new JCheckBox(), "split 2");
+		add(new JLabel("Use default"));
+		add(new JButton("Set Default"), "span 2, align right, wrap");
+
+		add(new JLabel("Figure Color:"));
+		add(figureColorButton);
+
+		add(new JLabel("Line Style:"));
+		add(new JLabel("[Default Style [v]]"), "wrap");
+
+		add(new JSeparator(SwingConstants.HORIZONTAL), "span, wrap, growx");
+
+		BooleanModel mDefault = new BooleanModel(false);
+
+		add(new StyledLabel("Appearance", Style.BOLD));
+		add(new JCheckBox(mDefault), "split 2");
+		add(new JLabel("Use default"));
+		JButton setMDefault = new JButton("Set Default");
+		mDefault.addEnableComponent(setMDefault, false);
+		add(setMDefault, "span 2, align right, wrap");
+
+		add(new JLabel("Texture:"));
+		add(new JLabel("[Filename]"));
+
+		add(new JLabel("Scale:"));
+
+		add(new JLabel("x:"), "split 4");
+		JSpinner scaleU = new JSpinner(new DoubleModel(ab, "ScaleU").getSpinnerModel());
+		scaleU.setEditor(new SpinnerEditor(scaleU));
+		mDefault.addEnableComponent(scaleU, false);
+		add(scaleU, "w 40");
+
+		add(new JLabel("y:"));
+		JSpinner scaleV = new JSpinner(new DoubleModel(ab, "ScaleV").getSpinnerModel());
+		scaleV.setEditor(new SpinnerEditor(scaleV));
+		mDefault.addEnableComponent(scaleV, false);
+		add(scaleV, "wrap, w 40");
+
+		add(new JLabel("Diffuse Color:"));
+		add(diffuseColorButton);
+
+		add(new JLabel("Offset:"));
+
+		add(new JLabel("x:"), "split 4");
+		JSpinner offsetU = new JSpinner(new DoubleModel(ab, "OffsetU").getSpinnerModel());
+		offsetU.setEditor(new SpinnerEditor(offsetU));
+		mDefault.addEnableComponent(offsetU, false);
+		add(offsetU, "w 40");
+
+		add(new JLabel("y:"));
+		JSpinner offsetV = new JSpinner(new DoubleModel(ab, "OffsetV").getSpinnerModel());
+		offsetV.setEditor(new SpinnerEditor(offsetV));
+		mDefault.addEnableComponent(offsetV, false);
+		add(offsetV, "wrap, w 40");
+
+		add(new JLabel("Ambient Color:"));
+		add(ambientColorButton);
+
+		add(new JLabel("Center:"));
+
+		add(new JLabel("x:"), "split 4");
+		JSpinner centerU = new JSpinner(new DoubleModel(ab, "CenterU").getSpinnerModel());
+		centerU.setEditor(new SpinnerEditor(centerU));
+		mDefault.addEnableComponent(centerU, false);
+		add(centerU, "w 40");
+
+		add(new JLabel("y:"));
+		JSpinner centerV = new JSpinner(new DoubleModel(ab, "CenterV").getSpinnerModel());
+		centerV.setEditor(new SpinnerEditor(centerV));
+		mDefault.addEnableComponent(centerV, false);
+		add(centerV, "wrap, w 40");
+
+		add(new JLabel("Specular Color:"));
+		add(specularColorButton);
+
+		add(new JLabel("Rotation:"));
+		DoubleModel rotationModel = new DoubleModel(ab, "Rotation", UnitGroup.UNITS_ANGLE);
+		JSpinner rotation = new JSpinner(rotationModel.getSpinnerModel());
+		rotation.setEditor(new SpinnerEditor(rotation));
+		mDefault.addEnableComponent(rotation, false);
+		add(rotation, "split 2, w 50");
+		add(new UnitSelector(rotationModel), "wrap");
+
+		add(new JLabel("Shine:"));
+		IntegerModel shineModel = new IntegerModel(ab, "Shininess", 0, 128);
+		JSpinner shine = new JSpinner(shineModel.getSpinnerModel());
+		mDefault.addEnableComponent(shine, false);
+		add(shine, "w 40");
+
+		add(new JLabel("Repeat:"));
+		EdgeMode[] list = new EdgeMode[EdgeMode.values().length + 1];
+		System.arraycopy(EdgeMode.values(), 0, list, 1, EdgeMode.values().length);
+		JComboBox combo = new JComboBox(new EnumModel<EdgeMode>(ab, "EdgeMode", list));
+		mDefault.addEnableComponent(combo, false);
+		add(combo);
+
+	}
+
+}

core/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java

@@ -113,9 +113,17 @@ public class RocketComponentConfig extends JPanel {
 		tabbedPane.addTab(trans.get("RocketCompCfg.tab.Override"), null, overrideTab(),
 				trans.get("RocketCompCfg.tab.MassandCGoverride"));
 		if (component.isMassive())
+		
 		//// Figure and Figure style options
 		tabbedPane.addTab(trans.get("RocketCompCfg.tab.Figure"), null, figureTab(),
 				trans.get("RocketCompCfg.tab.Figstyleopt"));
+		
+		//// Appearance options
+		JPanel app;
+		tabbedPane.addTab("Appearance", null, app = new AppearancePanel(component),
+				"Appearance Tool Tip");
+		tabbedPane.setSelectedComponent(app); //TODO Remove this
+		
 		//// Comment and Specify a comment for the component
 		tabbedPane.addTab(trans.get("RocketCompCfg.tab.Comment"), null, commentTab(),
 				trans.get("RocketCompCfg.tab.Specifyacomment"));