From 0acf7a49b2da4dd1873d64012ba360eaf51754f4 Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Thu, 15 May 2008 10:42:55 +0800
Subject: [PATCH] update for EOFM-83
---
xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/TextNodeElement.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/TextNodeElement.java b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/TextNodeElement.java
index eef53c2..645b4cf 100644
--- a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/TextNodeElement.java
+++ b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/TextNodeElement.java
@@ -8,9 +8,13 @@
import java.util.List;
import java.util.ListIterator;
+import org.apache.log4j.Logger;
+
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.GeometryFactory;
+
+import com.ximple.util.DgnUtility;
/**
* TextNodeElement
@@ -21,7 +25,9 @@
*/
public class TextNodeElement extends Element implements ComplexElement, GeometryConverter
{
- ArrayList list = new ArrayList();
+ private static final Logger logger = Logger.getLogger(TextElement.class);
+
+ private ArrayList list = new ArrayList();
public TextNodeElement(byte[] raw)
{
@@ -225,7 +231,7 @@
lengthMult = (int) ((raw[25] << 16) & 0xffff0000);
lengthMult += (raw[26] & 0x0000ffff);
- return Utility.converIntToDouble(lengthMult);
+ return DgnUtility.converIntToDouble(lengthMult);
}
public double getTextNodeHeight()
@@ -235,7 +241,7 @@
heightMult = (int) ((raw[27] << 16) & 0xffff0000);
heightMult += (raw[28] & 0x0000ffff);
- return Utility.converIntToDouble(heightMult);
+ return DgnUtility.converIntToDouble(heightMult);
}
public double getRotationAngle()
@@ -244,7 +250,7 @@
rotation += raw[30];
- return Utility.converIntToRotation(rotation);
+ return DgnUtility.converIntToRotation(rotation);
}
public Coordinate getOrigin()
@@ -253,13 +259,13 @@
x += raw[32] & 0x0000ffff;
- // return Utility.convertFromDGN(x);
- double dx = Utility.converUnitToCoord(x);
+ // return DgnUtility.convertFromDGN(x);
+ double dx = DgnUtility.converUnitToCoord(x);
int y = (int) ((raw[33] << 16) & 0xffff0000);
y += (raw[34] & 0x0000ffff);
- double dy = Utility.converUnitToCoord(y);
+ double dy = DgnUtility.converUnitToCoord(y);
return new Coordinate(dx, dy);
}
--
Gitblit v0.0.0-SNAPSHOT