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 172d514f..20ff32fc 100644 --- a/diylc/diylc-library/src/org/diylc/components/connectivity/AWG.java +++ b/diylc/diylc-library/src/org/diylc/components/connectivity/AWG.java @@ -23,11 +23,15 @@ package org.diylc.components.connectivity; public enum AWG { - _8, _10, _12, _14, _16, _18, _20, _22, _24, _26, _28, _30; + _8, _10, _12, _14, _16, _18, _20, _22, _24, _26, _28, _30, _32, _34, _36; @Override public String toString() { - return "#" + name().replace("_", ""); + return "#" + name().replace("_", "") + " (" + String.format("%1$,.2f", diameterIn() * 25.4) + "mm / " + String.format("%1$,.5f", diameterIn()) + "in)"; + } + + public double diameterIn() { + return Math.pow(Math.E, -1.12436 - 0.11594 * getValue()); } public int getValue() { diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar index decbce59..54d72751 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 e81457bf..d361bc94 100644 --- a/diylc/diylc-swing/update.xml +++ b/diylc/diylc-swing/update.xml @@ -2504,6 +2504,22 @@ https://github.com/bancika/diy-layout-creator/releases + + + + 3 + 55 + 0 + + 2019-02-26 00:00:00.000 CET + + + + NEW_FEATURE + Show wire diameter in mm and in next to AWG gauge + + + https://github.com/bancika/diy-layout-creator/releases