From efeaf92ccb0a1b935660b2038443e858e6b5a467 Mon Sep 17 00:00:00 2001 From: bancika Date: Mon, 24 Jan 2011 20:12:51 +0000 Subject: [PATCH] ability to center label --- .../DIYLC/config.xml | 8 +++---- .../DIYLC/library/main.jar | Bin 54877 -> 54991 bytes .../diylc/presenter/ProjectFileManager.java | 13 ++++++----- .../src/org/diylc/components/misc/Label.java | 22 +++++++++++++++--- 4 files changed, 30 insertions(+), 13 deletions(-) diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml b/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml index 567e6f8a..29030c88 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml @@ -1,15 +1,15 @@ - lastPath - C:\Documents and Settings\Branislav Stojkovic\Desktop\oldFiles + metric + true zoom 1.0 - metric - true + lastPath + C:\Documents and Settings\Branislav Stojkovic\Desktop\oldFiles default.org.diylc.components.misc.Label:Color diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar index 7ab1a3b621f07ce1fdba34dcfd9dbdd4b7313e8b..2005e958ca2570bc709de6997b488c76634b9a97 100644 GIT binary patch delta 2827 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 EHyQ-c)c^nh diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/ProjectFileManager.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/ProjectFileManager.java index e06574f1..c20c71b9 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/ProjectFileManager.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/ProjectFileManager.java @@ -206,15 +206,16 @@ public class ProjectFileManager { IDIYComponent component = null; if (nodeName.equalsIgnoreCase("text")) { LOG.debug("Recognized " + nodeName); - Label pad = new Label(); - pad.setName(nameAttr); + Label label = new Label(); + label.setName(nameAttr); if (color != null) { - pad.setColor(color); + label.setColor(color); } - pad.setText(valueAttr); - pad.setControlPoint(convertV1CoordinatesToV3Point(referencePoint, x1Attr, + label.setText(valueAttr); + label.setCenter(false); + label.setControlPoint(convertV1CoordinatesToV3Point(referencePoint, x1Attr, y1Attr), 0); - component = pad; + component = label; } else if (nodeName.equalsIgnoreCase("pad")) { LOG.debug("Recognized " + nodeName); SolderPad pad = new SolderPad(); diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/Label.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/Label.java index faccec9b..b8164540 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/Label.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/Label.java @@ -27,6 +27,7 @@ public class Label extends AbstractComponent { private String text = DEFAULT_TEXT; private Font font = LABEL_FONT; private Color color = LABEL_COLOR; + private boolean center = true; @Override public void draw(Graphics2D g2d, ComponentState componentState, Project project, @@ -39,9 +40,16 @@ public class Label extends AbstractComponent { int textHeight = (int) rect.getHeight(); int textWidth = (int) rect.getWidth(); - // Center text horizontally and vertically - int x = point.x - textWidth / 2; - int y = point.y - textHeight / 2 + fontMetrics.getAscent(); + int x; + int y; + if (center) { + // Center text horizontally and vertically + x = point.x - textWidth / 2; + y = point.y - textHeight / 2 + fontMetrics.getAscent(); + } else { + x = point.x; + y = point.y - textHeight; + } g2d.drawString(text, x, y); } @@ -107,6 +115,14 @@ public class Label extends AbstractComponent { this.color = color; } + public boolean getCenter() { + return center; + } + + public void setCenter(boolean center) { + this.center = center; + } + @Override public String getName() { return super.getName();