From 8713611a01ee773ff9630a0af084422a0765cb90 Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Sat, 17 May 2008 00:29:33 +0800
Subject: [PATCH] update for EOFM-91
---
xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/TextNodeElement.java | 38 +++++++++++++++-----------------------
1 files changed, 15 insertions(+), 23 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 645b4cf..4b70f52 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
@@ -186,49 +186,47 @@
public int getNumString()
{
- return (int) (raw[19] & 0x0000ffff);
+ return (raw[19] & 0x0000ffff);
}
public int getNodeNumber()
{
- return (int) (raw[20] & 0x0000ffff);
+ return (raw[20] & 0x0000ffff);
}
public int getMaxLength()
{
- return (int) (raw[21] & 0x00ff);
+ return (raw[21] & 0x00ff);
}
public int getMaxUsed()
{
- return (int) ((raw[21] >> 8) & 0x00ff);
+ return ((raw[21] >> 8) & 0x00ff);
}
public int getJustification()
{
- return (int) ((raw[22] >> 8) & 0x00ff);
+ return ((raw[22] >> 8) & 0x00ff);
}
public int getFontIndex()
{
- return (int) (raw[22] & 0x00ff);
+ return (raw[22] & 0x00ff);
}
public double getLineSpacing()
{
int lineSpace;
-
- lineSpace = (int) ((raw[23] << 16) & 0xffff0000);
- lineSpace += (raw[24] & 0x0000ffff);
+ lineSpace = ((raw[23] & 0x0000ffff) << 16) | (raw[24] & 0x0000ffff);
return lineSpace;
}
public double getTextNodeLength()
{
- int lengthMult = -1;
+ int lengthMult;
- lengthMult = (int) ((raw[25] << 16) & 0xffff0000);
+ lengthMult = ((raw[25] << 16) & 0xffff0000);
lengthMult += (raw[26] & 0x0000ffff);
return DgnUtility.converIntToDouble(lengthMult);
@@ -236,9 +234,9 @@
public double getTextNodeHeight()
{
- int heightMult = -1;
+ int heightMult;
- heightMult = (int) ((raw[27] << 16) & 0xffff0000);
+ heightMult = ((raw[27] << 16) & 0xffff0000);
heightMult += (raw[28] & 0x0000ffff);
return DgnUtility.converIntToDouble(heightMult);
@@ -246,8 +244,7 @@
public double getRotationAngle()
{
- int rotation = (int) (raw[29] << 16 & 0xffff0000);
-
+ int rotation = (raw[29] << 16 & 0xffff0000);
rotation += raw[30];
return DgnUtility.converIntToRotation(rotation);
@@ -255,16 +252,11 @@
public Coordinate getOrigin()
{
- int x = (int) ((raw[31] << 16) & 0xffff0000);
-
- x += raw[32] & 0x0000ffff;
-
- // return DgnUtility.convertFromDGN(x);
+ int x = ((raw[31] << 16) & 0xffff0000) | (raw[32] & 0x0000ffff);
double dx = DgnUtility.converUnitToCoord(x);
- int y = (int) ((raw[33] << 16) & 0xffff0000);
+ // return DgnUtility.convertFromDGN(x);
- y += (raw[34] & 0x0000ffff);
-
+ int y = ((raw[33] << 16) & 0xffff0000) | (raw[34] & 0x0000ffff);
double dy = DgnUtility.converUnitToCoord(y);
return new Coordinate(dx, dy);
--
Gitblit v0.0.0-SNAPSHOT