diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index 730ea64a..7a880bb1 100644 Binary files a/diylc/diylc-library/lib/diylc-core.jar and b/diylc/diylc-library/lib/diylc-core.jar differ diff --git a/diylc/diylc-library/src/org/diylc/components/passive/AudioTransformer.java b/diylc/diylc-library/src/org/diylc/components/passive/AudioTransformer.java new file mode 100644 index 00000000..c0cf2e5c --- /dev/null +++ b/diylc/diylc-library/src/org/diylc/components/passive/AudioTransformer.java @@ -0,0 +1,522 @@ +/* + + DIY Layout Creator (DIYLC). + Copyright (c) 2009-2018 held jointly by the individual authors. + + This file is part of DIYLC. + + DIYLC is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + DIYLC is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with DIYLC. If not, see . + +*/ +package org.diylc.components.passive; + +import java.awt.AlphaComposite; +import java.awt.Color; +import java.awt.Composite; +import java.awt.FontMetrics; +import java.awt.Graphics2D; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.geom.AffineTransform; +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.Display; +import org.diylc.common.HorizontalAlignment; +import org.diylc.common.IPlugInPort; +import org.diylc.common.ObjectCache; +import org.diylc.common.Orientation; +import org.diylc.common.VerticalAlignment; +import org.diylc.components.AbstractTransparentComponent; +import org.diylc.components.transform.DIL_ICTransformer; +import org.diylc.core.ComponentState; +import org.diylc.core.IDIYComponent; +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.ComponentDescriptor; +import org.diylc.core.annotations.EditableProperty; +import org.diylc.core.annotations.KeywordPolicy; +import org.diylc.core.annotations.PositiveMeasureValidator; +import org.diylc.core.measures.Size; +import org.diylc.core.measures.SizeUnit; +import org.diylc.utils.Constants; + +@ComponentDescriptor(name = "Audio Transformer", author = "Branislav Stojkovic", category = "Passive", + instanceNamePrefix = "TR", description = "Small signal audio transformer with EI core", stretchable = false, + zOrder = IDIYComponent.COMPONENT, keywordPolicy = KeywordPolicy.SHOW_VALUE, transformer = DIL_ICTransformer.class) +public class AudioTransformer extends AbstractTransparentComponent { + + private static final long serialVersionUID = 1L; + + public static Color CORE_COLOR = METAL_COLOR; + public static Color CORE_BORDER_COLOR = CORE_COLOR.darker(); + public static Color COIL_COLOR = Color.decode("#DDDDDD"); + public static Color COIL_BORDER_COLOR = COIL_COLOR.darker(); + 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 = 6; + public static Size PIN_SIZE = new Size(0.03d, SizeUnit.in); + + private String value = ""; + private Orientation orientation = Orientation.DEFAULT; + private Size leadSpacing = new Size(0.1d, SizeUnit.in); + private Size windingSpacing = new Size(0.5d, SizeUnit.in); + private Size coreThickness = new Size(0.15d, SizeUnit.in); + private Size coreWidth = new Size(0.6, SizeUnit.in); + private Size coilWidth = new Size(0.5, SizeUnit.in); + private Size coilLength = new Size(0.6, SizeUnit.in); + private Point[] controlPoints = new Point[] {new Point(0, 0)}; + protected Display display = Display.BOTH; + private Color coreColor = CORE_COLOR; + private Color coreBorderColor = CORE_BORDER_COLOR; + private Color coilColor = COIL_COLOR; + private Color coilBorderColor = COIL_BORDER_COLOR; + private Color labelColor = LABEL_COLOR; + private boolean primaryCT = true; + private boolean secondaryCT = true; + + transient private Area[] body; + + public AudioTransformer() { + super(); + updateControlPoints(); + alpha = 100; + } + + @EditableProperty + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + @EditableProperty + public Orientation getOrientation() { + return orientation; + } + + public void setOrientation(Orientation orientation) { + this.orientation = orientation; + updateControlPoints(); + // Reset body shape. + body = null; + } + + @EditableProperty(name = "Lead Spacing", validatorClass = PositiveMeasureValidator.class) + public Size getLeadSpacing() { + return leadSpacing; + } + + public void setLeadSpacing(Size leadSpacing) { + this.leadSpacing = leadSpacing; + updateControlPoints(); + // Reset body shape; + body = null; + } + + @EditableProperty(name = "Winding Spacing", validatorClass = PositiveMeasureValidator.class) + public Size getWindingSpacing() { + return windingSpacing; + } + + public void setWindingSpacing(Size rowSpacing) { + this.windingSpacing = rowSpacing; + 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; + } + + @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]; + int pinCount = 4 + (primaryCT ? 1 : 0) + (secondaryCT ? 1 : 0); + controlPoints = new Point[pinCount]; + controlPoints[0] = firstPoint; + double leadSpacing = this.leadSpacing.convertToPixels(); + double windingSpacing = this.windingSpacing.convertToPixels(); + + // Update control points. + for (int i = 1; i < 2 + (primaryCT ? 1 : 0); i++) + controlPoints[i] = new Point(firstPoint.x, (int) (firstPoint.y + i * leadSpacing * (primaryCT ? 1 : 2))); + for (int i = 0; i < 2 + (secondaryCT ? 1 : 0); i++) + controlPoints[2 + (primaryCT ? 1 : 0) + i] = new Point((int) (firstPoint.x + windingSpacing), (int) (firstPoint.y + i * leadSpacing * (secondaryCT ? 1 : 2))); + + AffineTransform tx = getTx(); + + if (tx != null) { + for (int i = 1; i < controlPoints.length; i++) { + tx.transform(controlPoints[i], controlPoints[i]); + } + } + } + + public Area[] getBody() { + if (body == null) { + body = new Area[2]; + double leadSpacing = this.leadSpacing.convertToPixels(); + double windingSpacing = this.windingSpacing.convertToPixels(); + int centerX = (int) (controlPoints[0].x + windingSpacing / 2); + int centerY = (int) (controlPoints[0].y + leadSpacing); + int coreWidth = getClosestOdd(this.coreWidth.convertToPixels()); + int coreThickness = getClosestOdd(this.coreThickness.convertToPixels()); + int coilWidth = getClosestOdd(this.coilWidth.convertToPixels()); + int coilLength = getClosestOdd(this.coilLength.convertToPixels()); + + body[0] = new Area(new Rectangle2D.Double(centerX - coreThickness / 2, centerY - coreWidth / 2, coreThickness, coreWidth)); + body[1] = new Area(new RoundRectangle2D.Double(centerX - coilLength / 2, centerY - coilWidth / 2, coilLength, coilWidth, coilWidth / 3, coilWidth / 3)); + body[1].subtract(body[0]); + + AffineTransform tx = getTx(); + if (tx != null) + for (Area b : body) { + if (b != null) + b.transform(tx); + } + } + return body; + } + + @SuppressWarnings("incomplete-switch") + private AffineTransform getTx() { + double x = controlPoints[0].x; + double y = controlPoints[0].y; + if (orientation == Orientation.DEFAULT) + return null; + + double theta = 0; + switch (orientation) { + case _90: + theta = Math.PI / 2; + break; + case _180: + theta = Math.PI; + break; + case _270: + theta = Math.PI * 3 / 2; + break; + } + AffineTransform rotation = AffineTransform.getRotateInstance(theta, x, y); + + return rotation; + } + + @Override + public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project, + IDrawingObserver drawingObserver) { + if (checkPointsClipped(g2d.getClip())) { + return; + } + Area[] body = getBody(); + Area coreArea = body[0]; + Area coilArea = body[1]; + + if (!outlineMode) { + int pinSize = (int) PIN_SIZE.convertToPixels() / 2 * 2; + for (Point point : controlPoints) { + g2d.setColor(PIN_COLOR); + g2d.fillOval(point.x - pinSize / 2, point.y - pinSize / 2, pinSize, pinSize); + g2d.setColor(PIN_BORDER_COLOR); + g2d.drawOval(point.x - pinSize / 2, point.y - pinSize / 2, pinSize, pinSize); + } + } + Composite oldComposite = g2d.getComposite(); + if (alpha < MAX_ALPHA) { + g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA)); + } + + // render coil + g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : getCoilColor()); + g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1)); + g2d.fill(coilArea); + 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 + : getCoilBorderColor(); + } + g2d.setColor(finalBorderColor); + g2d.draw(coilArea); + + // render core + g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : getCoreColor()); + g2d.fill(coreArea); + g2d.setComposite(oldComposite); + + if (!outlineMode) { + finalBorderColor = + componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR + : getCoreBorderColor(); + } + g2d.setColor(finalBorderColor); + g2d.draw(coreArea); + + drawingObserver.stopTracking(); + + g2d.setFont(project.getFont()); + + // Draw winding designations + Point wPoint = new Point((int) (controlPoints[0].x + project.getFontSize()), (int) (controlPoints[0].y + leadSpacing.convertToPixels())); + AffineTransform tx = getTx(); + if (tx != null) + tx.transform(wPoint, wPoint); + drawCenteredText(g2d, "P", wPoint.x, wPoint.y, HorizontalAlignment.CENTER, VerticalAlignment.CENTER); + wPoint = new Point((int) (controlPoints[0].x + windingSpacing.convertToPixels() - project.getFontSize()), (int) (controlPoints[0].y + leadSpacing.convertToPixels())); + if (tx != null) + tx.transform(wPoint, wPoint); + drawCenteredText(g2d, "S", wPoint.x, wPoint.y, HorizontalAlignment.CENTER, VerticalAlignment.CENTER); + + // Draw label. + 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 = null; + + if (getDisplay() == Display.NAME) { + label = new String[] {getName()}; + } else if (getDisplay() == Display.VALUE) { + label = new String[] {getValue().toString()}; + } else if (getDisplay() == Display.BOTH) { + String value = getValue().toString(); + label = value.isEmpty() ? new String[] {getName()} : new String[] {getName(), value}; + } + + if (label != null) { + for (int i = 0; i < label.length; i++) { + String l = label[i]; + Rectangle2D rect = fontMetrics.getStringBounds(l, g2d); + int textHeight = (int) (rect.getHeight()); + int textWidth = (int) (rect.getWidth()); + // Center text horizontally and vertically + Rectangle bounds = coreArea.getBounds(); + int x = bounds.x + (bounds.width - textWidth) / 2; + int y = bounds.y + (bounds.height - textHeight) / 2 + fontMetrics.getAscent(); + + AffineTransform oldTransform = g2d.getTransform(); + + if (getOrientation() == Orientation.DEFAULT || getOrientation() == Orientation._180) { + int centerX = bounds.x + bounds.width / 2; + int centerY = bounds.y + bounds.height / 2; + g2d.rotate(-Math.PI / 2, centerX, centerY); + } + + if (label.length == 2) { + if (i == 0) + g2d.translate(0, -textHeight / 2); + else if (i == 1) + g2d.translate(0, textHeight / 2); + } + + g2d.drawString(l, x, y); + + g2d.setTransform(oldTransform); + } + } + } + + @Override + public void drawIcon(Graphics2D g2d, int width, int height) { + int radius = (int) (12f * width / 32); + g2d.setColor(COIL_COLOR); + g2d.fillRoundRect(1, (int) (height / 8f), width - 2, (int) (height * 6 / 8f), radius, radius); + g2d.setColor(COIL_BORDER_COLOR); + g2d.drawRoundRect(1, (int) (height / 8f), width - 2, (int) (height * 6 / 8f), radius, radius); + + g2d.setColor(CORE_COLOR); + g2d.fillRect(width * 3 / 8, 1, width / 4, height - 2); + g2d.setColor(CORE_BORDER_COLOR); + g2d.drawRect(width * 3 / 8, 1, width / 4, height - 2); + + int pinSize = (int) (2f * width / 32); + g2d.setColor(PIN_COLOR); + for (int i = 0; i < 3; i++) { + g2d.fillRect(width / 5 - pinSize + 1, (height / 6) * (i + 2), pinSize, pinSize); + g2d.fillRect(4 * width / 5 + 1, (height / 6) * (i + 2), pinSize, pinSize); + } + } + + @EditableProperty(name = "Core") + public Color getCoreColor() { + if (coreColor == null) { + coreColor = CORE_COLOR; + } + return coreColor; + } + + public void setCoreColor(Color coreColor) { + this.coreColor = coreColor; + } + + @EditableProperty(name = "Core Border") + public Color getCoreBorderColor() { + if (coreBorderColor == null) { + coreBorderColor = CORE_BORDER_COLOR; + } + return coreBorderColor; + } + + public void setCoreBorderColor(Color coreBorderColor) { + this.coreBorderColor = coreBorderColor; + } + + @EditableProperty(name = "Label") + public Color getLabelColor() { + if (labelColor == null) { + labelColor = LABEL_COLOR; + } + return labelColor; + } + + public void setLabelColor(Color labelColor) { + this.labelColor = labelColor; + } + + @EditableProperty(name = "Core Thickness") + public Size getCoreThickness() { + return coreThickness; + } + + public void setCoreThickness(Size coreThickness) { + this.coreThickness = coreThickness; + body = null; + } + + @EditableProperty(name = "Core Width") + public Size getCoreWidth() { + return coreWidth; + } + + public void setCoreWidth(Size coreWidth) { + this.coreWidth = coreWidth; + body = null; + } + + @EditableProperty(name = "Coil Width") + public Size getCoilWidth() { + return coilWidth; + } + + public void setCoilWidth(Size coilWidth) { + this.coilWidth = coilWidth; + body = null; + } + + @EditableProperty(name = "Coil Length") + public Size getCoilLength() { + return coilLength; + } + + public void setCoilLength(Size coilLength) { + this.coilLength = coilLength; + body = null; + } + + @EditableProperty(name = "Coil") + public Color getCoilColor() { + return coilColor; + } + + public void setCoilColor(Color coilColor) { + this.coilColor = coilColor; + } + + @EditableProperty(name = "Coil Border") + public Color getCoilBorderColor() { + return coilBorderColor; + } + + public void setCoilBorderColor(Color coilBorderColor) { + this.coilBorderColor = coilBorderColor; + } + + @EditableProperty(name = "Primary CT") + public boolean getPrimaryCT() { + return primaryCT; + } + + public void setPrimaryCT(boolean primaryCT) { + this.primaryCT = primaryCT; + updateControlPoints(); + } + + @EditableProperty(name = "Secondary CT") + public boolean getSecondaryCT() { + return secondaryCT; + } + + public void setSecondaryCT(boolean secondaryCT) { + this.secondaryCT = secondaryCT; + updateControlPoints(); + } +} diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index 730ea64a..7a880bb1 100644 Binary files a/diylc/diylc-swing/lib/diylc-core.jar and b/diylc/diylc-swing/lib/diylc-core.jar differ diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar index 1ed6c894..a2da6e2e 100644 Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ diff --git a/diylc/diylc-swing/update.xml b/diylc/diylc-swing/update.xml index f58caf95..5de08020 100644 --- a/diylc/diylc-swing/update.xml +++ b/diylc/diylc-swing/update.xml @@ -2258,6 +2258,10 @@ 2019-01-16 00:00:00.000 CET + + NEW_FEATURE + "Signal Transformer" added + NEW_FEATURE Configurable graphics hardware acceleration diff --git a/diylc/diylc-swing/variants.xml b/diylc/diylc-swing/variants.xml index 08e396a2..daedb113 100644 --- a/diylc/diylc-swing/variants.xml +++ b/diylc/diylc-swing/variants.xml @@ -18,6 +18,14 @@ Alpha 127 + + Model + + + + Orientation + DEFAULT + Pole Color @@ -27,14 +35,6 @@ 255 - - Orientation - DEFAULT - - - Model - - Type Stratocaster @@ -73,16 +73,16 @@ 127 - Pole Color - + Model + Orientation DEFAULT - Model - + Pole Color + Type @@ -117,16 +117,16 @@ 127 - Pole Color - + Model + Orientation DEFAULT - Model - + Pole Color + Type @@ -161,16 +161,16 @@ 127 - Pole Color - + Model + Orientation DEFAULT - Model - + Pole Color + Type @@ -205,16 +205,16 @@ 127 - Pole Color - + Model + Orientation DEFAULT - Model - + Pole Color + Type @@ -249,16 +249,16 @@ 127 - Pole Color - + Model + Orientation DEFAULT - Model - + Pole Color + Type @@ -283,16 +283,396 @@ + + Passive.Audio Transformer + + + Xicon 42TL + + + Alpha + 100 + + + Value + + + + Orientation + DEFAULT + + + Core Border + + 81 + 109 + 122 + 255 + + + + Coil + + 221 + 221 + 221 + 255 + + + + Winding Spacing + + 0.5 + in + + + + Display + BOTH + + + Core + + 117 + 157 + 175 + 255 + + + + Coil Border + + 154 + 154 + 154 + 255 + + + + Lead Spacing + + 0.1 + in + + + + Core Thickness + + 0.15 + in + + + + Primary CT + true + + + Core Width + + 0.6 + in + + + + Coil Width + + 0.5 + in + + + + Coil Length + + 0.6 + in + + + + Secondary CT + true + + + Label + + 255 + 255 + 255 + 255 + + + + + + 0 + 0 + + + 0 + 20 + + + 0 + 40 + + + 100 + 0 + + + 100 + 20 + + + 100 + 40 + + + false + + + Xicon 42TU + + + Alpha + 100 + + + Value + + + + Orientation + DEFAULT + + + Core Border + + + + Coil + + + + Winding Spacing + + 0.6 + in + + + + Display + BOTH + + + Core + + + + Coil Border + + + + Lead Spacing + + 0.2 + in + + + + Core Thickness + + 0.25 + in + + + + Primary CT + true + + + Core Width + + 0.98 + in + + + + Coil Width + + 0.65 + in + + + + Coil Length + + 0.72 + in + + + + Secondary CT + true + + + Label + + + + + + 0 + 0 + + + 0 + 40 + + + 0 + 80 + + + 120 + 0 + + + 120 + 40 + + + 120 + 80 + + + false + + + Xicon 42TM + + + Alpha + 100 + + + Value + + + + Orientation + DEFAULT + + + Core Border + + + + Coil + + + + Winding Spacing + + 0.5 + in + + + + Display + BOTH + + + Core + + + + Coil Border + + + + Lead Spacing + + 0.15 + in + + + + Core Thickness + + 0.2 + in + + + + Primary CT + true + + + Core Width + + 0.866 + in + + + + Coil Width + + 0.49 + in + + + + Coil Length + + 0.59 + in + + + + Secondary CT + true + + + Label + + + + + + 0 + 0 + + + 0 + 30 + + + 0 + 60 + + + 100 + 0 + + + 100 + 30 + + + 100 + 60 + + + false + + + Electro-Mechanical.Mini Toggle Switch DPDT - - Alpha - 127 - Body @@ -302,10 +682,18 @@ 255 + + Alpha + 127 + Orientation VERTICAL + + Type + DPDT + Border @@ -315,10 +703,6 @@ 255 - - Type - DPDT - Spacing @@ -359,25 +743,25 @@ SPDT - Alpha - 127 + Body + - Body - + Alpha + 127 Orientation VERTICAL - - Border - - Type SPDT + + Border + + Spacing @@ -574,316 +958,6 @@ - - Semiconductors.Bridge Rectifier - - - Miniature Rectangular - - - Label Orientation - Directional - - - Alpha - 127 - - - Body - - 128 - 128 - 128 - 255 - - - - Value - - - - Orientation - DEFAULT - - - Type - MiniDIP1 - - - Border - - 89 - 89 - 89 - 255 - - - - Voltage - - - - Display - BOTH - - - Label - - 255 - 255 - 255 - 255 - - - - Current - - - - - - 0 - 0 - - - 60 - 0 - - - 60 - 40 - - - 0 - 40 - - - false - - - Miniature Round - - - Label Orientation - Directional - - - Alpha - 100 - - - Body - - - - Value - - - - Orientation - DEFAULT - - - Type - MiniRound1 - - - Border - - - - Voltage - - - - Display - BOTH - - - Label - - - - Current - - - - - - 0 - 0 - - - 40 - 0 - - - 40 - 40 - - - 0 - 40 - - - false - - - In-line - - - Label Orientation - Directional - - - Alpha - 100 - - - Body - - - - Value - - - - Orientation - DEFAULT - - - Type - InLine - - - Border - - - - Voltage - - - - Display - BOTH - - - Label - - - - Current - - - - - - 0 - 0 - - - 0 - 40 - - - 0 - 80 - - - 0 - 120 - - - false - - - Square BR-3 - - - Label Orientation - Horizontal - - - Value - - - - Body - - 128 - 128 - 128 - 255 - - - - Alpha - 100 - - - Orientation - DEFAULT - - - Border - - 89 - 89 - 89 - 255 - - - - Type - SquareBR3 - - - Display - BOTH - - - Voltage - - - - Label - - 255 - 255 - 255 - 255 - - - - Current - - 3.0 - A - - - - - - 0 - 0 - - - 85 - 0 - - - 0 - 85 - - - 85 - 85 - - - false - - - Passive.Potentiometer @@ -1068,6 +1142,316 @@ + + Semiconductors.Bridge Rectifier + + + Miniature Rectangular + + + Label Orientation + Directional + + + Value + + + + Body + + 128 + 128 + 128 + 255 + + + + Alpha + 127 + + + Orientation + DEFAULT + + + Border + + 89 + 89 + 89 + 255 + + + + Type + MiniDIP1 + + + Display + BOTH + + + Voltage + + + + Label + + 255 + 255 + 255 + 255 + + + + Current + + + + + + 0 + 0 + + + 60 + 0 + + + 60 + 40 + + + 0 + 40 + + + false + + + Miniature Round + + + Label Orientation + Directional + + + Value + + + + Body + + + + Alpha + 100 + + + Orientation + DEFAULT + + + Border + + + + Type + MiniRound1 + + + Display + BOTH + + + Voltage + + + + Label + + + + Current + + + + + + 0 + 0 + + + 40 + 0 + + + 40 + 40 + + + 0 + 40 + + + false + + + In-line + + + Label Orientation + Directional + + + Value + + + + Body + + + + Alpha + 100 + + + Orientation + DEFAULT + + + Border + + + + Type + InLine + + + Display + BOTH + + + Voltage + + + + Label + + + + Current + + + + + + 0 + 0 + + + 0 + 40 + + + 0 + 80 + + + 0 + 120 + + + false + + + Square BR-3 + + + Label Orientation + Horizontal + + + Alpha + 100 + + + Body + + 128 + 128 + 128 + 255 + + + + Value + + + + Orientation + DEFAULT + + + Type + SquareBR3 + + + Border + + 89 + 89 + 89 + 255 + + + + Voltage + + + + Display + BOTH + + + Label + + 255 + 255 + 255 + 255 + + + + Current + + 3.0 + A + + + + + + 0 + 0 + + + 85 + 0 + + + 0 + 85 + + + 85 + 85 + + + false + + + Passive.Multi-Section Capacitor @@ -1091,10 +1475,8 @@ - Value - - - + Alpha + 127 Body @@ -1106,8 +1488,10 @@ - Alpha - 127 + Value + + + Orientation @@ -1122,14 +1506,14 @@ 255 - - Voltage - - Display BOTH + + Voltage + + Label @@ -1181,8 +1565,12 @@ - Alpha - 127 + Value + + + + + Body @@ -1194,12 +1582,8 @@ - Value - - - - - + Alpha + 127 Orientation @@ -1214,14 +1598,14 @@ 255 - - Display - BOTH - Voltage + + Display + BOTH + Label @@ -1281,13 +1665,8 @@ - Value - - - - - - + Alpha + 127 Body @@ -1299,8 +1678,13 @@ - Alpha - 127 + Value + + + + + + Orientation @@ -1315,14 +1699,14 @@ 255 - - Voltage - - Display BOTH + + Voltage + + Label @@ -1378,19 +1762,19 @@ - Value - - - - + Alpha + 127 Body - Alpha - 127 + Value + + + + Orientation @@ -1400,14 +1784,14 @@ Border - - Voltage - - Display BOTH + + Voltage + + Label @@ -1435,241 +1819,6 @@ - - Semiconductors.DIP IC - - - DIP8 - - - Row Spacing - - 0.3 - in - - - - Pins - _8 - - - Alpha - 127 - - - Body - - - - Value - - - - Orientation - DEFAULT - - - Border - - 89 - 89 - 89 - 255 - - - - Display - BOTH - - - Label - - - - Display Pin #s - NO - - - Indent - - 89 - 89 - 89 - 255 - - - - Pin Spacing - - 0.1 - in - - - - - - 0 - 0 - - - 0 - 20 - - - 0 - 40 - - - 0 - 60 - - - 60 - 0 - - - 60 - 20 - - - 60 - 40 - - - 60 - 60 - - - false - - - DIP16 - - - Row Spacing - - 0.3 - in - - - - Pins - _16 - - - Alpha - 127 - - - Body - - - - Value - - - - Orientation - DEFAULT - - - Border - - - - Display - BOTH - - - Label - - - - Display Pin #s - NO - - - Indent - - - - Pin Spacing - - 0.1 - in - - - - - - 0 - 0 - - - 0 - 20 - - - 0 - 40 - - - 0 - 60 - - - 0 - 80 - - - 0 - 100 - - - 0 - 120 - - - 0 - 140 - - - 60 - 0 - - - 60 - 20 - - - 60 - 40 - - - 60 - 60 - - - 60 - 80 - - - 60 - 100 - - - 60 - 120 - - - 60 - 140 - - - false - - - Passive.Resistor @@ -2566,6 +2715,383 @@ + + Semiconductors.DIP IC + + + DIP8 + + + Pins + _8 + + + Row Spacing + + 0.3 + in + + + + Value + + + + Body + + + + Alpha + 127 + + + Orientation + DEFAULT + + + Border + + 89 + 89 + 89 + 255 + + + + Display + BOTH + + + Label + + + + Display Pin #s + NO + + + Indent + + 89 + 89 + 89 + 255 + + + + Pin Spacing + + 0.1 + in + + + + + + 0 + 0 + + + 0 + 20 + + + 0 + 40 + + + 0 + 60 + + + 60 + 0 + + + 60 + 20 + + + 60 + 40 + + + 60 + 60 + + + false + + + DIP16 + + + Pins + _16 + + + Row Spacing + + 0.3 + in + + + + Value + + + + Body + + + + Alpha + 127 + + + Orientation + DEFAULT + + + Border + + + + Display + BOTH + + + Label + + + + Display Pin #s + NO + + + Indent + + + + Pin Spacing + + 0.1 + in + + + + + + 0 + 0 + + + 0 + 20 + + + 0 + 40 + + + 0 + 60 + + + 0 + 80 + + + 0 + 100 + + + 0 + 120 + + + 0 + 140 + + + 60 + 0 + + + 60 + 20 + + + 60 + 40 + + + 60 + 60 + + + 60 + 80 + + + 60 + 100 + + + 60 + 120 + + + 60 + 140 + + + false + + + + + Tubes.Tube Socket + + + Noval + + + Angle + 0 + + + Base + B9A + + + Alpha + 127 + + + Type + + + + Color + + 247 + 247 + 239 + 255 + + + + + + 0 + 0 + + + 66 + 48 + + + 25 + 78 + + + -25 + 78 + + + -66 + 48 + + + -82 + 0 + + + -66 + -48 + + + -25 + -78 + + + 25 + -78 + + + 66 + -48 + + + false + + + Octal + + + Angle + 0 + + + Base + OCTAL + + + Alpha + 127 + + + Type + + + + Color + + + + + + 0 + 0 + + + 63 + 26 + + + 26 + 63 + + + -27 + 63 + + + -64 + 26 + + + -64 + -27 + + + -27 + -64 + + + 26 + -64 + + + 63 + -27 + + + false + + + Electro-Mechanical.Chassis Panel @@ -2731,154 +3257,16 @@ - - Tubes.Tube Socket - - - Noval - - - Base - B9A - - - Angle - 0 - - - Alpha - 127 - - - Type - - - - Color - - 247 - 247 - 239 - 255 - - - - - - 0 - 0 - - - 66 - 48 - - - 25 - 78 - - - -25 - 78 - - - -66 - 48 - - - -82 - 0 - - - -66 - -48 - - - -25 - -78 - - - 25 - -78 - - - 66 - -48 - - - false - - - Octal - - - Base - OCTAL - - - Angle - 0 - - - Alpha - 127 - - - Type - - - - Color - - - - - - 0 - 0 - - - 63 - 26 - - - 26 - 63 - - - -27 - 63 - - - -64 - 26 - - - -64 - -27 - - - -27 - -64 - - - 26 - -64 - - - 63 - -27 - - - false - - - Guitar.Humbucker Pickup Covered PAF-Style + + Alpha + 127 + Bobin 1 @@ -2888,18 +3276,6 @@ 255 - - Alpha - 127 - - - Model - - - - Orientation - DEFAULT - Pole Color @@ -2909,6 +3285,14 @@ 255 + + Orientation + DEFAULT + + + Model + + Bobin 2 @@ -2955,10 +3339,6 @@ Uncovered PAF-Style - - Alpha - 127 - Bobin 1 @@ -2968,6 +3348,18 @@ 255 + + Alpha + 127 + + + Model + + + + Orientation + DEFAULT + Pole Color @@ -2977,14 +3369,6 @@ 255 - - Orientation - DEFAULT - - - Model - - Bobin 2 @@ -3031,10 +3415,6 @@ EMG-style - - Alpha - 127 - Bobin 1 @@ -3044,6 +3424,18 @@ 255 + + Alpha + 127 + + + Model + + + + Orientation + DEFAULT + Pole Color @@ -3053,14 +3445,6 @@ 255 - - Orientation - DEFAULT - - - Model - - Bobin 2 @@ -3107,6 +3491,10 @@ Filtertron-style + + Alpha + 127 + Bobin 1 @@ -3116,18 +3504,6 @@ 255 - - Alpha - 127 - - - Model - - - - Orientation - DEFAULT - Pole Color @@ -3137,6 +3513,14 @@ 255 + + Orientation + DEFAULT + + + Model + + Bobin 2 @@ -3150,14 +3534,14 @@ Type Filtertron - - Cover - true - Legs false + + Cover + true + Pole Pieces 1 Screws