diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml index d816721f..d2c0116e 100644 --- a/diylc/diylc-core/src/org/diylc/presenter/update.xml +++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml @@ -4245,7 +4245,11 @@ NEW_FEATURE Show component values in the project explorer - + + + NEW_FEATURE + Double click in the project explorer to edit selected component + NEW_FEATURE Title Block added as one of factory building blocks @@ -4264,7 +4268,11 @@ IMPROVEMENT - Show jack type in the BOM + Show jack type in the BOM and project explorer + + + IMPROVEMENT + Show wire gauge in the BOM and project explorer IMPROVEMENT diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index c6dc9ea5..2609681b 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/connectivity/AWG.java b/diylc/diylc-library/src/org/diylc/components/connectivity/AWG.java index 20ff32fc..65c83095 100644 --- a/diylc/diylc-library/src/org/diylc/components/connectivity/AWG.java +++ b/diylc/diylc-library/src/org/diylc/components/connectivity/AWG.java @@ -27,7 +27,7 @@ public enum AWG { @Override public String toString() { - return "#" + name().replace("_", "") + " (" + String.format("%1$,.2f", diameterIn() * 25.4) + "mm / " + String.format("%1$,.5f", diameterIn()) + "in)"; + return "#" + name().replace("_", "") + " / " + String.format("%1$,.2f", diameterIn() * 25.4) + "mm"; } public double diameterIn() { diff --git a/diylc/diylc-library/src/org/diylc/components/connectivity/HookupWire.java b/diylc/diylc-library/src/org/diylc/components/connectivity/HookupWire.java index 1d938014..ee9cab96 100644 --- a/diylc/diylc-library/src/org/diylc/components/connectivity/HookupWire.java +++ b/diylc/diylc-library/src/org/diylc/components/connectivity/HookupWire.java @@ -41,7 +41,7 @@ import org.diylc.utils.Constants; instanceNamePrefix = "W", description = "Flexible wire with two control points", zOrder = IDIYComponent.WIRING, flexibleZOrder = true, bomPolicy = BomPolicy.NEVER_SHOW, autoEdit = false, transformer = SimpleComponentTransformer.class, enableCache = false) -public class HookupWire extends AbstractCurvedComponent implements IContinuity { +public class HookupWire extends AbstractCurvedComponent implements IContinuity { private static final long serialVersionUID = 1L; @@ -117,22 +117,14 @@ public class HookupWire extends AbstractCurvedComponent implements IContin } @EditableProperty(name = "AWG") - public AWG getGauge() { + public AWG getValue() { return gauge; } - public void setGauge(AWG gauge) { + public void setValue(AWG gauge) { this.gauge = gauge; } - @Override - public Void getValue() { - return null; - } - - @Override - public void setValue(Void value) {} - @EditableProperty(name = "Stripe") public boolean getStriped() { return striped; diff --git a/diylc/diylc-library/src/org/diylc/editor/FlexibleLeadsEditor.java b/diylc/diylc-library/src/org/diylc/editor/FlexibleLeadsEditor.java index 42b31a9a..c5f84c3c 100644 --- a/diylc/diylc-library/src/org/diylc/editor/FlexibleLeadsEditor.java +++ b/diylc/diylc-library/src/org/diylc/editor/FlexibleLeadsEditor.java @@ -80,7 +80,7 @@ public class FlexibleLeadsEditor implements IProjectEditor { // create leads HookupWire w1 = new HookupWire(); getInstantiationManager().fillWithDefaultProperties(w1, null); - w1.setGauge(AWG._26); + w1.setValue(AWG._26); w1.setLeadColor(leaded.getLeadColor()); // w1.setPointCount(PointCount.THREE); w1.setControlPoint(p1, 0); @@ -93,7 +93,7 @@ public class FlexibleLeadsEditor implements IProjectEditor { HookupWire w2 = new HookupWire(); getInstantiationManager().fillWithDefaultProperties(w2, null); - w2.setGauge(AWG._26); + w2.setValue(AWG._26); w2.setLeadColor(leaded.getLeadColor()); // w2.setPointCount(PointCount.THREE); w2.setControlPoint(p2, 0); @@ -134,9 +134,9 @@ public class FlexibleLeadsEditor implements IProjectEditor { getInstantiationManager().fillWithDefaultProperties(w, null); // make the leads thicker for TO220 and TO126 if (c instanceof TransistorTO220 || c instanceof TransistorTO126) - w.setGauge(AWG._24); + w.setValue(AWG._24); else - w.setGauge(AWG._26); + w.setValue(AWG._26); w.setLeadColor(AbstractTransistorPackage.METAL_COLOR); w.setPointCount(PointCount.THREE); w.setControlPoint(p0, 0); @@ -244,7 +244,7 @@ public class FlexibleLeadsEditor implements IProjectEditor { tx = AffineTransform.getRotateInstance(c.getOrientation().toRadians(), p0.getX(), p0.getY()); HookupWire w = new HookupWire(); - w.setGauge(AWG._24); + w.setValue(AWG._24); getInstantiationManager().fillWithDefaultProperties(w, null); for (int j = 0; j < w.getControlPointCount(); j++) { Point2D p = new Point2D.Double((int)(p0.getX() + dx * j), (int)(p0.getY() + dy * j)); diff --git a/diylc/diylc-library/src/org/diylc/serialization/V2FileParser.java b/diylc/diylc-library/src/org/diylc/serialization/V2FileParser.java index 65b5840b..652373cc 100644 --- a/diylc/diylc-library/src/org/diylc/serialization/V2FileParser.java +++ b/diylc/diylc-library/src/org/diylc/serialization/V2FileParser.java @@ -439,29 +439,29 @@ public class V2FileParser implements IOldFileParser { } num = num * 2 + 8; if (num == 8) - hw.setGauge(AWG._8); + hw.setValue(AWG._8); else if (num == 10) - hw.setGauge(AWG._10); + hw.setValue(AWG._10); else if (num == 12) - hw.setGauge(AWG._12); + hw.setValue(AWG._12); else if (num == 14) - hw.setGauge(AWG._14); + hw.setValue(AWG._14); else if (num == 16) - hw.setGauge(AWG._16); + hw.setValue(AWG._16); else if (num == 18) - hw.setGauge(AWG._18); + hw.setValue(AWG._18); else if (num == 20) - hw.setGauge(AWG._20); + hw.setValue(AWG._20); else if (num == 22) - hw.setGauge(AWG._22); + hw.setValue(AWG._22); else if (num == 24) - hw.setGauge(AWG._24); + hw.setValue(AWG._24); else if (num == 26) - hw.setGauge(AWG._26); + hw.setValue(AWG._26); else if (num == 28) - hw.setGauge(AWG._28); + hw.setValue(AWG._28); else if (num == 30) - hw.setGauge(AWG._30); + hw.setValue(AWG._30); hw.setLeadColor(cl); hw.setControlPoint(tacke.get(0), 0); hw.setControlPoint(tacke.get(1), 1); diff --git a/diylc/diylc-swing/DIYLCStarter.launch b/diylc/diylc-swing/DIYLCStarter.launch index c119ec5b..fc93bd7c 100644 --- a/diylc/diylc-swing/DIYLCStarter.launch +++ b/diylc/diylc-swing/DIYLCStarter.launch @@ -14,5 +14,5 @@ - + diff --git a/diylc/diylc-swing/dict.txt b/diylc/diylc-swing/dict.txt index 9bc9768f..156caab5 100644 --- a/diylc/diylc-swing/dict.txt +++ b/diylc/diylc-swing/dict.txt @@ -1,18 +1,18 @@ -#10 (2.59mm / 0.10190in) -#12 (2.05mm / 0.08081in) -#14 (1.63mm / 0.06409in) -#16 (1.29mm / 0.05082in) -#18 (1.02mm / 0.04030in) -#20 (0.81mm / 0.03196in) -#22 (0.64mm / 0.02535in) -#24 (0.51mm / 0.02010in) -#26 (0.40mm / 0.01594in) -#28 (0.32mm / 0.01264in) -#30 (0.25mm / 0.01003in) -#32 (0.20mm / 0.00795in) -#34 (0.16mm / 0.00631in) -#36 (0.13mm / 0.00500in) -#8 (3.26mm / 0.12849in) +#10 / 2.59mm +#12 / 2.05mm +#14 / 1.63mm +#16 / 1.29mm +#18 / 1.02mm +#20 / 0.81mm +#22 / 0.64mm +#24 / 0.51mm +#26 / 0.40mm +#28 / 0.32mm +#30 / 0.25mm +#32 / 0.20mm +#34 / 0.16mm +#36 / 0.13mm +#8 / 3.26mm 1 throws / 2 positions 10 throws / 10 positions 11 throws / 11 positions diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index c6dc9ea5..2609681b 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 df72779a..776c5c12 100644 Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ