impoved bom

This commit is contained in:
bancika
2011-01-12 23:59:34 +00:00
parent 2dc7a50e2f
commit 7afeb48407
2 changed files with 2 additions and 7 deletions
@@ -2,7 +2,6 @@ package org.diylc.components.boards;
import java.awt.AlphaComposite; import java.awt.AlphaComposite;
import java.awt.Color; import java.awt.Color;
import java.awt.Composite;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Point; import java.awt.Point;
@@ -15,7 +14,7 @@ import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit; import org.diylc.core.measures.SizeUnit;
import org.diylc.utils.Constants; import org.diylc.utils.Constants;
@ComponentDescriptor(name = "Perf Board w/ Pads", category = "Boards", author = "Branislav Stojkovic", zOrder = IDIYComponent.BOARD, instanceNamePrefix = "Board", description = "Perforated FR4 board with solder pads spaced 0.1 inch apart") @ComponentDescriptor(name = "Perf Board w/ Pads", category = "Boards", author = "Branislav Stojkovic", zOrder = IDIYComponent.BOARD, instanceNamePrefix = "Board", description = "Perforated board with solder pads")
public class PerfBoard extends AbstractBoard { public class PerfBoard extends AbstractBoard {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@@ -35,7 +34,6 @@ public class PerfBoard extends AbstractBoard {
super.draw(g2d, componentState, project); super.draw(g2d, componentState, project);
if (componentState != ComponentState.DRAGGING) { if (componentState != ComponentState.DRAGGING) {
Composite oldComposite = g2d.getComposite();
if (alpha < MAX_ALPHA) { if (alpha < MAX_ALPHA) {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha
/ MAX_ALPHA)); / MAX_ALPHA));
@@ -57,7 +55,6 @@ public class PerfBoard extends AbstractBoard {
holeDiameter); holeDiameter);
} }
} }
g2d.setComposite(oldComposite);
} }
} }
@@ -41,9 +41,7 @@ public class BOM extends AbstractComponent<Void> {
Iterator<BomEntry> iterator = bom.iterator(); Iterator<BomEntry> iterator = bom.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
BomEntry entry = iterator.next(); BomEntry entry = iterator.next();
Object value = entry.getValue(); if (entry.getValue() == null || entry.getName().toLowerCase().contains("bom")) {
if (value == null || value.toString().trim().isEmpty()
|| entry.getName().toLowerCase().contains("bom")) {
iterator.remove(); iterator.remove();
} }
} }