diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml b/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml index 59d99305..992af535 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml @@ -1,15 +1,15 @@ - metric - true + lastPath + C:\Documents and Settings\Branislav Stojkovic\Desktop zoom 1.0 - lastPath - C:\Documents and Settings\Branislav Stojkovic\Desktop + metric + true default.org.diylc.components.misc.Label:Color diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar index 28793104..1ba116e2 100644 Binary files a/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar and b/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar differ diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/ResistorColorCode.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/ResistorColorCode.java index 2ceaef6e..f1b75ffb 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/ResistorColorCode.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/ResistorColorCode.java @@ -2,10 +2,13 @@ package org.diylc.common; public enum ResistorColorCode { - _4_BAND, _5_BAND; - + NONE, _4_BAND, _5_BAND; + @Override public String toString() { - return name().substring(1).replace("_", " ").toLowerCase(); + if (name().startsWith("_")) { + return name().substring(1).replace("_", " ").toLowerCase(); + } + return name().substring(0, 1).toUpperCase() + name().substring(1).toLowerCase(); } } diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/update.xml b/ diy-layout-creator --username bancika@gmail.com/DIYLC/update.xml index 887624c9..3c0c5092 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/update.xml +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/update.xml @@ -82,5 +82,30 @@ http://code.google.com/p/diy-layout-creator/downloads/list + + + 3 + 0 + 5 + + 2011-01-27 21:00:00.000 CET + + + + BUG_FIX + Curved trace does not show control points + + + IMPROVEMENT + Resistor can show color bands + + + NEW_FEATURE + + + + http://code.google.com/p/diy-layout-creator/downloads/list + + \ No newline at end of file diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/lib/diylc.jar b/ diy-layout-creator --username bancika@gmail.com/Library/lib/diylc.jar index ebd0f3ed..b81007a0 100644 Binary files a/ diy-layout-creator --username bancika@gmail.com/Library/lib/diylc.jar and b/ diy-layout-creator --username bancika@gmail.com/Library/lib/diylc.jar differ diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CurvedTrace.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CurvedTrace.java index 7861c1fe..956a1942 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CurvedTrace.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CurvedTrace.java @@ -38,11 +38,6 @@ public class CurvedTrace extends AbstractCurvedComponent { g2d.draw(curve); } - @Override - public VisibilityPolicy getControlPointVisibilityPolicy(int index) { - return VisibilityPolicy.NEVER; - } - @EditableProperty(name = "Width") public Size getSize() { return size; diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Resistor.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Resistor.java index bb12585b..2195439b 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Resistor.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Resistor.java @@ -91,6 +91,9 @@ public class Resistor extends AbstractLeadedComponent { @Override protected void decorateComponentBody(Graphics2D g2d) { // int width = getWidth().convertToPixels(); + if (colorCode == ResistorColorCode.NONE) { + return; + } int height = getClosestOdd(getHeight().convertToPixels()); Color[] bands = value.getColorCode(colorCode); int x = 4;