diff --git a/diylc/diylc-core/.settings/org.eclipse.core.resources.prefs b/diylc/diylc-core/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..b0b8e2d8 --- /dev/null +++ b/diylc/diylc-core/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding//src/org/diylc/core/measures/Resistance.java=UTF-8 +encoding//src/org/diylc/core/measures/ResistanceUnit.java=UTF-8 diff --git a/diylc/diylc-core/src/org/diylc/components/AbstractComponent.java b/diylc/diylc-core/src/org/diylc/components/AbstractComponent.java index d3072518..5e6f9e59 100644 --- a/diylc/diylc-core/src/org/diylc/components/AbstractComponent.java +++ b/diylc/diylc-core/src/org/diylc/components/AbstractComponent.java @@ -61,7 +61,7 @@ public abstract class AbstractComponent implements IDIYComponent { public static Color SELECTION_COLOR = Color.red; public static Color LABEL_COLOR = Color.black; public static Color LABEL_COLOR_SELECTED = Color.red; - public static Font LABEL_FONT = new Font("Lucida Console", Font.PLAIN, 14); + public static Font LABEL_FONT = new Font("Square721 BT", Font.PLAIN, 14); public static Color METAL_COLOR = Color.decode("#759DAF"); public static Color LIGHT_METAL_COLOR = Color.decode("#EEEEEE"); public static Color COPPER_COLOR = Color.decode("#DA8A67"); diff --git a/diylc/diylc-core/src/org/diylc/core/Project.java b/diylc/diylc-core/src/org/diylc/core/Project.java index 40f6f9c0..428f368a 100644 --- a/diylc/diylc-core/src/org/diylc/core/Project.java +++ b/diylc/diylc-core/src/org/diylc/core/Project.java @@ -53,7 +53,7 @@ public class Project implements Serializable { public static Size DEFAULT_WIDTH = new Size(29d, SizeUnit.cm); public static Size DEFAULT_HEIGHT = new Size(21d, SizeUnit.cm); public static Size DEFAULT_GRID_SPACING = new Size(0.1d, SizeUnit.in); - public static Font DEFAULT_FONT = new Font("Lucida Console", Font.PLAIN, 14); + public static Font DEFAULT_FONT = new Font("Square721 BT", Font.PLAIN, 14); private VersionNumber fileVersion; 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 aa52559a..92d02a85 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", "\u2126"); + value = value.replace("*", "").replace("R", "Ω"); 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 e7c361c1..7ac9bde8 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, "\u2126"), K(1e3, "K"), M(1e6, "M"); + R(1, "Ω"), K(1e3, "K"), M(1e6, "M"); double factor; String display; diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index ac64bd27..730ea64a 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 ac64bd27..730ea64a 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 9484ecd7..1ed6c894 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 5605237c..95da5a37 100644 --- a/diylc/diylc-swing/update.xml +++ b/diylc/diylc-swing/update.xml @@ -2257,7 +2257,11 @@ 2019-01-16 00:00:00.000 CET - + + + IMPROVEMENT + Fixed the issue with Ohm symbol rendering with some fonts and changed default project font back to "Square721 BT" + IMPROVEMENT Better color band rendering on resistors and smarter label positioning