Revision 10632 trunk/libraries/libDwg/src/com/iver/cit/jdwglib/dwg/objects/DwgLine.java

View differences:

DwgLine.java
35 35
package com.iver.cit.jdwglib.dwg.objects;
36 36

  
37 37
import java.awt.geom.Point2D;
38
import java.util.ArrayList;
38 39
import java.util.List;
39 40
import java.util.Map;
40 41

  
......
45 46
import com.iver.cit.jdwglib.dwg.IDwg2FMap;
46 47
import com.iver.cit.jdwglib.dwg.IDwg3DTestable;
47 48
import com.iver.cit.jdwglib.dwg.IDwgBlockMember;
48
import com.iver.cit.jdwglib.dwg.IDwgExtrusionable;
49 49
import com.iver.cit.jdwglib.util.AcadExtrusionCalculator;
50 50
import com.iver.cit.jdwglib.util.FMapUtil;
51 51

  
......
197 197
	public FShape toFMapGeometry(boolean is3DFile) {
198 198
		FPolyline2D line = null;
199 199
		double[] p1 = getP1();
200
		Point2D point1 = new Point2D.Double(p1[0], p1[1]);
201 200
		double[] p2 = getP2();
202
		Point2D point2 = new Point2D.Double(p2[0], p2[1]);
203
		Point2D[] lin = new Point2D[] { point1, point2 };
204 201
		if (is3DFile && isZflag()) {
205
			double[][] lin3D = new double[2][3];
206
			lin3D[0][0] = lin[0].getX();
207
			lin3D[0][1] = lin[0].getY();
208
			lin3D[0][2] = p1[2];
209
			lin3D[1][0] = lin[1].getX();
210
			lin3D[1][1] = lin[1].getY();
211
			lin3D[1][2] = p2[2];
202
			List lin3D = new ArrayList();
203
			lin3D.add(p1);
204
			lin3D.add(p2);
212 205
			line = FMapUtil.points3DToFPolyline3D(lin3D);
213 206
		} else if (is3DFile && ! isZflag()) {
214
			double[][] lin3D = new double[2][3];
215
			lin3D[0][0] = lin[0].getX();
216
			lin3D[0][1] = lin[0].getY();
217
			lin3D[0][2] = 0.0;
218
			lin3D[1][0] = lin[1].getX();
219
			lin3D[1][1] = lin[1].getY();
220
			lin3D[1][2] = 0.0;
207
			List lin3D = new ArrayList();
208
			p1[2] = 0d;
209
			p2[2] = 0d;
210
			lin3D.add(p1);
211
			lin3D.add(p2);
221 212
			line = FMapUtil.points3DToFPolyline3D(lin3D);
222 213
		} else {
214
			List lin = new ArrayList();
215
			lin.add(p1);
216
			lin.add(p2);
223 217
			line = FMapUtil.points2DToFPolyline2D(lin);
224 218
		}
225 219
		return line;

Also available in: Unified diff