diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index 5571852b..98f6aa63 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/electromechanical/CliffJack1_4.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/CliffJack1_4.java index 5edfa679..5f8678e8 100644 --- a/diylc/diylc-library/src/org/diylc/components/electromechanical/CliffJack1_4.java +++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/CliffJack1_4.java @@ -25,6 +25,7 @@ import java.awt.AlphaComposite; import java.awt.Color; import java.awt.Composite; import java.awt.Graphics2D; +import java.awt.RenderingHints; import java.awt.Shape; import java.awt.geom.AffineTransform; import java.awt.geom.Area; @@ -289,7 +290,17 @@ public class CliffJack1_4 extends AbstractMultiPartComponent { g2d.drawLine(pinX1, width * 2 / 8, pinX1, width * 3 / 8); g2d.drawLine(pinX1, width * 5 / 8, pinX1, width * 6 / 8); g2d.drawLine(pinX2, width * 2 / 8, pinX2, width * 3 / 8); - g2d.drawLine(pinX2, width * 5 / 8, pinX2, width * 6 / 8); + g2d.drawLine(pinX2, width * 5 / 8, pinX2, width * 6 / 8); + + g2d.setColor(LABEL_COLOR); + g2d.setFont(LABEL_FONT.deriveFont(width / 3.5f)); + + RenderingHints rh = new RenderingHints( + RenderingHints.KEY_TEXT_ANTIALIASING, + RenderingHints.VALUE_TEXT_ANTIALIAS_OFF); + g2d.setRenderingHints(rh); + + StringUtils.drawCenteredText(g2d, "6.3", width / 2 - 1, height / 2, HorizontalAlignment.CENTER, VerticalAlignment.CENTER); } @Override diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/CliffJack1_8.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/CliffJack1_8.java index 60d5ef48..61df791c 100644 --- a/diylc/diylc-library/src/org/diylc/components/electromechanical/CliffJack1_8.java +++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/CliffJack1_8.java @@ -22,6 +22,7 @@ import java.awt.AlphaComposite; import java.awt.Color; import java.awt.Composite; import java.awt.Graphics2D; +import java.awt.RenderingHints; import java.awt.Shape; import java.awt.geom.AffineTransform; import java.awt.geom.Area; @@ -287,18 +288,9 @@ public class CliffJack1_8 extends AbstractMultiPartComponent { int tailWidth = getClosestOdd(width * 3 / 9); g2d.setColor(BODY_COLOR); - g2d.fillRoundRect((width - tailWidth) / 2, height / 2, tailWidth, height / 2 - 2 * 32 / height, - 4 * 32 / width, 4 * 32 / width); + g2d.fillRect((width - tailWidth) / 2, 2 * 32 / height, tailWidth, height / 2); g2d.setColor(BORDER_COLOR); - g2d.drawRoundRect((width - tailWidth) / 2, height / 2, tailWidth, height / 2 - 2 * 32 / height, - 4 * 32 / width, 4 * 32 / width); - - g2d.setColor(BODY_COLOR); - g2d.fillRoundRect((width - tailWidth) / 2, 2 * 32 / height, tailWidth, height / 2, - 4 * 32 / width, 4 * 32 / width); - g2d.setColor(BORDER_COLOR); - g2d.drawRoundRect((width - tailWidth) / 2, 2 * 32 / height, tailWidth, height / 2, - 4 * 32 / width, 4 * 32 / width); + g2d.drawRect((width - tailWidth) / 2, 2 * 32 / height, tailWidth, height / 2); g2d.setColor(BODY_COLOR); g2d.fillRect((width - bodyWidth) / 2, height / 7 + 1, bodyWidth, height * 5 / 7); @@ -308,10 +300,20 @@ public class CliffJack1_8 extends AbstractMultiPartComponent { g2d.setColor(METAL_COLOR); int pinX1 = getClosestOdd((width - bodyWidth * 3 / 4) / 2); int pinX2 = getClosestOdd((width + bodyWidth * 3 / 4) / 2) - 1; - g2d.drawLine(pinX1, width * 2 / 8, pinX1, width * 3 / 8); - g2d.drawLine(pinX1, width * 5 / 8, pinX1, width * 6 / 8); - g2d.drawLine(pinX2, width * 2 / 8, pinX2, width * 3 / 8); - g2d.drawLine(pinX2, width * 5 / 8, pinX2, width * 6 / 8); + g2d.drawLine(pinX1, width * 4 / 16, pinX1, width * 5 / 16); + g2d.drawLine(pinX1, width * 11 / 16, pinX1, width * 12 / 16); + g2d.drawLine(pinX2, width * 4 / 16, pinX2, width * 5 / 16); + g2d.drawLine(pinX2, width * 11 / 16, pinX2, width * 12 / 16); + + g2d.setColor(LABEL_COLOR); + g2d.setFont(LABEL_FONT.deriveFont(width / 3.5f)); + + RenderingHints rh = new RenderingHints( + RenderingHints.KEY_TEXT_ANTIALIASING, + RenderingHints.VALUE_TEXT_ANTIALIAS_OFF); + g2d.setRenderingHints(rh); + + StringUtils.drawCenteredText(g2d, "3.5", width / 2 - 1, height / 2, HorizontalAlignment.CENTER, VerticalAlignment.CENTER); } @Override diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_4.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_4.java index 15a6a013..0a6094c0 100644 --- a/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_4.java +++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_4.java @@ -325,7 +325,7 @@ public class OpenJack1_4 extends AbstractMultiPartComponent { RenderingHints.VALUE_TEXT_ANTIALIAS_OFF); g2d.setRenderingHints(rh); - StringUtils.drawCenteredText(g2d, "1/4\"", width / 2, height / 2, HorizontalAlignment.CENTER, VerticalAlignment.CENTER); + StringUtils.drawCenteredText(g2d, "6.3", width / 2 - 1, height / 2, HorizontalAlignment.CENTER, VerticalAlignment.CENTER); } @Override diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_8.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_8.java index 9d532d4e..bff5418b 100644 --- a/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_8.java +++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_8.java @@ -325,7 +325,7 @@ public class OpenJack1_8 extends AbstractMultiPartComponent { RenderingHints.VALUE_TEXT_ANTIALIAS_OFF); g2d.setRenderingHints(rh); - StringUtils.drawCenteredText(g2d, "1/8\"", width / 2 - 1, height / 2, HorizontalAlignment.CENTER, VerticalAlignment.CENTER); + StringUtils.drawCenteredText(g2d, "3.5", width / 2 - 1, height / 2, HorizontalAlignment.CENTER, VerticalAlignment.CENTER); } @Override diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index 5571852b..98f6aa63 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 489cd737..eeea7d3d 100644 Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ