Now drawing most mass types.

core/resources/l10n/messages.properties

@@ -1335,6 +1335,7 @@ MassComponent.DeploymentCharge = Deployment charge
 MassComponent.Tracker = Tracker
 MassComponent.Payload = Payload
 MassComponent.RecoveryHardware = Recovery hardware
+MassComponent.Battery = Battery
 ! Parachute
 Parachute.Parachute = Parachute
 ! ShockCord

core/src/net/sf/openrocket/rocketcomponent/MassComponent.java

@@ -22,7 +22,8 @@ public class MassComponent extends MassObject {
 		DEPLOYMENTCHARGE(Application.getTranslator().get("MassComponent.DeploymentCharge")),
 		TRACKER(Application.getTranslator().get("MassComponent.Tracker")),
 		PAYLOAD(Application.getTranslator().get("MassComponent.Payload")),
-		RECOVERYHARDWARE(Application.getTranslator().get("MassComponent.RecoveryHardware"));
+		RECOVERYHARDWARE(Application.getTranslator().get("MassComponent.RecoveryHardware")),
+		BATTERY(Application.getTranslator().get("MassComponent.Battery"));
 		
 		private String title;
 		

swing/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java

@@ -44,7 +44,8 @@ public class MassComponentConfig extends RocketComponentConfig {
 								MassComponent.MassComponentType.DEPLOYMENTCHARGE,
 								MassComponent.MassComponentType.TRACKER,
 								MassComponent.MassComponentType.PAYLOAD,
-								MassComponent.MassComponentType.RECOVERYHARDWARE}));
+								MassComponent.MassComponentType.RECOVERYHARDWARE,
+								MassComponent.MassComponentType.BATTERY}));
 		
 		panel.add(typecombo, "spanx, growx, wrap");
 		

swing/src/net/sf/openrocket/gui/rocketfigure/MassObjectShapes.java

@@ -1,10 +1,15 @@
 package net.sf.openrocket.gui.rocketfigure;
 
 import java.awt.Shape;
+import java.awt.geom.Arc2D;
 import java.awt.geom.Ellipse2D;
+import java.awt.geom.Line2D;
+import java.awt.geom.Path2D;
+import java.awt.geom.Rectangle2D;
 import java.awt.geom.RoundRectangle2D;
 
 import net.sf.openrocket.util.Coordinate;
+import net.sf.openrocket.util.MathUtil;
 import net.sf.openrocket.util.Transformation;
 
 
@@ -13,6 +18,7 @@ public class MassObjectShapes extends RocketComponentShapes {
 	public static Shape[] getShapesSide(net.sf.openrocket.rocketcomponent.RocketComponent component, 
 			Transformation transformation) {
 		net.sf.openrocket.rocketcomponent.MassObject tube = (net.sf.openrocket.rocketcomponent.MassObject)component;
+		net.sf.openrocket.rocketcomponent.MassComponent.MassComponentType type = ((net.sf.openrocket.rocketcomponent.MassComponent)component).getMassComponentType();
 		
 		double length = tube.getLength();
 		double radius = tube.getRadius();
@@ -24,6 +30,30 @@ public class MassObjectShapes extends RocketComponentShapes {
 			s[i] = new RoundRectangle2D.Double(start[i].x*S,(start[i].y-radius)*S,
 					length*S,2*radius*S,arc*S,arc*S);
 		}
+
+		switch (type) {
+		case ALTIMETER:
+			s = addAltimeterSymbol(s);
+			break;
+		case FLIGHTCOMPUTER:
+			s = addFlightComputerSymbol(s);
+			break;
+		case DEPLOYMENTCHARGE:
+			s = addDeploymentChargeSymbol(s);
+			break;
+		case RECOVERYHARDWARE:
+			s = addRecoveryHardwareSymbol(s);
+			break;
+		case PAYLOAD:
+			s = addPayloadSymbol(s);
+			break;
+		case TRACKER:
+			s = addTrackerSymbol(s);
+			break;
+		case BATTERY:
+			s = addBatterySymbol(s);
+		}
+		
 		return s;
 	}
 	
@@ -43,5 +73,111 @@ public class MassObjectShapes extends RocketComponentShapes {
 		return s;
 	}
 	
+	private static Shape[] addAltimeterSymbol(Shape[] baseShape){
+		Shape[] newShape = new Shape[baseShape.length+1];
+		Rectangle2D bounds = baseShape[0].getBounds2D();
+		Double vMargin = bounds.getHeight()/8.0;
+		Double hMargin = bounds.getWidth()/2.25;
+		Double halfArrowWidth=MathUtil.min(hMargin, vMargin);
+		newShape[0]=baseShape[0];
+		
+		Path2D.Double symbol = new Path2D.Double();
+		symbol.moveTo(bounds.getCenterX(), bounds.getY()+vMargin);
+		symbol.lineTo(bounds.getCenterX(), bounds.getY()+7*vMargin);
+		symbol.lineTo(bounds.getCenterX()-halfArrowWidth, bounds.getY()+6*vMargin);
+		symbol.lineTo(bounds.getCenterX()+halfArrowWidth, bounds.getY()+6*vMargin);
+		symbol.lineTo(bounds.getCenterX(), bounds.getY()+7*vMargin);
+		
+		newShape[1]= symbol;
+		return newShape;
+	}
+
+	private static Shape[] addFlightComputerSymbol(Shape[] baseShape){
+		int pins=12;
+		Shape[] newShape = new Shape[baseShape.length+1+pins];
+		
+		Rectangle2D bounds = baseShape[0].getBounds2D();
+
+			
+		Double vMargin = bounds.getHeight()/8.0;
+		Double hMargin = bounds.getWidth()/6.0;
+		Double pinHeight=vMargin;
+		Double pinSpacing=(bounds.getWidth()-2*hMargin)/(pins+1);
+		Double pinWidth=pinSpacing/2;
+		newShape[0]=baseShape[0];
+		newShape[1]=new Rectangle2D.Double(bounds.getX()+hMargin, bounds.getY()+2*vMargin, 4*hMargin,4*vMargin);
+		for(int i=0; i<(pins/2); i++){
+			newShape[i+2]=new Rectangle2D.Double(bounds.getX()+hMargin+2*i*pinSpacing+pinSpacing, bounds.getY()+6*vMargin, pinWidth, pinHeight);
+			newShape[i+pins/2+2]=new Rectangle2D.Double(bounds.getX()+hMargin+2*i*pinSpacing+pinSpacing, bounds.getY()+vMargin, pinWidth, pinHeight);
+		}
+		//newShape[1]=symbol;
+		return newShape;
+	}
+	
+	private static Shape[] addTrackerSymbol(Shape[] baseShape){
+		Shape[] newShape = new Shape[baseShape.length+7];
+		
+		Rectangle2D bounds = baseShape[0].getBounds2D();
+		Double vMargin=bounds.getWidth()/10;
+		
+		Double xCenter=bounds.getCenterX();
+		Double yCenter=bounds.getCenterY();
+		newShape[0]=baseShape[0];
+		
+		Double arcExtent = 60.0;
+		Double arcStart1 = 360-arcExtent/2;
+		Double arcStart2 = 180-arcExtent/2;
+		
+		if(3*vMargin*Math.sin(Math.toRadians(arcExtent/2))>0.9*bounds.getHeight()/2){
+			vMargin=0.9*bounds.getHeight()/(6*Math.sin(Math.toRadians(arcExtent/2)));
+		}
+		newShape[1]= new Ellipse2D.Double(xCenter-vMargin/2, yCenter-vMargin/2,vMargin,vMargin);
+		for(int i=1; i<4; i++){
+			newShape[i+1]= new Arc2D.Double(xCenter-i*vMargin, yCenter-i*vMargin, 2*i*vMargin, 2*i*vMargin, arcStart1,arcExtent,Arc2D.OPEN);		
+			newShape[i+4]= new Arc2D.Double(xCenter-i*vMargin, yCenter-i*vMargin, 2*i*vMargin, 2*i*vMargin, arcStart2,arcExtent,Arc2D.OPEN);					
+		}
+		return newShape;
+	}
+	private static Shape[] addPayloadSymbol(Shape[] baseShape){
+		return baseShape;
+	}
+	private static Shape[] addRecoveryHardwareSymbol(Shape[] baseShape){
+		return baseShape;
+	}
+	private static Shape[] addDeploymentChargeSymbol(Shape[] baseShape){
+		return baseShape;
+	}
+
+	private static Shape[] addBatterySymbol(Shape[] baseShape){
+		Shape[] newShape = new Shape[baseShape.length+1];
+		Rectangle2D bounds = baseShape[0].getBounds2D();
+
+			
+		Double vMargin = bounds.getHeight()/8.0;
+		Double hMargin = bounds.getWidth()/3.0;
+		Double cellWidth=hMargin/3.0;
+		Double cellTop=bounds.getY()+7*vMargin;
+		Double cellBottom=bounds.getY()+vMargin;
+		
+		newShape[0]=baseShape[0];
+		
+		Path2D.Double symbol = new Path2D.Double();
+		symbol.moveTo(bounds.getX()+hMargin, bounds.getCenterY());
+		symbol.lineTo(bounds.getX()+2*hMargin/3, bounds.getCenterY());
+		for(Double x=bounds.getX()+hMargin; x<bounds.getX()+2*hMargin; x+=cellWidth){
+			symbol.moveTo(x,cellTop);
+			symbol.lineTo(x, cellBottom);
+			symbol.moveTo(x+cellWidth/2.0, cellBottom+vMargin);
+			symbol.lineTo(x+cellWidth/2.0, cellTop-vMargin);
+            
+       }
+		symbol.moveTo(bounds.getX()+bounds.getWidth()-2*hMargin/3-cellWidth/2, bounds.getCenterY());
+		symbol.lineTo(bounds.getX()+2*hMargin-cellWidth/2, bounds.getCenterY());
+
+		newShape[1]= symbol;
+		return newShape;
+
+	}
+
 	
 }