/trunk/libraries/libDwg/src/com/iver/cit/jdwglib/dwg/readers/DwgFileV12Reader.java - Diff - | gvSIG desktop 1 - gvSIG

Revision 10820 trunk/libraries/libDwg/src/com/iver/cit/jdwglib/dwg/readers/DwgFileV12Reader.java

     	private DwgFile dwgFile;
     	private ByteBuffer bb;
     	ArrayList readers = new ArrayList();
     	/*
     	 * En Python:
     	 *  if _version != 'AC1009':
             if _version == 'AC1010':
                 r13 = True
             else:
                 print "unknown version"
+    	 *
     	 * */
     	private boolean r13 = false;
     	int index = 0;
-...
     			byte[] header = new byte[12];
     			bb.get(header);
     			String headerStr = new String(header);
     			System.out.println(headerStr);
     //		    (_b1, _w1, _w2, _w3, _b2) = struct.unpack("<BhhhB", handle.read(8))
     			bb.order(ByteOrder.LITTLE_ENDIAN);
-...
     			short style = bb.getShort();
     			short crc = bb.getShort();
     			//TODO Vemos si el indice que ocupa la layer en la tabla
     			//de layers se corresponde con el valor short de las entidades
     			//graficas
     			DwgHandleReference handle = new DwgHandleReference(0x5, i);
     			layer.setHandle(handle);
     			dwgFile.addDwgObject(layer);
-...
     			double[] pt10 = getPoint(false);
     			blk.setBasePoint(pt10);
     			String blockName = getString();
     			blk.setName(blockName);
     			Block block = getBlock(blockName);
     			if(block == null){
     				System.out.println(blockName+" no encontrado en la tabla de bloques");
+    			}
     			//TODO En DWG 12 no se distingue Block de BlockHeader, en ulteriores
     			//versiones si
     			//REVISAR EL CASO DE LOS BLOQUES
     			if((opts & 0x2) > 0)
+    			{
     				//puede ser que se trate de referencias
-...
+    	}
     	class EndBlkReader implements EntityReader{
     		public void read(ByteBuffer bb, byte flags, short opts, DwgObject dwgObj) {
     			System.out.println("endblk");
+    		}
+    	}
-...
     			bb.order(ByteOrder.nativeOrder());
     			short w1 = bb.getShort();//Puede ser este el identificador de bloque???
     			DwgHandleReference blockHandle = new
     				DwgHandleReference(0x5, w1);
     			insert.setBlockHeaderHandle(blockHandle);
     			double[] pt10 = getPoint(false);
     			insert.setInsertionPoint(pt10);
     			bb.order(ByteOrder.LITTLE_ENDIAN);
     			double x = 0d, y = 0d, z = 0d;
-...
     		byte curveType75;
     		private void reset(){
     			flag70 = 0;
     			meshM71 = 0;
     			meshN72 = 0;
     			startW40 = 0;
     			smoothM73 = 0;
     			smoothN74 = 0;
     			curveType75 = 0;
+    		}
     		public void read(ByteBuffer bb, byte flags, short opts, DwgObject dwgObj) {
     			super.read(bb, flags, opts, dwgObj);
-...
+    				}
+    			}
     			reset();
     			return solution;
+    		}
-...
     		 * */
     		byte vertexFlag70;
     		/**
     		 * If the vertex is a pfaceface vertex it hasnt real coordinates.
     		 * Instead it has an index for each vertex of the mesh's face
     		 * */
     		int[] pfacefaceIndex;
     		void reset(){
     			pt10 = null;
     			startWidth40 = 0;
     			endWidth41 = 0;
     			tangentDir50 = 0;
     			vertexFlag70 = 0;
     			pfacefaceIndex = null;
+    		}
     		/*
     		 * azabala
     		 * Nos estabamos encontrando con vertices muy raros
     		 * (e incluso con valores NaN) cuando el valor de opts
     		 * es 16872, si seguiamos al pie de la letra la especificaci?n
     		 * de http://www.iwriteiam.nl/DWG12.html o Pythoncad.
+    		 *
     		 * Haciendo un poco de ingenieria inversa hemos visto que
     		 * si opts==16872, hay que modificar el algoritmo
     		 * */
     		public void read(ByteBuffer bb, byte flags, short opts, DwgObject dwgObj) {
     			super.read(bb, flags, opts, dwgObj);
     			pt10 = getPoint(false);
     			bb.order(ByteOrder.LITTLE_ENDIAN);
     			if((opts & 0x1) > 0){
     				startWidth40 = bb.getDouble();
     			if(opts != 16872){
     				int position = bb.position();
     				pt10 = getPoint(false);
     if(pt10[0] < 0 || pt10[0] < 600000 || pt10[0] > 800000){
     System.currentTimeMillis();
+    }
     				bb.order(ByteOrder.LITTLE_ENDIAN);
     				if((opts & 0x1) > 0){
     					startWidth40 = bb.getDouble();
+    				}
     				if((opts & 0x2) > 0){
     					endWidth41 = bb.getDouble();
+    				}
     				if((opts & 0x4) > 0){
     					tangentDir50 = bb.getDouble();
+    				}
     				if((opts & 0x8) > 0){
     					vertexFlag70 = bb.get();
+    				}
     			}else{
     				//if opts == 16872 (decimal) we invert the
     				//order of the reading
     				bb.order(ByteOrder.LITTLE_ENDIAN);
     				if((opts & 0x1) > 0){
     					startWidth40 = bb.getDouble();
+    				}
     				if((opts & 0x2) > 0){
     					endWidth41 = bb.getDouble();
+    				}
     				if((opts & 0x4) > 0){
     					tangentDir50 = bb.getDouble();
+    				}
     				if((opts & 0x8) > 0){
     					vertexFlag70 = bb.get();
+    				}
     				int p1 = bb.getShort();
     				int p2 = bb.getShort();
     				int p3 = bb.getShort();
     				int p4 = bb.getShort();
     				pfacefaceIndex = new int[]{p1,p2,p3,p4};
+    			}
     			if((opts & 0x2) > 0){
     				endWidth41 = bb.getDouble();
+    			}
     			if((opts & 0x4) > 0){
     				tangentDir50 = bb.getDouble();
+    			}
     			if((opts & 0x8) > 0){
     				vertexFlag70 = bb.get();
+    			}
+    		}
     		DwgObject getDwgObject(int index) {
-...
     					 	The vertex indexes that define the mesh are given by 71,
 , 73, and 74 groups, the values of which are integers
     					 	specifying one of the previously defined vertices by
     					 	index. If the index is negative, the edge that begins with
     					 	that vertex is invisible. The first zero vertex marks the
     					 	end of the vertices of the face. Since the 71 through 74
     					 	index.
     					 	If the index is negative, the edge that begins with
     					 	that vertex is invisible.
     					 	The first zero vertex marks the
     					 	end of the vertices of the face.
     					 	Since the 71 through 74
     					 	groups are optional fields with default values of zero,
     					 	they are present in DXF only if nonzero."
     					 But DWG 12 spec doesnt say anything about 71,72,73 and
 fields for VERTEX.
     					 * */
     					solution = new DwgVertexPFaceFace(index);
     					((DwgVertexPFaceFace)solution).setVerticesidx(pfacefaceIndex);
+    				}
     			}else if( (vertexFlag70 & POLYLINE_3D) != 0){
     				solution = new DwgVertex3D(index);
-...
     				((DwgVertex2D)solution).setPoint(pt10);
     				((DwgVertex2D)solution).setFlags(vertexFlag70);
+    			}
     			reset();
     			return solution;
+    		}
+    	}
-...
     				if( (entity instanceof IDwgVertex) && (currentPolyline != null)){
     					currentPolyline.addVertex((IDwgVertex) entity);
     				}else if( (entity instanceof IDwgBlockMember) && (currentBlock != null)){
     				}else if( (entity instanceof IDwgBlockMember) &&
     						!(entity instanceof IDwgVertex) &&
     						(currentBlock != null)){
     					//In DWG 12 vertex is not part of Block.
     					//its part of a polyline (which is part of a block)
     					currentBlock.addObject(entity);
     				} else{
     //					if(! paperSpace)//TODO solo a?adimos las entidades en espacio modelo????
-...
     		short w1 = bb.getShort();
     		double[] inBase = getPoint(true);
     		double[] extMin = getPoint(true);
     		dwgFile.setHeader("MSPACE_EXTMIN", extMin);
     		double[] extMax = getPoint(true);
     		dwgFile.setHeader("MSPACE_EXTMAX", extMax);
     		double[] limMin = getPoint(false);
     		double[] limMax = getPoint(false);
-...
     		bb.position(0x3ef);
+    	}
     	class Dwg12Table{
     		short s1;
     		int i1;

Also available in: Unified diff