BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-10 17:22:09 +10:00
Code Issues Packages Projects Releases Wiki Activity

Reverted Ohm symbol changes that made it render wrong on some systems

Browse Source
This commit is contained in:
Branislav Stojkovic
2019-01-26 15:40:55 +01:00
parent 197f9ca216
commit 0c76b93db0
5 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-core/src/org/diylc/core/measures/Resistance.java
+1 -1
View File
@@ -109,7 +109,7 @@ public class Resistance extends AbstractMeasure<ResistanceUnit> {
} }
public static Resistance parseResistance(String value) { public static Resistance parseResistance(String value) {
value = value.replace("*", "").replace("R", "Ω"); value = value.replace("*", "").replace("R", "\u2126");
for (ResistanceUnit unit : ResistanceUnit.values()) { for (ResistanceUnit unit : ResistanceUnit.values()) {
if (value.toLowerCase().endsWith(unit.toString().toLowerCase())) { if (value.toLowerCase().endsWith(unit.toString().toLowerCase())) {
value = value.substring(0, value.length() - unit.toString().length()).trim(); value = value.substring(0, value.length() - unit.toString().length()).trim();
diylc/diylc-core/src/org/diylc/core/measures/ResistanceUnit.java
+2 -1
View File
@@ -23,7 +23,7 @@ package org.diylc.core.measures;
public enum ResistanceUnit implements Unit { public enum ResistanceUnit implements Unit {
R(1, "Ω"), K(1e3, "K"), M(1e6, "M"); R(1, "\u2126"), K(1e3, "K"), M(1e6, "M");
double factor; double factor;
String display; String display;
@@ -36,6 +36,7 @@ public enum ResistanceUnit implements Unit {
@Override @Override
public double getFactor() { public double getFactor() {
return factor; return factor;
} }
@Override @Override
diylc/diylc-library/lib/diylc-core.jar
BIN
View File
Binary file not shown.
diylc/diylc-swing/lib/diylc-core.jar
BIN
View File
Binary file not shown.
diylc/diylc-swing/update.xml
+4
View File
@@ -2330,6 +2330,10 @@
<changeType>IMPROVEMENT</changeType> <changeType>IMPROVEMENT</changeType>
<description>Better selection rendering for a few components, mostly electro-mechanical</description> <description>Better selection rendering for a few components, mostly electro-mechanical</description>
</org.diylc.appframework.update.Change> </org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>BUG_FIX</changeType>
<description>Reverted Ohm symbol changes that made it render wrong on some systems</description>
</org.diylc.appframework.update.Change>
</changes> </changes>
<url>https://github.com/bancika/diy-layout-creator/releases</url> <url>https://github.com/bancika/diy-layout-creator/releases</url>
</org.diylc.appframework.update.Version> </org.diylc.appframework.update.Version>