Revision 34899 branches/v2_0_0_prep/libraries/libFMap_dalfile/src/org/gvsig/fmap/dal/store/dxf/DXFStoreProvider.java
| DXFStoreProvider.java | ||
|---|---|---|
| 608 | 608 |
.getGeometry(); |
| 609 | 609 |
Point3D pto = new Point3D(); |
| 610 | 610 |
pto = point.getPoint3D(0); |
| 611 |
org.gvsig.fmap.geom.primitive.Point geom = (org.gvsig.fmap.geom.primitive.Point)gManager.create(TYPES.POINT , SUBTYPES.GEOM2DZ);
|
|
| 611 |
org.gvsig.fmap.geom.primitive.Point geom = (org.gvsig.fmap.geom.primitive.Point)gManager.create(TYPES.POINT , SUBTYPES.GEOM3D);
|
|
| 612 | 612 |
geom.setX(pto.getX()); |
| 613 | 613 |
geom.setY(pto.getY()); |
| 614 | 614 |
geom.setCoordinateAt(2, pto.getZ()); |
| ... | ... | |
| 658 | 658 |
for (int j = 0; j < pts.length; j++) {
|
| 659 | 659 |
elevations[j] = pts[j].getZ(); |
| 660 | 660 |
} |
| 661 |
Curve geom = (Curve)gManager.create(TYPES.CURVE , SUBTYPES.GEOM2DZ);
|
|
| 661 |
Curve geom = (Curve)gManager.create(TYPES.CURVE , SUBTYPES.GEOM3D);
|
|
| 662 | 662 |
geom.setGeneralPath(genPathX); |
| 663 | 663 |
for (int j=0 ; j<elevations.length ; j++){
|
| 664 | 664 |
geom.setCoordinateAt(j, 2, elevations[j]); |
| ... | ... | |
| 711 | 711 |
for (int j = 0; j < pts.length; j++) {
|
| 712 | 712 |
elevations[j] = pts[j].getZ(); |
| 713 | 713 |
} |
| 714 |
Surface geom = (Surface)gManager.create(TYPES.SURFACE , SUBTYPES.GEOM2DZ);
|
|
| 714 |
Surface geom = (Surface)gManager.create(TYPES.SURFACE , SUBTYPES.GEOM3D);
|
|
| 715 | 715 |
geom.setGeneralPath(genPathX); |
| 716 | 716 |
for (int j=0 ; j<elevations.length ; j++){
|
| 717 | 717 |
geom.setCoordinateAt(j, 2, elevations[j]); |
| ... | ... | |
| 787 | 787 |
Geometry geom = feature.getDefaultGeometry(); |
| 788 | 788 |
GeometryType type = geom.getGeometryType(); |
| 789 | 789 |
|
| 790 |
if ((TYPES.POINT == type.getType()) && (SUBTYPES.GEOM2DZ == type.getSubType())) {
|
|
| 790 |
if ((TYPES.POINT == type.getType()) && (SUBTYPES.GEOM3D == type.getSubType())) {
|
|
| 791 | 791 |
dxf3DFile = true; |
| 792 | 792 |
k = createPoint3D(handle, k, feature); |
| 793 | 793 |
|
| 794 | 794 |
} else if ((TYPES.POINT == type.getType()) && (SUBTYPES.GEOM2D == type.getSubType())) {
|
| 795 | 795 |
k = createPoint2D(handle, k, feature); |
| 796 | 796 |
|
| 797 |
} else if ((TYPES.CURVE == type.getType()) && (SUBTYPES.GEOM2DZ == type.getSubType())) {
|
|
| 797 |
} else if ((TYPES.CURVE == type.getType()) && (SUBTYPES.GEOM3D == type.getSubType())) {
|
|
| 798 | 798 |
dxf3DFile = true; |
| 799 | 799 |
k = createPolyline3D(handle, k, feature); |
| 800 | 800 |
|
| ... | ... | |
| 804 | 804 |
} else if ((TYPES.CURVE == type.getType()) && (SUBTYPES.GEOM2D == type.getSubType())) {
|
| 805 | 805 |
k = createLwPolyline2D(handle, k, feature, false); |
| 806 | 806 |
|
| 807 |
} else if ((TYPES.SURFACE == type.getType()) && (SUBTYPES.GEOM2DZ == type.getSubType())) {
|
|
| 807 |
} else if ((TYPES.SURFACE == type.getType()) && (SUBTYPES.GEOM3D == type.getSubType())) {
|
|
| 808 | 808 |
dxf3DFile = true; |
| 809 | 809 |
k = createPolyline3D(handle, k, feature); |
| 810 | 810 |
|
| ... | ... | |
| 965 | 965 |
if (hasText(feature)) {
|
| 966 | 966 |
return createText3D(handle, k, feature); |
| 967 | 967 |
} |
| 968 |
org.gvsig.fmap.geom.primitive.Point point = (org.gvsig.fmap.geom.primitive.Point)geomManager.create(TYPES.POINT, SUBTYPES.GEOM2DZ);
|
|
| 968 |
org.gvsig.fmap.geom.primitive.Point point = (org.gvsig.fmap.geom.primitive.Point)geomManager.create(TYPES.POINT, SUBTYPES.GEOM3D);
|
|
| 969 | 969 |
double[] pointCoords = new double[6]; |
| 970 | 970 |
PathIterator pointIt = (feature.getDefaultGeometry()) |
| 971 | 971 |
.getPathIterator(null); |
| 972 | 972 |
while (!pointIt.isDone()) {
|
| 973 | 973 |
pointIt.currentSegment(pointCoords); |
| 974 |
point = (org.gvsig.fmap.geom.primitive.Point)geomManager.create(TYPES.POINT, SUBTYPES.GEOM2DZ);
|
|
| 974 |
point = (org.gvsig.fmap.geom.primitive.Point)geomManager.create(TYPES.POINT, SUBTYPES.GEOM3D);
|
|
| 975 | 975 |
point.setCoordinateAt(0, pointCoords[0]); |
| 976 | 976 |
point.setCoordinateAt(1, pointCoords[1]); |
| 977 | 977 |
point.setCoordinateAt(2, pointCoords[2]); |
| 978 | 978 |
pointIt.next(); |
| 979 | 979 |
} |
| 980 |
org.gvsig.fmap.geom.primitive.Point pto = (org.gvsig.fmap.geom.primitive.Point)geomManager.create(TYPES.POINT, SUBTYPES.GEOM2DZ);
|
|
| 980 |
org.gvsig.fmap.geom.primitive.Point pto = (org.gvsig.fmap.geom.primitive.Point)geomManager.create(TYPES.POINT, SUBTYPES.GEOM3D);
|
|
| 981 | 981 |
pto.setCoordinateAt(0, point.getCoordinateAt(0)); |
| 982 | 982 |
pto.setCoordinateAt(1, point.getCoordinateAt(1)); |
| 983 | 983 |
pto.setCoordinateAt(2, point.getCoordinateAt(2)); |
Also available in: Unified diff