diff --git a/diylc/diylc-core/src/org/diylc/core/measures/Resistance.java b/diylc/diylc-core/src/org/diylc/core/measures/Resistance.java index 92d02a85..aa52559a 100644 --- a/diylc/diylc-core/src/org/diylc/core/measures/Resistance.java +++ b/diylc/diylc-core/src/org/diylc/core/measures/Resistance.java @@ -109,7 +109,7 @@ public class Resistance extends AbstractMeasure { } public static Resistance parseResistance(String value) { - value = value.replace("*", "").replace("R", "Ω"); + value = value.replace("*", "").replace("R", "\u2126"); for (ResistanceUnit unit : ResistanceUnit.values()) { if (value.toLowerCase().endsWith(unit.toString().toLowerCase())) { value = value.substring(0, value.length() - unit.toString().length()).trim(); diff --git a/diylc/diylc-core/src/org/diylc/core/measures/ResistanceUnit.java b/diylc/diylc-core/src/org/diylc/core/measures/ResistanceUnit.java index 7ac9bde8..502e20bb 100644 --- a/diylc/diylc-core/src/org/diylc/core/measures/ResistanceUnit.java +++ b/diylc/diylc-core/src/org/diylc/core/measures/ResistanceUnit.java @@ -23,7 +23,7 @@ package org.diylc.core.measures; public enum ResistanceUnit implements Unit { - R(1, "Ω"), K(1e3, "K"), M(1e6, "M"); + R(1, "\u2126"), K(1e3, "K"), M(1e6, "M"); double factor; String display; @@ -35,7 +35,8 @@ public enum ResistanceUnit implements Unit { @Override public double getFactor() { - return factor; + return factor; + } @Override diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index 173d7456..a1544c71 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-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index 173d7456..a1544c71 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/update.xml b/diylc/diylc-swing/update.xml index ed91993c..eb95e0d4 100644 --- a/diylc/diylc-swing/update.xml +++ b/diylc/diylc-swing/update.xml @@ -2329,6 +2329,10 @@ IMPROVEMENT Better selection rendering for a few components, mostly electro-mechanical + + + BUG_FIX + Reverted Ohm symbol changes that made it render wrong on some systems https://github.com/bancika/diy-layout-creator/releases