added SMD capacitor and resistor

diylc/diylc-library/src/org/diylc/components/boards/TerminalStrip.java

@@ -1,4 +1,4 @@
-package org.diylc.components.connectivity;
+package org.diylc.components.boards;
 
 import java.awt.AlphaComposite;
 import java.awt.Color;
@@ -27,7 +27,7 @@ import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 import org.diylc.utils.Constants;
 
-@ComponentDescriptor(name = "Terminal Strip", author = "Branislav Stojkovic", category = "Connectivity",
+@ComponentDescriptor(name = "Terminal Strip", author = "Branislav Stojkovic", category = "Boards",
     instanceNamePrefix = "TS", description = "Row of terminals for point-to-point construction", stretchable = false,
     zOrder = IDIYComponent.BOARD, keywordPolicy = KeywordPolicy.SHOW_TYPE_NAME)
 public class TerminalStrip extends AbstractTransparentComponent<String> {

diylc/diylc-library/src/org/diylc/components/smd/PassiveSMDComponent.java

@@ -0,0 +1,389 @@
+package org.diylc.components.smd;
+
+
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Composite;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.geom.Area;
+import java.awt.geom.Rectangle2D;
+import java.awt.geom.RoundRectangle2D;
+
+import org.diylc.appframework.miscutils.ConfigurationManager;
+import org.diylc.common.IPlugInPort;
+import org.diylc.common.ObjectCache;
+import org.diylc.common.Orientation;
+import org.diylc.components.AbstractTransparentComponent;
+import org.diylc.core.ComponentState;
+import org.diylc.core.IDrawingObserver;
+import org.diylc.core.Project;
+import org.diylc.core.Theme;
+import org.diylc.core.VisibilityPolicy;
+import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.measures.Size;
+import org.diylc.core.measures.SizeUnit;
+import org.diylc.utils.Constants;
+
+public abstract class PassiveSMDComponent<T> extends AbstractTransparentComponent<T> {
+
+  private static final long serialVersionUID = 1L;
+ 
+  public static Color PIN_COLOR = Color.decode("#00B2EE");
+  public static Color PIN_BORDER_COLOR = PIN_COLOR.darker();
+  // public static Color LABEL_COLOR = Color.white;
+  public static int EDGE_RADIUS = 4;
+  public static Size PIN_SIZE = new Size(0.8d, SizeUnit.mm);
+
+  protected T value;
+  private Orientation orientation = Orientation.DEFAULT;
+
+  private SMDSize size = SMDSize._1206;
+  private Point[] controlPoints = new Point[] {new Point(0, 0), new Point(0, 0)};
+  // protected Display display = Display.NAME;
+  protected Color bodyColor;
+  protected Color borderColor;
+  // private Color labelColor = LABEL_COLOR;
+  transient private Area[] body;
+
+  public PassiveSMDComponent() {
+    super();
+    updateControlPoints();
+  }
+
+  @EditableProperty
+  public Orientation getOrientation() {
+    return orientation;
+  }
+
+  public void setOrientation(Orientation orientation) {
+    this.orientation = orientation;
+    updateControlPoints();
+    // Reset body shape.
+    body = null;
+  }
+
+  // @EditableProperty
+  // public Display getDisplay() {
+  // if (display == null) {
+  // display = Display.VALUE;
+  // }
+  // return display;
+  // }
+  //
+  // public void setDisplay(Display display) {
+  // this.display = display;
+  // }
+
+  @EditableProperty
+  public SMDSize getSize() {
+    return size;
+  }
+
+  public void setSize(SMDSize size) {
+    this.size = size;
+    updateControlPoints();
+    // Reset body shape.
+    body = null;
+  }
+
+  @Override
+  public int getControlPointCount() {
+    return controlPoints.length;
+  }
+
+  @Override
+  public Point getControlPoint(int index) {
+    return controlPoints[index];
+  }
+
+  @Override
+  public boolean isControlPointSticky(int index) {
+    return true;
+  }
+
+  @Override
+  public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
+    return VisibilityPolicy.NEVER;
+  }
+
+  @Override
+  public void setControlPoint(Point point, int index) {
+    controlPoints[index].setLocation(point);
+    body = null;
+  }
+
+  private void updateControlPoints() {
+    Point firstPoint = controlPoints[0];
+    controlPoints[0] = firstPoint;
+    int pinSize = (int) PIN_SIZE.convertToPixels();
+    int smdLength = (int) getSize().getLength().convertToPixels();
+    int pinSpacing = smdLength - pinSize;
+
+    // Update control points.
+    int dx1;
+    int dy1;
+    switch (orientation) {
+      case DEFAULT:
+        dx1 = 0;
+        dy1 = pinSpacing;
+        break;
+      case _90:
+        dx1 = -pinSpacing;
+        dy1 = 0;
+        break;
+      case _180:
+        dx1 = 0;
+        dy1 = -pinSpacing;
+        break;
+      case _270:
+        dx1 = pinSpacing;
+        dy1 = 0;
+        break;
+      default:
+        throw new RuntimeException("Unexpected orientation: " + orientation);
+    }
+    controlPoints[1] = new Point(firstPoint.x + dx1, firstPoint.y + dy1);
+  }
+
+  public Area[] getBody() {
+    if (body == null) {
+      body = new Area[2];
+      int x = controlPoints[0].x;
+      int y = controlPoints[0].y;
+      int smdWidth = (int) getSize().getWidth().convertToPixels();
+      int smdLength = (int) getSize().getLength().convertToPixels();
+      int pinSize = (int) PIN_SIZE.convertToPixels();
+      int width;
+      int height;
+
+      // create main body
+      switch (orientation) {
+        case DEFAULT:
+          width = smdWidth;
+          height = smdLength;
+          x -= smdWidth / 2;
+          y -= pinSize / 2;
+          break;
+        case _90:
+          width = smdLength;
+          height = smdWidth;
+          x -= width - pinSize / 2;
+          y -= smdWidth / 2;
+          break;
+        case _180:
+          width = smdWidth;
+          height = smdLength;
+          x -= smdWidth / 2;
+          y -= height - pinSize / 2;
+          break;
+        case _270:
+          width = smdLength;
+          height = smdWidth;
+          x -= pinSize / 2;
+          y -= smdWidth / 2;
+          break;
+        default:
+          throw new RuntimeException("Unexpected orientation: " + orientation);
+      }
+      Area mainArea = new Area(new RoundRectangle2D.Double(x, y, width, height, EDGE_RADIUS, EDGE_RADIUS));
+
+      // create contact area
+      Area contactArea = new Area();
+      if (width > height) {
+        contactArea.add(new Area(new Rectangle2D.Double(x, y, pinSize, height)));
+        contactArea.add(new Area(new Rectangle2D.Double(x + width - pinSize, y, pinSize, height)));
+      } else {
+        contactArea.add(new Area(new Rectangle2D.Double(x, y, width, pinSize)));
+        contactArea.add(new Area(new Rectangle2D.Double(x, y + height - pinSize, width, pinSize)));
+      }
+      contactArea.intersect(mainArea);
+      
+      mainArea.subtract(contactArea);
+      body[0] = mainArea;
+      body[1] = contactArea;
+
+    }
+    return body;
+  }
+
+  @Override
+  public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project,
+      IDrawingObserver drawingObserver) {
+    if (checkPointsClipped(g2d.getClip())) {
+      return;
+    }
+
+    // draw main area
+    Area mainArea = getBody()[0];
+    Composite oldComposite = g2d.getComposite();
+    if (alpha < MAX_ALPHA) {
+      g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
+    }
+    g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : getBodyColor());
+    g2d.fill(mainArea);
+    g2d.setComposite(oldComposite);
+
+    Color finalBorderColor;
+    if (outlineMode) {
+      Theme theme =
+          (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
+      finalBorderColor =
+          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
+              : theme.getOutlineColor();
+    } else {
+      finalBorderColor =
+          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
+              : getBorderColor();
+    }
+    g2d.setColor(finalBorderColor);
+    g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
+    g2d.draw(mainArea);
+
+
+    // draw contact area
+    Area contactArea = getBody()[1];
+    if (!outlineMode) {
+      g2d.setColor(PIN_COLOR);
+      if (alpha < MAX_ALPHA) {
+        g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
+      }      
+      g2d.fill(contactArea);
+      g2d.setComposite(oldComposite);
+    }
+
+    if (outlineMode) {
+      Theme theme =
+          (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
+      finalBorderColor =
+          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
+              : theme.getOutlineColor();
+    } else {
+      finalBorderColor =
+          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
+              : PIN_BORDER_COLOR;
+    }
+    g2d.setColor(finalBorderColor);
+    g2d.draw(contactArea);
+
+    // // Draw label.
+    // g2d.setFont(LABEL_FONT);
+    // Color finalLabelColor;
+    // if (outlineMode) {
+    // Theme theme =
+    // (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY,
+    // Constants.DEFAULT_THEME);
+    // finalLabelColor =
+    // componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ?
+    // LABEL_COLOR_SELECTED
+    // : theme.getOutlineColor();
+    // } else {
+    // finalLabelColor =
+    // componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ?
+    // LABEL_COLOR_SELECTED
+    // : getLabelColor();
+    // }
+    // g2d.setColor(finalLabelColor);
+    // FontMetrics fontMetrics = g2d.getFontMetrics(g2d.getFont());
+    // String label = "";
+    // label = (getDisplay() == Display.NAME) ? getName() : getValue();
+    // if (getDisplay() == Display.NONE) {
+    // label = "";
+    // }
+    // if (getDisplay() == Display.BOTH) {
+    // label = getName() + "  " + (getValue() == null ? "" : getValue().toString());
+    // }
+    // Rectangle2D rect = fontMetrics.getStringBounds(label, g2d);
+    // int textHeight = (int) (rect.getHeight());
+    // int textWidth = (int) (rect.getWidth());
+    // // Center text horizontally and vertically
+    // Rectangle bounds = mainArea.getBounds();
+    // int x = bounds.x + (bounds.width - textWidth) / 2;
+    // int y = bounds.y + (bounds.height - textHeight) / 2 + fontMetrics.getAscent();
+    // g2d.drawString(label, x, y);
+  }
+
+  @Override
+  public void drawIcon(Graphics2D g2d, int width, int height) {
+    int radius = 4 * width / 32;
+    int contactSize = 4 * width / 32;
+    int thickness = getClosestOdd(width / 2);
+    g2d.rotate(Math.PI / 4, width / 2, height / 2);
+    RoundRectangle2D rect =
+        new RoundRectangle2D.Double((width - thickness) / 2, 4 * width / 32, thickness, height - 8 * width / 32,
+            radius, radius);
+    g2d.setColor(getBodyColor());
+    g2d.fill(rect);
+    g2d.setColor(getBorderColor());
+    g2d.draw(rect);
+    Area contactArea = new Area();
+    contactArea.add(new Area(new Rectangle2D.Double((width - thickness) / 2, 4 * width / 32, thickness, contactSize)));
+    contactArea.add(new Area(new Rectangle2D.Double((width - thickness) / 2, height - 8 * width / 32, thickness,
+        contactSize)));
+    contactArea.intersect(new Area(rect));
+    g2d.setColor(PIN_COLOR);
+    g2d.fill(contactArea);    
+  }
+
+  @EditableProperty(name = "Body")
+  public Color getBodyColor() {
+    return bodyColor;
+  }
+
+  public void setBodyColor(Color bodyColor) {
+    this.bodyColor = bodyColor;
+  }
+
+  @EditableProperty(name = "Border")
+  public Color getBorderColor() {
+    return borderColor;
+  }
+
+  public void setBorderColor(Color borderColor) {
+    this.borderColor = borderColor;
+  }
+
+  // @EditableProperty(name = "Label")
+  // public Color getLabelColor() {
+  // if (labelColor == null) {
+  // labelColor = LABEL_COLOR;
+  // }
+  // return labelColor;
+  // }
+  //
+  // public void setLabelColor(Color labelColor) {
+  // this.labelColor = labelColor;
+  // }
+
+  public static enum SMDSize {
+
+    _0805(new Size(1.25d, SizeUnit.mm), new Size(2.0d, SizeUnit.mm)), _1206(new Size(1.6d, SizeUnit.mm), new Size(3.2d,
+        SizeUnit.mm)), _1210(new Size(2.5d, SizeUnit.mm), new Size(3.2d, SizeUnit.mm)), _1806(new Size(1.6d,
+        SizeUnit.mm), new Size(4.5d, SizeUnit.mm)), _1812(new Size(3.2d, SizeUnit.mm), new Size(4.5d, SizeUnit.mm));
+
+    private Size width;
+    private Size length;
+
+    private SMDSize(Size width, Size length) {
+      this.width = width;
+      this.length = length;
+    }
+
+    public Size getWidth() {
+      return width;
+    }
+
+    public Size getLength() {
+      return length;
+    }
+
+    @Override
+    public String toString() {
+      return name().replace("_", "");
+    }
+
+    public int getValue() {
+      return Integer.parseInt(toString());
+    }
+  }
+}

diylc/diylc-library/src/org/diylc/components/smd/SMDCapacitor.java

@@ -0,0 +1,35 @@
+package org.diylc.components.smd;
+
+import java.awt.Color;
+
+import org.diylc.core.IDIYComponent;
+import org.diylc.core.annotations.ComponentDescriptor;
+import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.KeywordPolicy;
+import org.diylc.core.annotations.PositiveMeasureValidator;
+import org.diylc.core.measures.Capacitance;
+
+@ComponentDescriptor(name = "SMD Capacitor", author = "Branislav Stojkovic", category = "SMD",
+    instanceNamePrefix = "C", description = "Surface mount capacitor", stretchable = false,
+    zOrder = IDIYComponent.COMPONENT, keywordPolicy = KeywordPolicy.SHOW_VALUE)
+public class SMDCapacitor extends PassiveSMDComponent<Capacitance> {
+
+  public static Color BODY_COLOR = Color.decode("#BD9347");
+  public static Color BORDER_COLOR = BODY_COLOR.darker();
+
+  private static final long serialVersionUID = 1L;
+
+  public SMDCapacitor() {
+    this.bodyColor = BODY_COLOR;
+    this.borderColor = BORDER_COLOR;
+  }
+
+  @EditableProperty(validatorClass = PositiveMeasureValidator.class)
+  public Capacitance getValue() {
+    return value;
+  }
+
+  public void setValue(Capacitance value) {
+    this.value = value;
+  }
+}

diylc/diylc-library/src/org/diylc/components/smd/SMDResistor.java

@@ -0,0 +1,35 @@
+package org.diylc.components.smd;
+
+import java.awt.Color;
+
+import org.diylc.core.IDIYComponent;
+import org.diylc.core.annotations.ComponentDescriptor;
+import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.KeywordPolicy;
+import org.diylc.core.annotations.PositiveMeasureValidator;
+import org.diylc.core.measures.Resistance;
+
+@ComponentDescriptor(name = "SMD Resistor", author = "Branislav Stojkovic", category = "SMD", instanceNamePrefix = "C",
+    description = "Surface mount resistor", stretchable = false, zOrder = IDIYComponent.COMPONENT,
+    keywordPolicy = KeywordPolicy.SHOW_VALUE)
+public class SMDResistor extends PassiveSMDComponent<Resistance> {
+
+  public static Color BODY_COLOR = Color.gray;
+  public static Color BORDER_COLOR = Color.gray.darker();
+
+  private static final long serialVersionUID = 1L;
+
+  public SMDResistor() {
+    this.bodyColor = BODY_COLOR;
+    this.borderColor = BORDER_COLOR;
+  }
+
+  @EditableProperty(validatorClass = PositiveMeasureValidator.class)
+  public Resistance getValue() {
+    return value;
+  }
+
+  public void setValue(Resistance value) {
+    this.value = value;
+  }
+}

diylc/diylc-swing/update.xml

@@ -1409,6 +1409,10 @@
 				<org.diylc.appframework.update.Change>
 					<changeType>NEW_FEATURE</changeType>
 					<description>Terminal strip component added</description>
+				</org.diylc.appframework.update.Change>	
+				<org.diylc.appframework.update.Change>
+					<changeType>NEW_FEATURE</changeType>
+					<description>SMD capacitor and resistor added</description>
 				</org.diylc.appframework.update.Change>				
 				<org.diylc.appframework.update.Change>
 					<changeType>NEW_FEATURE</changeType>