/ - Diff - | gvSIG desktop 1 - gvSIG

Revision 10183

     import java.nio.ByteBuffer;
     import java.nio.ByteOrder;
     import java.util.ArrayList;
     import java.util.HashMap;
     import java.util.List;
     import java.util.Map;
     import org.apache.log4j.Logger;
-...
     import com.iver.cit.jdwglib.dwg.DwgObjectFactory;
     import com.iver.cit.jdwglib.dwg.DwgObjectOffset;
     import com.iver.cit.jdwglib.dwg.DwgUtil;
     import com.iver.cit.jdwglib.dwg.objects.DwgLwPolyline;
     /**
      * The DwgFileV14Reader reads the DWG version 14 format
-...
     	private static Logger logger = Logger.
     		getLogger(DwgFileV14Reader.class.getName());
     	int numPolylinesWrong = 0;
     	/**
     	 * Reads the DWG version 15 format
+    	 *
-...
     		byte[] data = new byte[size];
     		bb.get(data);
     		/*
     		 * J.Morell hacia esto para leer los datos como int[]
     		   int[] data = new int[size];
     			for (int i=0; i < size; i++) {
     				dataBytes[i] = bb.get();
     				dataMachValString[i] = HexUtil.bytesToHex(new byte[]{dataBytes[i]});
     				Integer dataMachValShort = Integer.decode("0x" + dataMachValString[i]);
     				data[i] = dataMachValShort.byteValue();
     				data[i] = ByteUtils.getUnsigned((byte)data[i]);
+    			}
     		 * TODO Hace falta esto????
+    		 *
     		 * */
     		int[] intData = DwgUtil.toIntArray(data);
-...
     	 * DWG file (using their object file obsets)
     	 * */
     	protected void readDwgObjects() {
     		Map vmap = new HashMap();
     		List dwgClasses = dwgFile.getDwgClasses();
     		for (int i = 0; i < dwgClasses.size(); i++){
     			DwgClass dwgClass = (DwgClass) dwgClasses.get(i);
     			vmap.put(new Integer(dwgClass.getClassNum()), dwgClass.getDxfName());
     			logger.info("Mapeando tipo "+dwgClass.getClassNum()+" con "+dwgClass.getDxfName());
+    		}
     		logger.info("Vamos a leer "+dwgFile.getDwgObjectOffsets().size()+" objetos");
     		for (int i=0; i<dwgFile.getDwgObjectOffsets().size(); i++) {
     			DwgObjectOffset doo = (DwgObjectOffset)dwgFile.getDwgObjectOffsets().get(i);
     			DwgObject obj = readDwgObject(doo.getOffset(), i);
     			/*
     			azabala: las entidades DWG no implementadas no nos aportan nada
     			(aunque la sigo leyendo por si aparecen problemas de puntero de fichero)
     			No considero por tanto los DwgObject
     			if (obj != null) {
                     dwgFile.addDwgObject(obj);
+                }
                 */
     			if(obj != null && obj.getClass() != DwgObject.class){
     				dwgFile.addDwgObject(obj);
+    			}
     		}//for
     		System.out.println("####LWPolyline erroneas:"+numPolylinesWrong+"####");
     		System.out.println("####################################");
+    	}
     	/**
-...
     	protected DwgObject readDwgObject(int offset, int index) {
     		DwgObject obj = null;
     		try {
     			bb.position(offset);
     			int size = DwgUtil.getModularShort(bb);
     			bb.order(ByteOrder.nativeOrder());
     			//LITTLE ENDIAN es intel, mientras que el codigo Python hace
     			//una lectura con bytes de la maquina (en un equipo no intel
     			//puede que no funcione
     //			TODO bb.order(ByteOrder.LITTLE_ENDIAN);
     			byte[] data = new byte[size];
     			/*
     			 * TODO Ver si funciona lo mio (mas simple?)
     			String[] dataMachValString = new String[size];
     			int[] data = new int[size];
     			for (int i=0; i < size; i++) {
     				dataBytes[i] = bb.get();
     				dataMachValString[i] = HexUtil.bytesToHex(new byte[]{dataBytes[i]});
     				Integer dataMachValShort = Integer.decode("0x" + dataMachValString[i]);
     				data[i] = dataMachValShort.byteValue();
     				data[i] = ByteUtils.getUnsigned((byte)data[i]);
+    			}
     			*/
     			bb.get(data);
     			int[] intData = DwgUtil.toIntArray(data);
     			int bitPos = 0;
     			List val = DwgUtil.getBitShort(intData, bitPos);
     			bitPos = ((Integer)val.get(0)).intValue();
     			int type = ((Integer)val.get(1)).intValue();
     			DwgObject obj = DwgObjectFactory.
     			obj = DwgObjectFactory.
     								getInstance().
     								create(type, index);
     			obj.setVersion(dwgFile.getDwgVersion());
-...
     		    			dwg.setExtendedData(obj.getExtendedData());
     		    			dwg.setSizeInBits(obj.getSizeInBits());
     		    			dwg.setGraphicData(obj.getGraphicData());
     		    			readSpecificObject(dwg, intData, bitPos);
     		    			obj = dwg;
     		    			readSpecificObject(obj, intData, bitPos);
+    		    		}
     		    	}//if type 500
     		    	else{
-...
     	    } catch (Exception e) {
     //	        logger.warn("Exception capturada. Probablemente se ha encontrado un" +
     //	        		"objeto con type non fixed");
     	    	if(obj instanceof DwgLwPolyline){
     	    		numPolylinesWrong++;
+    	    	}
     	        e.printStackTrace();
     	        return null;
+    	    }

     import com.iver.cit.jdwglib.dwg.DwgObjectFactory;
     import com.iver.cit.jdwglib.dwg.DwgObjectOffset;
     import com.iver.cit.jdwglib.dwg.DwgUtil;
     import com.iver.cit.jdwglib.dwg.objects.DwgLwPolyline;
     import freenet.support.HexUtil;
-...
     	protected ByteBuffer bb;
     	private int numWrongPolylines;
     	/**
     	 * Reads the DWG version 15 format
+    	 *
-...
     				dwgFile.addDwgObject(obj);
+    			}
+    		}
     		System.out.println("####LWPolyline erroneas:"+numWrongPolylines+"####");
     		System.out.println("####################################");
+    	}
     	/**
-...
     //					System.out.println("Dwg Object desconocido:"+obj.getType());
     		} catch (RuntimeException e) {
     			e.printStackTrace();
     			if(obj instanceof DwgLwPolyline){
     				numWrongPolylines++;
+    			}
     		} catch (CorruptedDwgEntityException e) {
     			// TODO Auto-generated catch block
     			e.printStackTrace();
     			if(obj instanceof DwgLwPolyline){
     				numWrongPolylines++;
+    			}
     			return null;
+    		}

Also available in: Unified diff