Revision 23112

View differences:

branches/v10/libraries/libDwg/src/com/iver/cit/jdwglib/dwg/readers/objreaders/v2004/DwgVertexMeshReader2004.java
63 63
import com.iver.cit.jdwglib.dwg.objects.DwgVertexMesh;
64 64

  
65 65
public class DwgVertexMeshReader2004 extends AbstractDwg2004Reader {
66
	
66

  
67 67
    //similar to DwgVertex3D (and all derived vertices...
68 68
	//apply inheritance
69 69
	public void readSpecificObj(int[] data, int offset, DwgObject dwgObj)
70 70
			throws RuntimeException, CorruptedDwgEntityException {
71 71
		 if(! (dwgObj instanceof DwgVertexMesh))
72
		    	throw new RuntimeException("ArcReader 2004 solo puede leer DwgVertexMesh");
72
		    	throw new RuntimeException("DwgVertexMeshReader2004 solo puede leer DwgVertexMesh");
73 73
		 DwgVertexMesh v = (DwgVertexMesh) dwgObj;
74 74
		 int bitPos = offset;
75 75
		 bitPos = readObjectHeader(data, bitPos, v);
76
		 
76

  
77 77
		 List val = DwgUtil.getRawChar(data, bitPos);
78 78
		 bitPos = ((Integer) val.get(0)).intValue();
79 79
		 int flag = ((Integer) val.get(1)).intValue();
80 80
		 v.setFlags(flag);
81
		 
81

  
82 82
		 val = DwgUtil.getBitDouble(data, bitPos);
83 83
		 bitPos = ((Integer) val.get(0)).intValue();
84 84
		 double x = ((Double) val.get(1)).doubleValue();
85
		 
85

  
86 86
		 val = DwgUtil.getBitDouble(data, bitPos);
87 87
		 bitPos = ((Integer) val.get(0)).intValue();
88 88
		 double y = ((Double) val.get(1)).doubleValue();
89
		 
89

  
90 90
		 val = DwgUtil.getBitDouble(data, bitPos);
91 91
		 bitPos = ((Integer) val.get(0)).intValue();
92 92
		 double z = ((Double) val.get(1)).doubleValue();
93 93
		 v.setPoint(new double[]{x, y, z});
94
		 
94

  
95 95
		 bitPos = readObjectTailer(data, bitPos, v);
96 96
	}
97 97

  
branches/v10/libraries/libDwg/src/com/iver/cit/jdwglib/dwg/readers/objreaders/v2004/DwgVertexPFaceFaceReader2004.java
68 68
			throws RuntimeException, CorruptedDwgEntityException {
69 69
		
70 70
		 if(! (dwgObj instanceof DwgVertexPFaceFace))
71
		    	throw new RuntimeException("ArcReader 2004 solo puede leer DwgVertexPFaceFace");
71
		    	throw new RuntimeException("DwgVertexPFaceFaceReader2004 solo puede leer DwgVertexPFaceFace");
72 72
		 DwgVertexPFaceFace v = (DwgVertexPFaceFace) dwgObj;
73 73
		 
74 74
		 int bitPos = offset;
branches/v10/libraries/libDwg/src/com/iver/cit/jdwglib/dwg/readers/objreaders/v2004/DwgVertexPFaceReader2004.java
63 63
import com.iver.cit.jdwglib.dwg.objects.DwgVertexPFace;
64 64

  
65 65
public class DwgVertexPFaceReader2004 extends AbstractDwg2004Reader {
66
	//similar al reader de la versin 13-14
66
	//similar al reader de la versión 13-14
67 67
	public void readSpecificObj(int[] data, int offset, DwgObject dwgObj)
68 68
			throws RuntimeException, CorruptedDwgEntityException {
69
		
69

  
70 70
		 if(! (dwgObj instanceof DwgVertexPFace))
71
		    	throw new RuntimeException("ArcReader 2004 solo puede leer DwgVertexPFace");
71
		    	throw new RuntimeException("DwgVertexPFaceReader2004 solo puede leer DwgVertexPFace");
72 72
		 DwgVertexPFace v = (DwgVertexPFace) dwgObj;
73
		
73

  
74 74
		 int bitPos = offset;
75 75
		 bitPos = readObjectHeader(data, bitPos, v);
76
		 
76

  
77 77
		 List val = DwgUtil.getRawChar(data, bitPos);
78 78
		 bitPos = ((Integer) val.get(0)).intValue();
79 79
		 int flags = ((Integer) val.get(1)).intValue();
80 80
		 v.setFlags(flags);
81
		 
81

  
82 82
		 val = DwgUtil.getBitDouble(data, bitPos);
83 83
		 bitPos = ((Integer) val.get(0)).intValue();
84 84
		 double x = ((Double) val.get(1)).doubleValue();
85
		
85

  
86 86
		 val = DwgUtil.getBitDouble(data, bitPos);
87 87
		 bitPos = ((Integer) val.get(0)).intValue();
88 88
		 double y = ((Double) val.get(1)).doubleValue();
89
		 
89

  
90 90
		 val = DwgUtil.getBitDouble(data, bitPos);
91 91
		 bitPos = ((Integer) val.get(0)).intValue();
92 92
		 double z = ((Double) val.get(1)).doubleValue();
93 93
		 v.setPoint(new double[]{x, y, z});
94
		 
94

  
95 95
		 bitPos = readObjectTailer(data, bitPos, v);
96 96
	}
97 97

  
branches/v10/libraries/libDwg/src/com/iver/cit/jdwglib/dwg/readers/objreaders/v2004/DwgLinearDimensionReader2004.java
26 26
	 */
27 27
	public void readSpecificObj(int[] data, int offset, DwgObject dwgObj) throws RuntimeException, CorruptedDwgEntityException {
28 28
		if(! (dwgObj instanceof DwgLinearDimension))
29
			throw new RuntimeException("ArcReader 2004 solo puede leer DwgLinearDimension");
29
			throw new RuntimeException("DwgLinearDimensionReader2004 solo puede leer DwgLinearDimension");
30 30
		DwgLinearDimension dim = (DwgLinearDimension) dwgObj;
31 31
		int bitPos = offset;
32 32
		bitPos = readObjectHeader(data, bitPos, dwgObj);
33
		
33

  
34 34
		ArrayList v = DwgUtil.getBitDouble(data, bitPos);
35 35
		bitPos = ((Integer)v.get(0)).intValue();
36 36
		double x = ((Double)v.get(1)).doubleValue();
......
41 41
		bitPos = ((Integer)v.get(0)).intValue();
42 42
		double z = ((Double)v.get(1)).doubleValue();
43 43
		dim.setExtrusion(new double[]{x, y, z});
44
		
44

  
45 45
		v = DwgUtil.getRawDouble(data, bitPos);
46 46
		bitPos = ((Integer)v.get(0)).intValue();
47 47
		x = ((Double)v.get(1)).doubleValue();
......
49 49
		bitPos = ((Integer)v.get(0)).intValue();
50 50
		y = ((Double)v.get(1)).doubleValue();
51 51
		dim.setTextMidpoint(new Point2D.Double(x, y));
52
		
52

  
53 53
		v = DwgUtil.getBitDouble(data, bitPos);
54 54
		bitPos = ((Integer)v.get(0)).intValue();
55 55
		double val = ((Double)v.get(1)).doubleValue();
56 56
		dim.setElevation(val);
57
		
57

  
58 58
		v = DwgUtil.getRawChar(data, bitPos);
59 59
		bitPos = ((Integer)v.get(0)).intValue();
60 60
		int flags = ((Integer)v.get(1)).intValue();
61 61
		dim.setFlags(flags);
62
		
62

  
63 63
		v = DwgUtil.getTextString(data, bitPos);
64 64
		bitPos = ((Integer)v.get(0)).intValue();
65 65
		String text = (String)v.get(1);
66 66
		dim.setText(text);
67
		
67

  
68 68
		v = DwgUtil.getBitDouble(data, bitPos);
69 69
		bitPos = ((Integer)v.get(0)).intValue();
70 70
		val = ((Double)v.get(1)).doubleValue();
71 71
		dim.setRotation(val);
72
		
72

  
73 73
		v = DwgUtil.getBitDouble(data, bitPos);
74 74
		bitPos = ((Integer)v.get(0)).intValue();
75 75
		val = ((Double)v.get(1)).doubleValue();
76 76
		dim.setHorizDir(val);
77
		
77

  
78 78
		v = DwgUtil.getBitDouble(data, bitPos);
79 79
		bitPos = ((Integer)v.get(0)).intValue();
80 80
		x = ((Double)v.get(1)).doubleValue();
......
85 85
		bitPos = ((Integer)v.get(0)).intValue();
86 86
		z = ((Double)v.get(1)).doubleValue();
87 87
		dim.setInsScale(new double[]{x, y, z});
88
		
88

  
89 89
		v = DwgUtil.getBitDouble(data, bitPos);
90 90
		bitPos = ((Integer)v.get(0)).intValue();
91 91
		val = ((Double)v.get(1)).doubleValue();
92 92
		dim.setInsRotation(val);
93
		
93

  
94 94
		v = DwgUtil.getBitShort(data, bitPos);
95 95
		bitPos = ((Integer)v.get(0)).intValue();
96 96
		int ap = ((Integer)v.get(1)).intValue();
97 97
		dim.setAttachmentPoint(ap);
98
		
98

  
99 99
		v = DwgUtil.getBitShort(data, bitPos);
100 100
		bitPos = ((Integer)v.get(0)).intValue();
101 101
		int lss = ((Integer)v.get(1)).intValue();
102 102
		dim.setLinespaceStyle(lss);
103
		
103

  
104 104
		v = DwgUtil.getBitDouble(data, bitPos);
105 105
		bitPos = ((Integer)v.get(0)).intValue();
106 106
		val = ((Double)v.get(1)).doubleValue();
107 107
		dim.setLinespaceFactor(val);
108
		
108

  
109 109
		v = DwgUtil.getBitDouble(data, bitPos);
110 110
		bitPos = ((Integer)v.get(0)).intValue();
111 111
		val = ((Double)v.get(1)).doubleValue();
112 112
		dim.setActualMeasurement(val);
113
		
113

  
114 114
		v = DwgUtil.getRawDouble(data, bitPos);
115 115
		bitPos = ((Integer)v.get(0)).intValue();
116 116
		x = ((Double)v.get(1)).doubleValue();
......
118 118
		bitPos = ((Integer)v.get(0)).intValue();
119 119
		val = ((Double)v.get(1)).doubleValue();
120 120
		dim.setPt12(new Point2D.Double(x, y));
121
		
121

  
122 122
		v = DwgUtil.getBitDouble(data, bitPos);
123 123
		bitPos = ((Integer)v.get(0)).intValue();
124 124
		x = ((Double)v.get(1)).doubleValue();
......
129 129
		bitPos = ((Integer)v.get(0)).intValue();
130 130
		z = ((Double)v.get(1)).doubleValue();
131 131
		dim.setPt10(new double[]{x, y, z});
132
		
132

  
133 133
		v = DwgUtil.getBitDouble(data, bitPos);
134 134
		bitPos = ((Integer)v.get(0)).intValue();
135 135
		x = ((Double)v.get(1)).doubleValue();
......
140 140
		bitPos = ((Integer)v.get(0)).intValue();
141 141
		z = ((Double)v.get(1)).doubleValue();
142 142
		dim.setPt13(new double[]{x, y, z});
143
		
143

  
144 144
		v = DwgUtil.getBitDouble(data, bitPos);
145 145
		bitPos = ((Integer)v.get(0)).intValue();
146 146
		x = ((Double)v.get(1)).doubleValue();
......
151 151
		bitPos = ((Integer)v.get(0)).intValue();
152 152
		z = ((Double)v.get(1)).doubleValue();
153 153
		dim.setPt14(new double[]{x, y, z});
154
		
154

  
155 155
		v = DwgUtil.getBitDouble(data, bitPos);
156 156
		bitPos = ((Integer)v.get(0)).intValue();
157 157
		val = ((Double)v.get(1)).doubleValue();
158 158
		dim.setExtRotation(val);
159
		
159

  
160 160
		v = DwgUtil.getBitDouble(data, bitPos);
161 161
		bitPos = ((Integer)v.get(0)).intValue();
162 162
		val = ((Double)v.get(1)).doubleValue();
163 163
		dim.setDimensionRotation(val);
164
		
164

  
165 165
		bitPos = readObjectTailer(data, bitPos, dim);
166
		
166

  
167 167
		DwgHandleReference hr = new DwgHandleReference();
168 168
		bitPos = hr.read(data, bitPos);
169 169
		dim.setDimstyleHandle(hr);

Also available in: Unified diff