diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar deleted file mode 100644 index d6038669..00000000 Binary files a/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar and /dev/null differ diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/HorizontalAlignment.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/HorizontalAlignment.java index b49f5c9a..e8ef10f4 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/HorizontalAlignment.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/HorizontalAlignment.java @@ -1,5 +1,9 @@ package org.diylc.common; public enum HorizontalAlignment { - LEFT, CENTER, RIGHT + LEFT, CENTER, RIGHT; + + public String toString() { + return name().substring(0, 1) + name().substring(1).toLowerCase(); + } } diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/VerticalAlignment.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/VerticalAlignment.java index bfa665d4..7bfc188d 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/VerticalAlignment.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/VerticalAlignment.java @@ -1,5 +1,9 @@ package org.diylc.common; public enum VerticalAlignment { - TOP, CENTER, BOTTOM + TOP, CENTER, BOTTOM; + + public String toString() { + return name().substring(0, 1) + name().substring(1).toLowerCase(); + } } diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/ProjectFileManager.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/ProjectFileManager.java index 1d95ef4d..35a16d4b 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/ProjectFileManager.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/ProjectFileManager.java @@ -24,7 +24,9 @@ import org.apache.log4j.Logger; import org.diylc.appframework.simplemq.MessageDispatcher; import org.diylc.common.Display; import org.diylc.common.EventType; +import org.diylc.common.HorizontalAlignment; import org.diylc.common.Orientation; +import org.diylc.common.VerticalAlignment; import org.diylc.components.AbstractLeadedComponent; import org.diylc.components.AbstractTransparentComponent; import org.diylc.components.boards.AbstractBoard; @@ -247,9 +249,10 @@ public class ProjectFileManager { label.setColor(color); } label.setText(valueAttr); - label.setCenter(false); + label.setHorizontalAlignment(HorizontalAlignment.LEFT); + label.setVerticalAlignment(VerticalAlignment.CENTER); label.setControlPoint(convertV1CoordinatesToV3Point(referencePoint, x1Attr, - y1Attr + 1), 0); + y1Attr), 0); component = label; } else if (nodeName.equalsIgnoreCase("pad")) { LOG.debug("Recognized " + nodeName); @@ -431,7 +434,7 @@ public class ProjectFileManager { pot.setSpacing(new Size(0.2, SizeUnit.in)); pot.setName(nameAttr); try { - pot.setResistance(Resistance.parseResistance(valueAttr)); + pot.setValue(Resistance.parseResistance(valueAttr)); } catch (Exception e) { LOG.debug("Could not set value of " + nameAttr); }