Revision 522
tags/org.gvsig.dwg-2.0.115/org.gvsig.dwg.app/org.gvsig.dwg.app.mainplugin/src/test/java/org/gvsig/dwg/fmap/dal/store/dwg/TestDWG.java | ||
---|---|---|
1 |
/* gvSIG. Geographic Information System of the Valencian Government |
|
2 |
* |
|
3 |
* Copyright (C) 2007-2008 Infrastructures and Transports Department |
|
4 |
* of the Valencian Government (CIT) |
|
5 |
* |
|
6 |
* This program is free software; you can redistribute it and/or |
|
7 |
* modify it under the terms of the GNU General Public License |
|
8 |
* as published by the Free Software Foundation; either version 2 |
|
9 |
* of the License, or (at your option) any later version. |
|
10 |
* |
|
11 |
* This program is distributed in the hope that it will be useful, |
|
12 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
13 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
14 |
* GNU General Public License for more details. |
|
15 |
* |
|
16 |
* You should have received a copy of the GNU General Public License |
|
17 |
* along with this program; if not, write to the Free Software |
|
18 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
|
19 |
* MA 02110-1301, USA. |
|
20 |
* |
|
21 |
*/ |
|
22 |
|
|
23 |
/* |
|
24 |
* AUTHORS (In addition to CIT): |
|
25 |
* 2008 IVER T.I. S.A. {{Task}} |
|
26 |
*/ |
|
27 |
|
|
28 |
package org.gvsig.dwg.fmap.dal.store.dwg; |
|
29 |
|
|
30 |
import java.io.File; |
|
31 |
|
|
32 |
import org.gvsig.fmap.dal.DataStoreParameters; |
|
33 |
import org.gvsig.fmap.dal.exception.DataException; |
|
34 |
import org.gvsig.fmap.dal.feature.BaseTestFeatureStore; |
|
35 |
import org.gvsig.fmap.dal.feature.FeatureStore; |
|
36 |
|
|
37 |
public class TestDWG extends BaseTestFeatureStore { |
|
38 |
|
|
39 |
|
|
40 |
protected boolean testDXFInitialized = false; |
|
41 |
|
|
42 |
public static File file_prueba = new File(TestDWG.class.getResource( |
|
43 |
"data/V2000.dwg").getFile()); |
|
44 |
|
|
45 |
/* |
|
46 |
* (non-Javadoc) |
|
47 |
* |
|
48 |
* @see |
|
49 |
* org.gvsig.fmap.dal.feature.BaseTestFeatureStore#getDefaultDataStoreParameters |
|
50 |
* () |
|
51 |
*/ |
|
52 |
public DataStoreParameters getDefaultDataStoreParameters() |
|
53 |
throws DataException { |
|
54 |
DWGStoreParameters dwgParameters = null; |
|
55 |
|
|
56 |
dwgParameters = (DWGStoreParameters) dataManager |
|
57 |
.createStoreParameters(DWGStoreProvider.NAME); |
|
58 |
|
|
59 |
dwgParameters.setFile(file_prueba); |
|
60 |
dwgParameters.setCRS("EPSG:23030"); |
|
61 |
return dwgParameters; |
|
62 |
} |
|
63 |
|
|
64 |
/* |
|
65 |
* (non-Javadoc) |
|
66 |
* |
|
67 |
* @see org.gvsig.fmap.dal.feature.BaseTestFeatureStore#hasExplorer() |
|
68 |
*/ |
|
69 |
public boolean hasExplorer() { |
|
70 |
// TODO Auto-generated method stub |
|
71 |
return false; |
|
72 |
} |
|
73 |
|
|
74 |
public boolean usesResources() { |
|
75 |
return true; |
|
76 |
} |
|
77 |
|
|
78 |
|
|
79 |
public void testLegendAndLabeling() throws Exception { |
|
80 |
DataStoreParameters params = getDefaultDataStoreParameters(); |
|
81 |
FeatureStore store = (FeatureStore) dataManager.openStore(params |
|
82 |
.getDataStoreName(), params); |
|
83 |
|
|
84 |
assertNotNull(store.invokeDynMethod("getLegend", null)); |
|
85 |
assertNotNull(store.invokeDynMethod("getLabeling", null)); |
|
86 |
store.dispose(); |
|
87 |
} |
|
88 |
} |
tags/org.gvsig.dwg-2.0.115/org.gvsig.dwg.app/org.gvsig.dwg.app.mainplugin/src/test/java/org/gvsig/dwg/fmap/dal/store/dwg/TestDWG2004.java | ||
---|---|---|
1 |
/* gvSIG. Geographic Information System of the Valencian Government |
|
2 |
* |
|
3 |
* Copyright (C) 2007-2008 Infrastructures and Transports Department |
|
4 |
* of the Valencian Government (CIT) |
|
5 |
* |
|
6 |
* This program is free software; you can redistribute it and/or |
|
7 |
* modify it under the terms of the GNU General Public License |
|
8 |
* as published by the Free Software Foundation; either version 2 |
|
9 |
* of the License, or (at your option) any later version. |
|
10 |
* |
|
11 |
* This program is distributed in the hope that it will be useful, |
|
12 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
13 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
14 |
* GNU General Public License for more details. |
|
15 |
* |
|
16 |
* You should have received a copy of the GNU General Public License |
|
17 |
* along with this program; if not, write to the Free Software |
|
18 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
|
19 |
* MA 02110-1301, USA. |
|
20 |
* |
|
21 |
*/ |
|
22 |
|
|
23 |
/* |
|
24 |
* AUTHORS (In addition to CIT): |
|
25 |
* 2009 IVER T.I {{Task}} |
|
26 |
*/ |
|
27 |
|
|
28 |
package org.gvsig.dwg.fmap.dal.store.dwg; |
|
29 |
|
|
30 |
import java.io.File; |
|
31 |
|
|
32 |
public class TestDWG2004 extends TestDWG { |
|
33 |
public static File file_prueba = new File(TestDWG.class.getResource( |
|
34 |
"data/V2004.dwg").getFile()); |
|
35 |
} |
tags/org.gvsig.dwg-2.0.115/org.gvsig.dwg.app/org.gvsig.dwg.app.mainplugin/src/main/assembly/gvsig-plugin-package.xml | ||
---|---|---|
1 |
<assembly> |
|
2 |
<id>gvsig-plugin-package</id> |
|
3 |
<formats> |
|
4 |
<format>zip</format> |
|
5 |
</formats> |
|
6 |
<baseDirectory>${project.artifactId}</baseDirectory> |
|
7 |
<includeBaseDirectory>true</includeBaseDirectory> |
|
8 |
<files> |
|
9 |
<file> |
|
10 |
<source>target/${project.artifactId}-${project.version}.jar</source> |
|
11 |
<outputDirectory>lib</outputDirectory> |
|
12 |
</file> |
|
13 |
<file> |
|
14 |
<source>target/package.info</source> |
|
15 |
</file> |
|
16 |
</files> |
|
17 |
|
|
18 |
<fileSets> |
|
19 |
<fileSet> |
|
20 |
<directory>src/main/resources-plugin</directory> |
|
21 |
<outputDirectory>.</outputDirectory> |
|
22 |
</fileSet> |
|
23 |
</fileSets> |
|
24 |
|
|
25 |
<dependencySets> |
|
26 |
<dependencySet> |
|
27 |
<useProjectArtifact>false</useProjectArtifact> |
|
28 |
<useTransitiveDependencies>false</useTransitiveDependencies> |
|
29 |
<outputDirectory>lib</outputDirectory> |
|
30 |
<includes> |
|
31 |
<include>org.gvsig:org.gvsig.dwg.provider.legend</include> |
|
32 |
<include>org.gvsig:org.gvsig.dwg.provider</include> |
|
33 |
<include>org.gvsig:org.gvsig.dwg.lib</include> |
|
34 |
</includes> |
|
35 |
</dependencySet> |
|
36 |
</dependencySets> |
|
37 |
|
|
38 |
</assembly> |
tags/org.gvsig.dwg-2.0.115/org.gvsig.dwg.app/org.gvsig.dwg.app.mainplugin/src/main/java/org/gvsig/dwg/DWGRegisterExtension.java | ||
---|---|---|
1 |
/* gvSIG. Geographic Information System of the Valencian Government |
|
2 |
* |
|
3 |
* Copyright (C) 2007-2008 Infrastructures and Transports Department |
|
4 |
* of the Valencian Government (CIT) |
|
5 |
* |
|
6 |
* This program is free software; you can redistribute it and/or |
|
7 |
* modify it under the terms of the GNU General Public License |
|
8 |
* as published by the Free Software Foundation; either version 2 |
|
9 |
* of the License, or (at your option) any later version. |
|
10 |
* |
|
11 |
* This program is distributed in the hope that it will be useful, |
|
12 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
13 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
14 |
* GNU General Public License for more details. |
|
15 |
* |
|
16 |
* You should have received a copy of the GNU General Public License |
|
17 |
* along with this program; if not, write to the Free Software |
|
18 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
|
19 |
* MA 02110-1301, USA. |
|
20 |
* |
|
21 |
*/ |
|
22 |
package org.gvsig.dwg; |
|
23 |
|
|
24 |
import org.gvsig.andami.IconThemeHelper; |
|
25 |
import org.gvsig.andami.plugins.Extension; |
|
26 |
import org.gvsig.dwg.fmap.dal.store.dwg.DWGStoreProvider; |
|
27 |
import org.gvsig.fmap.mapcontext.MapContextLocator; |
|
28 |
|
|
29 |
/** |
|
30 |
* Dummy DWG extension, as all the registration happens in the |
|
31 |
* {@link DWGLibrary}. |
|
32 |
* |
|
33 |
* @author gvSIG Team |
|
34 |
*/ |
|
35 |
public class DWGRegisterExtension extends Extension { |
|
36 |
|
|
37 |
public void execute(String actionCommand) { |
|
38 |
// Nothing to do |
|
39 |
} |
|
40 |
|
|
41 |
public void initialize() { |
|
42 |
IconThemeHelper.registerIcon("layer", "layer-icon-dwg", this); |
|
43 |
} |
|
44 |
|
|
45 |
public void postInitialize() { |
|
46 |
MapContextLocator.getMapContextManager().registerIconLayer(DWGStoreProvider.NAME, "layer-icon-dwg"); |
|
47 |
} |
|
48 |
|
|
49 |
public boolean isEnabled() { |
|
50 |
// Nothing to do |
|
51 |
return false; |
|
52 |
} |
|
53 |
|
|
54 |
public boolean isVisible() { |
|
55 |
// Nothing to do |
|
56 |
return false; |
|
57 |
} |
|
58 |
|
|
59 |
} |
tags/org.gvsig.dwg-2.0.115/org.gvsig.dwg.app/org.gvsig.dwg.app.mainplugin/src/main/resources-plugin/config.xml | ||
---|---|---|
1 |
<?xml version="1.0" encoding="ISO-8859-1"?> |
|
2 |
<plugin-config> |
|
3 |
<libraries library-dir="lib"> |
|
4 |
</libraries> |
|
5 |
<depends plugin-name="org.gvsig.app.mainplugin"/> |
|
6 |
<resourceBundle name="text"/> |
|
7 |
<extensions> |
|
8 |
<extension class-name="org.gvsig.dwg.DWGRegisterExtension" |
|
9 |
description="DWG Driver" |
|
10 |
active="true"> |
|
11 |
</extension> |
|
12 |
|
|
13 |
</extensions> |
|
14 |
</plugin-config> |
tags/org.gvsig.dwg-2.0.115/org.gvsig.dwg.app/org.gvsig.dwg.app.mainplugin/pom.xml | ||
---|---|---|
1 |
<?xml version="1.0" encoding="UTF-8"?> |
|
2 |
|
|
3 |
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
|
4 |
|
|
5 |
<modelVersion>4.0.0</modelVersion> |
|
6 |
<artifactId>org.gvsig.dwg.app.mainplugin</artifactId> |
|
7 |
<packaging>jar</packaging> |
|
8 |
<name>${project.artifactId}</name> |
|
9 |
<description> |
|
10 |
DWG file format support (read-only) |
|
11 |
|
|
12 |
Supported versions: |
|
13 |
- v12 |
|
14 |
- v14 |
|
15 |
- v15 |
|
16 |
- v2004 |
|
17 |
|
|
18 |
</description> |
|
19 |
<parent> |
|
20 |
<groupId>org.gvsig</groupId> |
|
21 |
<artifactId>org.gvsig.dwg.app</artifactId> |
|
22 |
<version>2.0.115</version> |
|
23 |
</parent> |
|
24 |
|
|
25 |
<dependencies> |
|
26 |
<dependency> |
|
27 |
<groupId>org.gvsig</groupId> |
|
28 |
<artifactId>org.gvsig.tools.lib</artifactId> |
|
29 |
<scope>compile</scope> |
|
30 |
</dependency> |
|
31 |
<dependency> |
|
32 |
<groupId>org.gvsig</groupId> |
|
33 |
<artifactId>org.gvsig.andami</artifactId> |
|
34 |
<scope>compile</scope> |
|
35 |
</dependency> |
|
36 |
<dependency> |
|
37 |
<groupId>org.gvsig</groupId> |
|
38 |
<artifactId>org.gvsig.dwg.provider</artifactId> |
|
39 |
<scope>compile</scope> |
|
40 |
</dependency> |
|
41 |
<dependency> |
|
42 |
<groupId>org.gvsig</groupId> |
|
43 |
<artifactId>org.gvsig.dwg.provider.legend</artifactId> |
|
44 |
<scope>compile</scope> |
|
45 |
</dependency> |
|
46 |
|
|
47 |
<dependency> |
|
48 |
<groupId>org.gvsig</groupId> |
|
49 |
<artifactId>org.gvsig.dwg.lib</artifactId> |
|
50 |
<scope>runtime</scope> |
|
51 |
</dependency> |
|
52 |
|
|
53 |
<!-- Tests --> |
|
54 |
|
|
55 |
<dependency> |
|
56 |
<groupId>org.gvsig</groupId> |
|
57 |
<artifactId>org.gvsig.fmap.dal.impl</artifactId> |
|
58 |
<type>test-jar</type> |
|
59 |
<scope>test</scope> |
|
60 |
</dependency> |
|
61 |
|
|
62 |
<dependency> |
|
63 |
<groupId>org.gvsig</groupId> |
|
64 |
<artifactId>org.gvsig.fmap.dal.impl</artifactId> |
|
65 |
<type>jar</type> |
|
66 |
<scope>test</scope> |
|
67 |
</dependency> |
|
68 |
|
|
69 |
</dependencies> |
|
70 |
|
|
71 |
<properties> |
|
72 |
<!-- Package info property values --> |
|
73 |
<!-- Default values in org.gvsig.desktop --> |
|
74 |
<gvsig.package.info.name>Formats: dwg file format support (read-only)</gvsig.package.info.name> |
|
75 |
<gvsig.package.info.state>testing</gvsig.package.info.state> |
|
76 |
<gvsig.package.info.official>true</gvsig.package.info.official> |
|
77 |
<gvsig.package.info.dependencies>required: org.gvsig.app.mainplugin -ge 2.1.0-A</gvsig.package.info.dependencies> |
|
78 |
<gvsig.package.info.categories>Formats,Vector</gvsig.package.info.categories> |
|
79 |
<gvsig.package.info.poolURL>https://devel.gvsig.org/download/projects/gvsig-dwg/pool</gvsig.package.info.poolURL> |
|
80 |
</properties> |
|
81 |
|
|
82 |
<build> |
|
83 |
<plugins> |
|
84 |
|
|
85 |
<plugin> |
|
86 |
<!-- Skip compilation tests --> |
|
87 |
<groupId>org.apache.maven.plugins</groupId> |
|
88 |
<artifactId>maven-compiler-plugin</artifactId> |
|
89 |
<executions> |
|
90 |
<execution> |
|
91 |
<id>default-testCompile</id> |
|
92 |
<phase>process-test-sources</phase> |
|
93 |
<goals> |
|
94 |
<goal>testCompile</goal> |
|
95 |
</goals> |
|
96 |
<configuration> |
|
97 |
<skip>true</skip> |
|
98 |
</configuration> |
|
99 |
</execution> |
|
100 |
</executions> |
|
101 |
</plugin> |
|
102 |
|
|
103 |
<plugin> |
|
104 |
<!-- Skip test execution --> |
|
105 |
<groupId>org.apache.maven.plugins</groupId> |
|
106 |
<artifactId>maven-surefire-plugin</artifactId> |
|
107 |
<configuration> |
|
108 |
<skipTests>true</skipTests> |
|
109 |
</configuration> |
|
110 |
</plugin> |
|
111 |
|
|
112 |
</plugins> |
|
113 |
</build> |
|
114 |
|
|
115 |
</project> |
|
116 |
|
tags/org.gvsig.dwg-2.0.115/org.gvsig.dwg.app/org.gvsig.dwg.app.mainplugin/buildNumber.properties | ||
---|---|---|
1 |
#Wed Mar 25 21:02:51 CET 2020 |
|
2 |
buildNumber=2183 |
|
0 | 3 |
tags/org.gvsig.dwg-2.0.115/org.gvsig.dwg.app/pom.xml | ||
---|---|---|
1 |
<?xml version="1.0" encoding="UTF-8"?> |
|
2 |
|
|
3 |
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
|
4 |
|
|
5 |
<modelVersion>4.0.0</modelVersion> |
|
6 |
<artifactId>org.gvsig.dwg.app</artifactId> |
|
7 |
<packaging>pom</packaging> |
|
8 |
<name>${project.artifactId}</name> |
|
9 |
<parent> |
|
10 |
<groupId>org.gvsig</groupId> |
|
11 |
<artifactId>org.gvsig.dwg</artifactId> |
|
12 |
<version>2.0.115</version> |
|
13 |
</parent> |
|
14 |
|
|
15 |
<modules> |
|
16 |
<module>org.gvsig.dwg.app.mainplugin</module> |
|
17 |
</modules> |
|
18 |
|
|
19 |
|
|
20 |
</project> |
tags/org.gvsig.dwg-2.0.115/org.gvsig.dwg.lib/src/test/java/org/gvsig/dwg/lib/DwgFileTest.java | ||
---|---|---|
1 |
package org.gvsig.dwg.lib; |
|
2 |
|
|
3 |
import java.io.File; |
|
4 |
import java.io.IOException; |
|
5 |
import java.net.URL; |
|
6 |
|
|
7 |
import junit.framework.TestCase; |
|
8 |
|
|
9 |
public class DwgFileTest extends TestCase { |
|
10 |
private File baseDataPath; |
|
11 |
|
|
12 |
protected void setUp() throws Exception { |
|
13 |
super.setUp(); |
|
14 |
URL url = this.getClass().getResource("data"); |
|
15 |
if (url == null) { |
|
16 |
throw new Exception("Can't find 'data' dir"); |
|
17 |
} |
|
18 |
|
|
19 |
baseDataPath = new File(url.getFile()); |
|
20 |
if (!baseDataPath.exists()) { |
|
21 |
throw new Exception("Can't find 'data' dir"); |
|
22 |
} |
|
23 |
|
|
24 |
} |
|
25 |
|
|
26 |
protected void tearDown() throws Exception { |
|
27 |
super.tearDown(); |
|
28 |
} |
|
29 |
public void test1() throws IOException, DwgVersionNotSupportedException { |
|
30 |
// String fileName = baseDataPath.getAbsolutePath()+"/Un punto.dwg"; |
|
31 |
// DwgFile dwg = new DwgFile(fileName); |
|
32 |
// |
|
33 |
// dwg.read(); |
|
34 |
// dwg.calculateGisModelDwgPolylines(); |
|
35 |
// dwg.blockManagement(); |
|
36 |
// LinkedList dwgObjects = dwg.getDwgObjects(); |
|
37 |
} |
|
38 |
|
|
39 |
public void test2() throws RuntimeException, CorruptedDwgEntityException{ |
|
40 |
//Dwg Object that is supposed to be |
|
41 |
//an LWPOLYLINE in V14 version |
|
42 |
/* |
|
43 |
int[] data = new int[]{61,64,64,183,19,227,104,16 |
|
44 |
,0,5,8,59,72,32,252,47,90,142, |
|
45 |
234,145,50,10,71,11,213,36,229, |
|
46 |
162,130,10,228,126,23,174,130, |
|
47 |
145,50,15,98,141,196,244,229, |
|
48 |
162,130,12,126,23,169,66,58, |
|
49 |
145,50,12,47,90,138,68,229, |
|
50 |
162,130,8,0,0,4,7,74,137,50, |
|
51 |
15,177,66,231,252,221,162,130, |
|
52 |
9,130,151,21,242,151,21,190, |
|
53 |
8,21,8,56}; |
|
54 |
*/ |
|
55 |
// int[] data = new int[]{62,128,64,71,99, |
|
56 |
// 40,48,0,5,8,27,72, |
|
57 |
// 100,126,23,169,68, |
|
58 |
// 178,105,50,13,114, |
|
59 |
// 63,11,82,165,162,130, |
|
60 |
// 13,114,63,11,210,138, |
|
61 |
// 105,50,8,173,114,59, |
|
62 |
// 138,205,162,130,15,98, |
|
63 |
// 141,192,241,58,105,50, |
|
64 |
// 11,51,51,52,178,229,162, |
|
65 |
// 130,14,110,102,98,97,234, |
|
66 |
// 105,50,11,51,51,52,179,21, |
|
67 |
// 162,130,10,149,192,240,42, |
|
68 |
// 162,105,50,14,189,27,131, |
|
69 |
// 107,69,162,130,14,31,169, |
|
70 |
// 66,227,74,105,50,9,240,86, |
|
71 |
// 185,27,117,162,130,11,59, |
|
72 |
// 51,51,52,234,105,50,13,114, |
|
73 |
// 63,11,83,85,162,130,9,74,228, |
|
74 |
// 126,22,186,105,50,11,51,51,50, |
|
75 |
// 51,53,162,130,11,137,232,82,190, |
|
76 |
// 58,105,50,9,74,228,122,147,13,162, |
|
77 |
// 130,11,137,232,82,189,106,105,50,9, |
|
78 |
// 74,228,122,146,213,162,130,9,74,228,122,20,202,105,50,12,126,23,171,194,173,162,130,12,126,23,169,68,178,105,50,13,114,63,11,82,165,162,130,9,130,151,22,10,136,182,8,21,8,120}; |
|
79 |
// //1er intento: suponemos que la LWPOLYLINE cumple la especificaci?n |
|
80 |
// //a rajatabla |
|
81 |
// int bitPos = 0; |
|
82 |
// List val = DwgUtil.getBitShort(data, bitPos); |
|
83 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
84 |
// int type = ((Integer) val.get(1)).intValue(); |
|
85 |
// System.out.println("type = " + type); |
|
86 |
// |
|
87 |
// DwgHandleReference hr = new DwgHandleReference(); |
|
88 |
// bitPos = hr.read(data, bitPos); |
|
89 |
// System.out.println("handle, code="+ |
|
90 |
// hr.getCode()+ |
|
91 |
// " ,offset="+ |
|
92 |
// hr.getOffset()); |
|
93 |
// |
|
94 |
// //Ahora pasamos a la extended data |
|
95 |
// val = DwgUtil.getBitShort(data, bitPos); |
|
96 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
97 |
// int extendedDataSize = ((Integer) val.get(1)).intValue(); |
|
98 |
// System.out.println("EED size="+extendedDataSize); |
|
99 |
// //como el size es 0, me lo salto |
|
100 |
// |
|
101 |
// //ver si tiene datos graficos |
|
102 |
// val = DwgUtil.testBit(data, bitPos); |
|
103 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
104 |
// boolean hasGraphicsData = ((Boolean) val.get(1)) |
|
105 |
// .booleanValue(); |
|
106 |
// System.out.println("graphics = "+hasGraphicsData); |
|
107 |
// |
|
108 |
// //como se que no hay graphics me lo salto |
|
109 |
// //tama?o en bits |
|
110 |
// val = DwgUtil.getRawLong(data, bitPos); |
|
111 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
112 |
// int sizeInBits = ((Integer) val.get(1)).intValue(); |
|
113 |
// System.out.println("sizeInBits = "+sizeInBits); |
|
114 |
// |
|
115 |
// /* |
|
116 |
// * Ahora, lo que viene es lo que en la spec se dice |
|
117 |
// * "Common entity data". Revisar bien pues PythonCAD no lo lee |
|
118 |
// * como en la spec. |
|
119 |
// * |
|
120 |
// * pag 42. |
|
121 |
// R13-R14 Only: |
|
122 |
// RL : Size of object data in bits |
|
123 |
// 6B : Flags (FEDCBA) |
|
124 |
// 6B : Common parameters (CCSSII) |
|
125 |
// Segun esto, deberia leer 6 bits y 6 bits |
|
126 |
// |
|
127 |
// FLAGS |
|
128 |
// Mas adelante (pag 43), dice: |
|
129 |
// DC : This is the number of reactors attached to an |
|
130 |
// entity as a bitshort. |
|
131 |
// This feature may have been dormant in R13, |
|
132 |
// but it appears in R14, and in files saved as R13 by R14. |
|
133 |
// |
|
134 |
// Ahora bien, pythoncad las est? leyendo como bitLong |
|
135 |
// ?En que quedamos, son 2 bits, 1 bitLong o 1 bitShort? |
|
136 |
// TODO REVISAR |
|
137 |
// |
|
138 |
// COMMON PARAMETERS |
|
139 |
// Al principio, dice que son 6 bits (CC, SS, II) |
|
140 |
// pero luego dice (pag 43): |
|
141 |
// CC : Color bitshort |
|
142 |
// SS : Linetype scale bitdouble |
|
143 |
// II : "Invisible" flag bitshort |
|
144 |
// |
|
145 |
// Pythoncad, en vez de como 2 bits, los est? leyendo |
|
146 |
// como BitShort, BitDouble y BitShort |
|
147 |
// |
|
148 |
// * */ |
|
149 |
// |
|
150 |
// Integer mode = (Integer) DwgUtil.getBits(data, 2, bitPos); |
|
151 |
// bitPos += 2; |
|
152 |
// System.out.println("mode = "+mode); |
|
153 |
// |
|
154 |
// /* |
|
155 |
// val = DwgUtil.getBitLong(data, bitPos); |
|
156 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
157 |
// int rnum = ((Integer) val.get(1)).intValue(); |
|
158 |
// System.out.println("numReactors = "+rnum); |
|
159 |
//*/ |
|
160 |
// val = DwgUtil.getBitShort(data, bitPos); |
|
161 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
162 |
// int rnum = ((Integer) val.get(1)).intValue(); |
|
163 |
// System.out.println("numReactors = "+rnum); |
|
164 |
// |
|
165 |
// |
|
166 |
// val = DwgUtil.testBit(data, bitPos); |
|
167 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
168 |
// boolean isLyrByLineType = ((Boolean) val.get(1)).booleanValue(); |
|
169 |
// System.out.println("isLyrByLineType="+isLyrByLineType); |
|
170 |
// |
|
171 |
// val = DwgUtil.testBit(data, bitPos); |
|
172 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
173 |
// boolean noLinks = ((Boolean) val.get(1)).booleanValue(); |
|
174 |
// System.out.println("noLinks="+noLinks); |
|
175 |
// |
|
176 |
// |
|
177 |
// val = DwgUtil.getBitShort(data, bitPos); |
|
178 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
179 |
// int color = ((Integer) val.get(1)).intValue(); |
|
180 |
// System.out.println("color="+color); |
|
181 |
// |
|
182 |
// |
|
183 |
// val = DwgUtil.getBitDouble(data, bitPos); |
|
184 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
185 |
// float ltscale = ((Double) val.get(1)).floatValue(); |
|
186 |
// System.out.println("ltscale="+ltscale); |
|
187 |
// |
|
188 |
// val = DwgUtil.getBitShort(data, bitPos); |
|
189 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
190 |
// int invis = ((Integer) val.get(1)).intValue(); |
|
191 |
// System.out.println("invis="+invis); |
|
192 |
// |
|
193 |
// val = DwgUtil.getBitShort(data, bitPos); |
|
194 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
195 |
// int flag = ((Integer) val.get(1)).intValue(); |
|
196 |
// System.out.println("flag="+flag); |
|
197 |
// |
|
198 |
// double dVal = 0d; |
|
199 |
// if((flag & 0x4) > 0){ |
|
200 |
// val = DwgUtil.getBitDouble(data, bitPos); |
|
201 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
202 |
// dVal = ((Double) val.get(1)).doubleValue(); |
|
203 |
// } |
|
204 |
// System.out.println("constWidth="+dVal); |
|
205 |
// |
|
206 |
// dVal = 0d; |
|
207 |
// if((flag & 0x8) > 0){ |
|
208 |
// val = DwgUtil.getBitDouble(data, bitPos); |
|
209 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
210 |
// dVal = ((Double) val.get(1)).doubleValue(); |
|
211 |
// } |
|
212 |
// System.out.println("elevation="+dVal); |
|
213 |
// |
|
214 |
// dVal = 0d; |
|
215 |
// if ((flag & 0x2) > 0){ |
|
216 |
// val = DwgUtil.getBitDouble(data, bitPos); |
|
217 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
218 |
// dVal = ((Double) val.get(1)).doubleValue(); |
|
219 |
// } |
|
220 |
// System.out.println("thickness="+dVal); |
|
221 |
// |
|
222 |
// double x, y, z ; |
|
223 |
// x = 0d; |
|
224 |
// y = 0d; |
|
225 |
// z = 0d; |
|
226 |
// |
|
227 |
// if ((flag & 0x1) > 0){ |
|
228 |
// val = DwgUtil.getBitDouble(data, bitPos); |
|
229 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
230 |
// x = ((Double) val.get(1)).doubleValue(); |
|
231 |
// |
|
232 |
// val = DwgUtil.getBitDouble(data, bitPos); |
|
233 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
234 |
// y = ((Double) val.get(1)).doubleValue(); |
|
235 |
// |
|
236 |
// val = DwgUtil.getBitDouble(data, bitPos); |
|
237 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
238 |
// z = ((Double) val.get(1)).doubleValue(); |
|
239 |
// } |
|
240 |
// System.out.println("normal="+x+","+y+","+z); |
|
241 |
// |
|
242 |
// val = DwgUtil.getBitLong(data, bitPos); |
|
243 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
244 |
// int np = ((Integer) val.get(1)).intValue(); |
|
245 |
// System.out.println("numPoints="+np); |
|
246 |
// |
|
247 |
// int nb = 0; |
|
248 |
// if((flag & 0x10) > 0){ |
|
249 |
// val = DwgUtil.getBitLong(data, bitPos); |
|
250 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
251 |
// nb = ((Integer) val.get(1)).intValue(); |
|
252 |
// } |
|
253 |
// System.out.println("numBulges="+nb); |
|
254 |
// int nw = 0; |
|
255 |
// if((flag & 0x20) > 0){ |
|
256 |
// val = DwgUtil.getBitLong(data, bitPos); |
|
257 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
258 |
// nw = ((Integer) val.get(1)).intValue(); |
|
259 |
// } |
|
260 |
// System.out.println("numWidths="+nw); |
|
261 |
// if(np > 0){ |
|
262 |
// Point2D[] points = new Point2D[np]; |
|
263 |
// for(int i = 0; i < np; i++){ |
|
264 |
// val = DwgUtil.getRawDouble(data, bitPos); |
|
265 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
266 |
// x = ((Double) val.get(1)).doubleValue(); |
|
267 |
// |
|
268 |
// val = DwgUtil.getRawDouble(data, bitPos); |
|
269 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
270 |
// y = ((Double) val.get(1)).doubleValue(); |
|
271 |
// |
|
272 |
// points[i] = new Point2D.Double(x, y); |
|
273 |
// System.out.println("Punto"+i+"="+x+","+y); |
|
274 |
// }//for |
|
275 |
// }//if np |
|
276 |
// |
|
277 |
// if(nb > 0){ |
|
278 |
// double[] bulges = new double[nb]; |
|
279 |
// for(int i = 0; i < nb; i++){ |
|
280 |
// val = DwgUtil.getRawDouble(data, bitPos); |
|
281 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
282 |
// bulges[i] = ((Double) val.get(1)).doubleValue(); |
|
283 |
// System.out.println("Bulge"+i+"="+bulges[i]); |
|
284 |
// }//for |
|
285 |
// |
|
286 |
// }//if nb |
|
287 |
// |
|
288 |
// if(nw > 0){ |
|
289 |
// double[][] widths = new double[nw][2]; |
|
290 |
// for(int i = 0; i < nw; i++){ |
|
291 |
// val = DwgUtil.getBitDouble(data, bitPos); |
|
292 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
293 |
// double sw = ((Double) val.get(1)).doubleValue(); |
|
294 |
// |
|
295 |
// val = DwgUtil.getBitDouble(data, bitPos); |
|
296 |
// bitPos = ((Integer) val.get(0)).intValue(); |
|
297 |
// double ew = ((Double) val.get(1)).doubleValue(); |
|
298 |
// |
|
299 |
// widths[i][0] = sw; |
|
300 |
// widths[i][1] = ew; |
|
301 |
// System.out.println("Width"+i+"="+sw+","+ew); |
|
302 |
// }//for |
|
303 |
// } |
|
304 |
} |
|
305 |
|
|
306 |
public void test3(){ |
|
307 |
//test of extrusion |
|
308 |
double[] coord = null; |
|
309 |
double[] extrusion = null; |
|
310 |
double[] extrusion2 = new double[]{0, 0, 1}; |
|
311 |
|
|
312 |
coord = new double[]{790089.65, 4477974.75, 9.560000000114087}; |
|
313 |
extrusion = new double[]{-0.5037965987025721, 0.07005064807841195, 0.8609772899673451}; |
|
314 |
//1. algoritmo original, vector normal distinto |
|
315 |
// double[] newCoord = AcadExtrusionCalculator.extrude(coord, extrusion); |
|
316 |
// newCoord = AcadExtrusionCalculator.extrude3(coord, extrusion); |
|
317 |
// |
|
318 |
//2? ahora con vector normal coincidente con eje Z |
|
319 |
// newCoord = AcadExtrusionCalculator.extrude(coord, extrusion2); |
|
320 |
// newCoord = AcadExtrusionCalculator.extrude3(coord, extrusion2); |
|
321 |
} |
|
322 |
} |
tags/org.gvsig.dwg-2.0.115/org.gvsig.dwg.lib/src/test/java/org/gvsig/dwg/lib/DwgTestSuite.java | ||
---|---|---|
1 |
/* |
|
2 |
* Created on 08-feb-2007 |
|
3 |
* |
|
4 |
* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana |
|
5 |
* |
|
6 |
* Copyright (C) 2004 IVER T.I. and Generalitat Valenciana. |
|
7 |
* |
|
8 |
* This program is free software; you can redistribute it and/or |
|
9 |
* modify it under the terms of the GNU General Public License |
|
10 |
* as published by the Free Software Foundation; either version 2 |
|
11 |
* of the License, or (at your option) any later version. |
|
12 |
* |
|
13 |
* This program is distributed in the hope that it will be useful, |
|
14 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
15 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
16 |
* GNU General Public License for more details. |
|
17 |
* |
|
18 |
* You should have received a copy of the GNU General Public License |
|
19 |
* along with this program; if not, write to the Free Software |
|
20 |
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,USA. |
|
21 |
* |
|
22 |
* For more information, contact: |
|
23 |
* |
|
24 |
* Generalitat Valenciana |
|
25 |
* Conselleria d'Infraestructures i Transport |
|
26 |
* Av. Blasco Ib??ez, 50 |
|
27 |
* 46010 VALENCIA |
|
28 |
* SPAIN |
|
29 |
* |
|
30 |
* +34 963862235 |
|
31 |
* gvsig@gva.es |
|
32 |
* www.gvsig.gva.es |
|
33 |
* |
|
34 |
* or |
|
35 |
* |
|
36 |
* IVER T.I. S.A |
|
37 |
* Salamanca 50 |
|
38 |
* 46005 Valencia |
|
39 |
* Spain |
|
40 |
* |
|
41 |
* +34 963163400 |
|
42 |
* dac@iver.es |
|
43 |
*/ |
|
44 |
/* CVS MESSAGES: |
|
45 |
* |
|
46 |
* $Id: DwgTestSuite.java 28970 2009-05-25 13:27:14Z jmvivo $ |
|
47 |
* $Log$ |
|
48 |
* Revision 1.1.2.1 2007-02-28 07:35:10 jmvivo |
|
49 |
* Actualizado desde el HEAD. |
|
50 |
* |
|
51 |
* Revision 1.1 2007/02/08 20:27:57 azabala |
|
52 |
* *** empty log message *** |
|
53 |
* |
|
54 |
* |
|
55 |
*/ |
|
56 |
package org.gvsig.dwg.lib; |
|
57 |
|
|
58 |
import junit.framework.Test; |
|
59 |
import junit.framework.TestSuite; |
|
60 |
|
|
61 |
public class DwgTestSuite { |
|
62 |
|
|
63 |
public static Test suite() { |
|
64 |
TestSuite suite = new TestSuite("Test for com.iver.cit.jdwglib.dwg"); |
|
65 |
//$JUnit-BEGIN$ |
|
66 |
suite.addTestSuite(DwgFileTest.class); |
|
67 |
//$JUnit-END$ |
|
68 |
return suite; |
|
69 |
} |
|
70 |
|
|
71 |
} |
|
72 |
|
tags/org.gvsig.dwg-2.0.115/org.gvsig.dwg.lib/src/main/java/org/gvsig/dwg/lib/DwgObjectOffset.java | ||
---|---|---|
1 |
/* jdwglib. Java Library for reading Dwg files. |
|
2 |
* |
|
3 |
* Author: Jose Morell Rama (jose.morell@gmail.com). |
|
4 |
* Port from the Pythoncad Dwg library by Art Haas. |
|
5 |
* |
|
6 |
* Copyright (C) 2005 Jose Morell, IVER TI S.A. and Generalitat Valenciana |
|
7 |
* |
|
8 |
* This program is free software; you can redistribute it and/or |
|
9 |
* modify it under the terms of the GNU General Public License |
|
10 |
* as published by the Free Software Foundation; either version 2 |
|
11 |
* of the License, or (at your option) any later version. |
|
12 |
* |
|
13 |
* This program is distributed in the hope that it will be useful, |
|
14 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
15 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
16 |
* GNU General Public License for more details. |
|
17 |
* |
|
18 |
* You should have received a copy of the GNU General Public License |
|
19 |
* along with this program; if not, write to the Free Software |
|
20 |
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,USA. |
|
21 |
* |
|
22 |
* For more information, contact: |
|
23 |
* |
|
24 |
* Jose Morell (jose.morell@gmail.com) |
|
25 |
* |
|
26 |
* or |
|
27 |
* |
|
28 |
* IVER TI S.A. |
|
29 |
* C/Salamanca, 50 |
|
30 |
* 46005 Valencia |
|
31 |
* Spain |
|
32 |
* +34 963163400 |
|
33 |
* dac@iver.es |
|
34 |
*/ |
|
35 |
package org.gvsig.dwg.lib; |
|
36 |
|
|
37 |
/** |
|
38 |
* The DwgObjectOffset class is useful to store the handle of an object with its |
|
39 |
* offset in the DWG file |
|
40 |
* |
|
41 |
* @author jmorell |
|
42 |
*/ |
|
43 |
public class DwgObjectOffset { |
|
44 |
private int handle; |
|
45 |
private int offset; |
|
46 |
private int size; |
|
47 |
|
|
48 |
/** |
|
49 |
* Create a new DwgObjectOffset object |
|
50 |
* |
|
51 |
* @param handle Handle of the object |
|
52 |
* @param offset Offset in the DWG file of the object |
|
53 |
*/ |
|
54 |
public DwgObjectOffset(int handle, int offset) { |
|
55 |
this.handle = handle; |
|
56 |
this.offset = offset; |
|
57 |
} |
|
58 |
|
|
59 |
/** |
|
60 |
* @return Returns the handle. |
|
61 |
*/ |
|
62 |
public int getHandle() { |
|
63 |
return handle; |
|
64 |
} |
|
65 |
/** |
|
66 |
* @return Returns the offset. |
|
67 |
*/ |
|
68 |
public int getOffset() { |
|
69 |
return offset; |
|
70 |
} |
|
71 |
|
|
72 |
public void setSize(int size){ |
|
73 |
this.size=size; |
|
74 |
} |
|
75 |
|
|
76 |
public int getSize(){ |
|
77 |
return this.size; |
|
78 |
} |
|
79 |
|
|
80 |
|
|
81 |
} |
tags/org.gvsig.dwg-2.0.115/org.gvsig.dwg.lib/src/main/java/org/gvsig/dwg/lib/DwgUtil.java | ||
---|---|---|
1 |
/* jdwglib. Java Library for reading Dwg files. |
|
2 |
* |
|
3 |
* Author: Jose Morell Rama (jose.morell@gmail.com). |
|
4 |
* Port from the Pythoncad Dwg library by Art Haas. |
|
5 |
* |
|
6 |
* Copyright (C) 2005 Jose Morell, IVER TI S.A. and Generalitat Valenciana |
|
7 |
* |
|
8 |
* This program is free software; you can redistribute it and/or |
|
9 |
* modify it under the terms of the GNU General Public License |
|
10 |
* as published by the Free Software Foundation; either version 2 |
|
11 |
* of the License, or (at your option) any later version. |
|
12 |
* |
|
13 |
* This program is distributed in the hope that it will be useful, |
|
14 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
15 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
16 |
* GNU General Public License for more details. |
|
17 |
* |
|
18 |
* You should have received a copy of the GNU General Public License |
|
19 |
* along with this program; if not, write to the Free Software |
|
20 |
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,USA. |
|
21 |
* |
|
22 |
* For more information, contact: |
|
23 |
* |
|
24 |
* Jose Morell (jose.morell@gmail.com) |
|
25 |
* |
|
26 |
* or |
|
27 |
* |
|
28 |
* IVER TI S.A. |
|
29 |
* C/Salamanca, 50 |
|
30 |
* 46005 Valencia |
|
31 |
* Spain |
|
32 |
* +34 963163400 |
|
33 |
* dac@iver.es |
|
34 |
*/ |
|
35 |
package org.gvsig.dwg.lib; |
|
36 |
|
|
37 |
import java.nio.ByteBuffer; |
|
38 |
import java.nio.ByteOrder; |
|
39 |
import java.util.ArrayList; |
|
40 |
import java.util.List; |
|
41 |
|
|
42 |
import org.gvsig.dwg.lib.util.HexUtil; |
|
43 |
|
|
44 |
|
|
45 |
|
|
46 |
/** |
|
47 |
* The DwgUtil class contains the essential set of functions for reading bitstreams |
|
48 |
* in DWG files |
|
49 |
* |
|
50 |
* @author jmorell |
|
51 |
*/ |
|
52 |
public final class DwgUtil { |
|
53 |
|
|
54 |
/** |
|
55 |
* Read the extended data for a DWG object |
|
56 |
* Don't use in this version. Serious bugs detected |
|
57 |
* |
|
58 |
* @param data Array of unsigned bytes obtained from the DWG binary file |
|
59 |
* @param offset The current bit offset where the value begins |
|
60 |
* @throws RuntimeException If an unexpected bit value is found in the DWG file. Occurs |
|
61 |
* when we are looking for LwPolylines. |
|
62 |
* @return ArrayList This ArrayList has two parts. First is an int value that represents |
|
63 |
* the new offset, and second is the extended data of a DWG object |
|
64 |
*/ |
|
65 |
public static ArrayList readExtendedData(int[] data, int offset) throws RuntimeException { |
|
66 |
int bitPos = offset; |
|
67 |
ArrayList extData = new ArrayList(); |
|
68 |
while (true) { |
|
69 |
int newBitPos = ((Integer)getBitShort(data, bitPos).get(0)).intValue(); |
|
70 |
int size = ((Integer) getBitShort(data, bitPos).get(1)).intValue(); |
|
71 |
bitPos = newBitPos; |
|
72 |
if (size == 0) { |
|
73 |
break; |
|
74 |
} |
|
75 |
newBitPos = ((Integer)((ArrayList)getHandle(data, bitPos)).get(0)).intValue(); |
|
76 |
// TODO: Esto no es correcto. Repasar ... |
|
77 |
int handle = ((Integer)((ArrayList)getHandle(data, bitPos)).get(1)).intValue(); |
|
78 |
bitPos = newBitPos; |
|
79 |
ArrayList eedata = new ArrayList(); |
|
80 |
while (size > 0) { |
|
81 |
newBitPos = ((Integer)getRawChar(data, bitPos).get(0)).intValue(); |
|
82 |
int cb = ((Integer) getRawChar(data, bitPos).get(1)).intValue(); |
|
83 |
bitPos = newBitPos; |
|
84 |
size = size - 1; |
|
85 |
if (cb == 0x0) { |
|
86 |
newBitPos = ((Integer)getRawChar(data, bitPos).get(0)).intValue(); |
|
87 |
int len = ((Integer)getRawChar(data, bitPos).get(1)).intValue(); |
|
88 |
bitPos = newBitPos; |
|
89 |
newBitPos = ((Integer)getRawShort(data, bitPos).get(0)).intValue(); |
|
90 |
int cp = ((Integer)getRawShort(data, bitPos).get(1)).intValue(); |
|
91 |
bitPos = newBitPos; |
|
92 |
ArrayList chars = new ArrayList(); |
|
93 |
for (int i = 0; i < len; i++) { |
|
94 |
newBitPos = ((Integer)getRawChar(data, bitPos).get(0)).intValue(); |
|
95 |
int charr = ((Integer)getRawChar(data, bitPos).get(1)).intValue(); |
|
96 |
bitPos = newBitPos; |
|
97 |
// �int o char? |
|
98 |
chars.add(new Integer(charr)); |
|
99 |
} |
|
100 |
// Incorrecto. Repasar ... |
|
101 |
eedata.add(chars); |
|
102 |
size = size - len - 3; |
|
103 |
} else if (cb == 0x1) { |
|
104 |
System.out.println("Invalid EXX code byte: 0x1"); |
|
105 |
} else if (cb == 0x2) { |
|
106 |
newBitPos = ((Integer)getRawChar(data, bitPos).get(0)).intValue(); |
|
107 |
int charr = ((Integer)getRawChar(data, bitPos).get(1)).intValue(); |
|
108 |
bitPos = newBitPos; |
|
109 |
if (charr == 0x0) { |
|
110 |
eedata.add("{"); |
|
111 |
} else if (charr == 0x1) { |
|
112 |
eedata.add("}"); |
|
113 |
} else { |
|
114 |
System.out.println("Unexpected EXX char: " + charr); |
|
115 |
} |
|
116 |
size = size - 1; |
|
117 |
} else if (cb == 0x3 || cb == 0x5) { |
|
118 |
ArrayList chars = new ArrayList(); |
|
119 |
for (int i = 0; i < 8; i++) { |
|
120 |
newBitPos = ((Integer)getRawChar(data, bitPos).get(0)).intValue(); |
|
121 |
int charr = ((Integer)getRawChar(data, bitPos).get(1)).intValue(); |
|
122 |
bitPos = newBitPos; |
|
123 |
chars.add(new Integer(charr)); |
|
124 |
} |
|
125 |
eedata.add(chars); |
|
126 |
size = size - 8; |
|
127 |
} else if (cb == 0x4) { |
|
128 |
newBitPos = ((Integer)getRawChar(data, bitPos).get(0)).intValue(); |
|
129 |
int len = ((Integer)getRawChar(data, bitPos).get(1)).intValue(); |
|
130 |
bitPos = newBitPos; |
|
131 |
ArrayList chars = new ArrayList(); |
|
132 |
for (int i = 0; i < len; i++) { |
|
133 |
newBitPos = ((Integer)getRawChar(data, bitPos).get(0)).intValue(); |
|
134 |
int charr = ((Integer)getRawChar(data, bitPos).get(1)).intValue(); |
|
135 |
bitPos = newBitPos; |
|
136 |
chars.add(new Integer(charr)); |
|
137 |
} |
|
138 |
eedata.add(chars); |
|
139 |
size = size - len - 1; |
|
140 |
} else if (0xa <= cb && cb <= 0xd) { |
|
141 |
newBitPos = ((Integer)((ArrayList)getRawDouble(data, bitPos)).get(0)).intValue(); |
|
142 |
double d1 = ((Double)((ArrayList)getRawDouble(data, bitPos)).get(1)).doubleValue(); |
|
143 |
bitPos = newBitPos; |
|
144 |
newBitPos = ((Integer)((ArrayList)getRawDouble(data, bitPos)).get(0)).intValue(); |
|
145 |
double d2 = ((Double)((ArrayList)getRawDouble(data, bitPos)).get(1)).doubleValue(); |
|
146 |
bitPos = newBitPos; |
|
147 |
newBitPos = ((Integer)((ArrayList)getRawDouble(data, bitPos)).get(0)).intValue(); |
|
148 |
double d3 = ((Double)((ArrayList)getRawDouble(data, bitPos)).get(1)).doubleValue(); |
|
149 |
bitPos = newBitPos; |
|
150 |
eedata.add(new double[] { d1, d2, d3 }); |
|
151 |
size = size - 24; |
|
152 |
} else if (0x28 <= cb && cb <= 0x2a) { |
|
153 |
newBitPos = ((Integer)((ArrayList)getRawDouble(data, bitPos)).get(0)).intValue(); |
|
154 |
double d = ((Double)((ArrayList)getRawDouble(data, bitPos)).get(1)).doubleValue(); |
|
155 |
bitPos = newBitPos; |
|
156 |
eedata.add(new Double(d)); |
|
157 |
size = size - 8; |
|
158 |
} else if (cb == 0x46) { |
|
159 |
newBitPos = ((Integer)getRawShort(data, bitPos).get(0)).intValue(); |
|
160 |
int shortt = ((Integer)getRawShort(data, bitPos).get(1)).intValue(); |
|
161 |
bitPos = newBitPos; |
|
162 |
eedata.add(new Integer(shortt)); |
|
163 |
size = size - 2; |
|
164 |
} else if (cb == 0x47) { |
|
165 |
newBitPos = ((Integer)getRawLong(data, bitPos).get(0)).intValue(); |
|
166 |
int longg = ((Integer)getRawLong(data, bitPos).get(1)).intValue(); |
|
167 |
bitPos = newBitPos; |
|
168 |
eedata.add(new Integer(longg)); |
|
169 |
size = size - 4; |
|
170 |
} else { |
|
171 |
System.out.println("Unexpected code byte: " + cb); |
|
172 |
} |
|
173 |
} |
|
174 |
ArrayList v = new ArrayList(); |
|
175 |
// v.add(handle, eedata); |
|
176 |
extData.add(v); |
|
177 |
} |
|
178 |
ArrayList v = new ArrayList(); |
|
179 |
v.add(new Integer(bitPos)); |
|
180 |
v.add(extData); |
|
181 |
return v; |
|
182 |
} |
|
183 |
|
|
184 |
/** |
|
185 |
* Read a double value from a group of unsigned bytes and a default double |
|
186 |
* |
|
187 |
* @param data Array of unsigned bytes obtained from the DWG binary file |
|
188 |
* @param offset The current bit offset where the value begins |
|
189 |
* @param defVal Default double value |
|
190 |
* @throws RuntimeException If an unexpected bit value is found in the DWG file. Occurs |
|
191 |
* when we are looking for LwPolylines. |
|
192 |
* @return ArrayList This ArrayList has two parts. First is an int value that represents |
|
193 |
* the new offset, and second is the double value |
|
194 |
*/ |
|
195 |
public static ArrayList getDefaultDouble(int[] data, int offset, double defVal) throws RuntimeException { |
|
196 |
int flags = ((Integer) getBits(data, 2, offset)).intValue(); |
|
197 |
int read = 2; |
|
198 |
double val; |
|
199 |
if (flags == 0x0) { |
|
200 |
val = defVal; |
|
201 |
} else { |
|
202 |
int _offset = offset + 2; |
|
203 |
if (flags == 0x3) { |
|
204 |
byte[] bytes = (byte[]) getBits(data, 64, _offset); |
|
205 |
ByteBuffer bb = ByteBuffer.wrap(bytes); |
|
206 |
bb.order(ByteOrder.LITTLE_ENDIAN); |
|
207 |
val = bb.getDouble(); |
|
208 |
read = 66; |
|
209 |
} else { |
|
210 |
byte[] dstrArrayAux = new byte[8]; |
|
211 |
int[] doubleOffset = new int[] { 0 }; |
|
212 |
ByteUtils.doubleToBytes(defVal, dstrArrayAux, doubleOffset); |
|
213 |
byte[] dstrArrayAuxx = new byte[8]; |
|
214 |
dstrArrayAuxx[0] = dstrArrayAux[7]; |
|
215 |
dstrArrayAuxx[1] = dstrArrayAux[6]; |
|
216 |
dstrArrayAuxx[2] = dstrArrayAux[5]; |
|
217 |
dstrArrayAuxx[3] = dstrArrayAux[4]; |
|
218 |
dstrArrayAuxx[4] = dstrArrayAux[3]; |
|
219 |
dstrArrayAuxx[5] = dstrArrayAux[2]; |
|
220 |
dstrArrayAuxx[6] = dstrArrayAux[1]; |
|
221 |
dstrArrayAuxx[7] = dstrArrayAux[0]; |
|
222 |
int[] dstrArrayAuxxx = new int[8]; |
|
223 |
for (int i = 0; i < dstrArrayAuxxx.length; i++) { |
|
224 |
dstrArrayAuxxx[i] = ByteUtils.getUnsigned(dstrArrayAuxx[i]); |
|
225 |
} |
|
226 |
byte[] dstrArray = new byte[8]; |
|
227 |
for (int i = 0; i < dstrArray.length; i++) { |
|
228 |
dstrArray[i] = (byte) dstrArrayAuxxx[i]; |
|
229 |
} |
|
230 |
if (flags == 0x1) { |
|
231 |
byte[] ddArray = (byte[]) getBits(data, 32, _offset); |
|
232 |
dstrArray[0] = ddArray[0]; |
|
233 |
dstrArray[1] = ddArray[1]; |
|
234 |
dstrArray[2] = ddArray[2]; |
|
235 |
dstrArray[3] = ddArray[3]; |
|
236 |
read = 34; |
|
237 |
} else { |
|
238 |
byte[] ddArray = (byte[]) getBits(data, 48, _offset); |
|
239 |
dstrArray[4] = ddArray[0]; |
|
240 |
dstrArray[5] = ddArray[1]; |
|
241 |
dstrArray[0] = ddArray[2]; |
|
242 |
dstrArray[1] = ddArray[3]; |
|
243 |
dstrArray[2] = ddArray[4]; |
|
244 |
dstrArray[3] = ddArray[5]; |
|
245 |
read = 50; |
|
246 |
} |
|
247 |
ByteBuffer bb = ByteBuffer.wrap(dstrArray); |
|
248 |
bb.order(ByteOrder.LITTLE_ENDIAN); |
|
249 |
val = bb.getDouble(); |
|
250 |
} |
|
251 |
} |
|
252 |
ArrayList v = new ArrayList(); |
|
253 |
v.add(new Integer(offset + read)); |
|
254 |
v.add(new Double(val)); |
|
255 |
return v; |
|
256 |
} |
|
257 |
|
|
258 |
|
|
259 |
/** |
|
260 |
* Read a double value from a group of unsigned bytes |
|
261 |
* |
|
262 |
* @param data Array of unsigned bytes obtained from the DWG binary file |
|
263 |
* @param offset The current bit offset where the value begins |
|
264 |
* @throws RuntimeException If an unexpected bit value is found in the DWG file. Occurs |
|
265 |
* when we are looking for LwPolylines. |
|
266 |
* @return ArrayList This ArrayList has two parts. First is an int value that represents |
|
267 |
* the new offset, and second is the double value |
|
268 |
*/ |
|
269 |
public static ArrayList getBitDouble(int[] data, int offset) throws RuntimeException { |
|
270 |
ArrayList v = new ArrayList(); |
|
271 |
int type = ((Integer) getBits(data, 2, offset)).intValue(); |
|
272 |
int read = 2; |
|
273 |
double val = 0.0; |
|
274 |
if (type == 0x00) { |
|
275 |
byte[] bytes = (byte[]) getBits(data, 64, (offset + 2)); |
|
276 |
ByteBuffer bb = ByteBuffer.wrap(bytes); |
|
277 |
bb.order(ByteOrder.LITTLE_ENDIAN); |
|
278 |
val = bb.getDouble(); |
|
279 |
read = 66; |
|
280 |
} else if (type == 0x01) { |
|
281 |
val = 1.0; |
|
282 |
} else if (type == 0x02) { |
|
283 |
val = 0.0; |
|
284 |
} else { |
|
285 |
System.out.println("Bad type " + type + " at bit offset: " + offset); |
|
286 |
} |
|
287 |
v.add(new Integer(offset + read)); |
|
288 |
v.add(new Double(val)); |
|
289 |
return v; |
|
290 |
} |
|
291 |
|
|
292 |
|
|
293 |
/** |
|
294 |
* Read a double value from a group of unsigned bytes |
|
295 |
* |
|
296 |
* @param data Array of unsigned bytes obtained from the DWG binary file |
|
297 |
* @param offset The current bit offset where the value begins |
|
298 |
* @throws RuntimeException If an unexpected bit value is found in the DWG file. Occurs |
|
299 |
* when we are looking for LwPolylines. |
|
300 |
* @return ArrayList This ArrayList has two parts. First is an int value that represents |
|
301 |
* the new offset, and second is the double value |
|
302 |
*/ |
|
303 |
public static ArrayList getRawDouble(int[] data, int offset) throws RuntimeException { |
|
304 |
byte[] bytes = (byte[]) getBits(data, 64, offset); |
|
305 |
ByteBuffer bb = ByteBuffer.wrap(bytes); |
|
306 |
bb.order(ByteOrder.LITTLE_ENDIAN); |
|
307 |
double val = bb.getDouble(); |
|
308 |
ArrayList v = new ArrayList(); |
|
309 |
v.add(new Integer(offset + 64)); |
|
310 |
v.add(new Double(val)); |
|
311 |
return v; |
|
312 |
} |
|
313 |
|
|
314 |
/** |
|
315 |
* Read a short value from a group of unsigned bytes |
|
316 |
* |
|
317 |
* @param data Array of unsigned bytes obtained from the DWG binary file |
|
318 |
* @param offset The current bit offset where the value begins |
|
319 |
* @throws RuntimeException If an unexpected bit value is found in the DWG file. Occurs |
|
320 |
* when we are looking for LwPolylines. |
|
321 |
* @return ArrayList This ArrayList has two parts. First is an int value that represents |
|
322 |
* the new offset, and second is the short value |
|
323 |
*/ |
|
324 |
public static ArrayList getBitShort(int[] data, int offset) throws RuntimeException { |
|
325 |
ArrayList v = new ArrayList(); |
|
326 |
int type = ((Integer) getBits(data, 2, offset)).intValue(); |
|
327 |
int read = 2; |
|
328 |
int val = 0; |
|
329 |
if (type == 0x00) { |
|
330 |
byte[] bytes = (byte[]) getBits(data, 16, (offset + 2)); |
|
331 |
ByteBuffer bb = ByteBuffer.wrap(bytes); |
|
332 |
bb.order(ByteOrder.LITTLE_ENDIAN); |
|
333 |
val = bb.getShort(); |
|
334 |
read = 18; |
|
335 |
} else if (type == 0x01) { |
|
336 |
val = ((Integer) getBits(data, 8, (offset + 2))).intValue(); |
|
337 |
read = 10; |
|
338 |
} else if (type == 0x02) { |
|
339 |
val = 0; |
|
340 |
} else if (type == 0x03) { |
|
341 |
val = 256; |
|
342 |
} |
|
343 |
v.add(new Integer(offset + read)); |
|
344 |
v.add(new Integer(val)); |
|
345 |
return v; |
|
346 |
} |
|
347 |
|
|
348 |
/** |
|
349 |
* Read a short value from a group of unsigned bytes |
|
350 |
* |
|
351 |
* @param data Array of unsigned bytes obtained from the DWG binary file |
|
352 |
* @param offset The current bit offset where the value begins |
|
353 |
* @throws RuntimeException If an unexpected bit value is found in the DWG file. Occurs |
|
354 |
* when we are looking for LwPolylines. |
|
355 |
* @return ArrayList This ArrayList has two parts. First is an int value that represents |
|
356 |
* the new offset, and second is the short value |
|
357 |
*/ |
|
358 |
public static ArrayList getRawShort(int[] data, int offset) throws RuntimeException { |
|
359 |
byte[] bytes = (byte[]) getBits(data, 16, offset); |
|
360 |
ByteBuffer bb = ByteBuffer.wrap(bytes); |
|
361 |
bb.order(ByteOrder.LITTLE_ENDIAN); |
|
362 |
int val = bb.getShort(); |
|
363 |
ArrayList v = new ArrayList(); |
|
364 |
v.add(new Integer(offset + 16)); |
|
365 |
v.add(new Integer(val)); |
|
366 |
return v; |
|
367 |
} |
|
368 |
|
|
369 |
/** |
|
370 |
* Read a long value from a group of unsigned bytes |
|
371 |
* |
|
372 |
* @param data Array of unsigned bytes obtained from the DWG binary file |
|
373 |
* @param offset The current bit offset where the value begins |
|
374 |
* @throws RuntimeException If an unexpected bit value is found in the DWG file. Occurs |
|
375 |
* when we are looking for LwPolylines. |
|
376 |
* @return ArrayList This ArrayList has two parts. First is an int value that represents |
|
377 |
* the new offset, and second is the long value |
|
378 |
*/ |
|
379 |
public static ArrayList getBitLong(int[] data, int offset) throws RuntimeException { |
|
380 |
int type = ((Integer) getBits(data, 2, offset)).intValue(); |
|
381 |
int read = 2; |
|
382 |
int val = 0; |
|
383 |
if (type == 0x0) { |
|
384 |
byte[] bytes = (byte[]) getBits(data, 32, (offset + 2)); |
|
385 |
ByteBuffer bb = ByteBuffer.wrap(bytes); |
|
386 |
bb.order(ByteOrder.LITTLE_ENDIAN); |
|
387 |
val = bb.getInt(); |
|
388 |
read = 34; |
|
389 |
} else if (type == 0x01) { |
|
390 |
val = ((Integer) getBits(data, 8, (offset + 2))).intValue(); |
|
391 |
read = 10; |
|
392 |
} else if (type == 0x02) { |
|
393 |
val = 0; |
|
394 |
} else { |
|
395 |
System.out.println("Bad type at bit offset: " + offset); |
|
396 |
} |
|
397 |
ArrayList v = new ArrayList(); |
|
398 |
v.add(new Integer(offset + read)); |
|
399 |
v.add(new Integer(val)); |
|
400 |
return v; |
|
401 |
} |
|
402 |
|
|
403 |
/** |
|
404 |
* Read a long value from a group of unsigned bytes |
|
405 |
* |
|
406 |
* @param data Array of unsigned bytes obtained from the DWG binary file |
|
407 |
* @param offset The current bit offset where the value begins |
|
408 |
* @throws RuntimeException If an unexpected bit value is found in the DWG file. Occurs |
|
409 |
* when we are looking for LwPolylines. |
|
410 |
* @return ArrayList This ArrayList has two parts. First is an int value that represents |
|
411 |
* the new offset, and second is the long value |
|
412 |
* @throws RuntimeException |
|
413 |
*/ |
|
414 |
public static ArrayList getRawLong(int[] data, int offset) throws RuntimeException { |
|
415 |
ArrayList v = new ArrayList(); |
|
416 |
// _val = struct.unpack('<l', _long)[0] |
|
417 |
byte[] bytes = (byte[]) getBits(data, 32, offset); |
|
418 |
ByteBuffer bb = ByteBuffer.wrap(bytes); |
|
419 |
bb.order(ByteOrder.LITTLE_ENDIAN); |
|
420 |
int val = bb.getInt(); |
|
421 |
v.add(new Integer(offset + 32)); |
|
422 |
v.add(new Integer(val)); |
|
423 |
return v; |
|
424 |
} |
|
425 |
|
|
426 |
/** |
|
427 |
* Read a char value from a group of unsigned bytes |
|
428 |
* |
|
429 |
* @param data Array of unsigned bytes obtained from the DWG binary file |
|
430 |
* @param offset The current bit offset where the value begins |
|
431 |
* @throws RuntimeException If an unexpected bit value is found in the DWG file. Occurs |
|
432 |
* when we are looking for LwPolylines. |
|
433 |
* @return ArrayList This ArrayList has two parts. First is an int value that represents |
|
434 |
* the new offset, and second is the char value |
|
435 |
*/ |
|
436 |
public static ArrayList getRawChar(int[] data, int offset) throws RuntimeException { |
|
437 |
int charr = ((Integer) getBits(data, 8, offset)).intValue(); |
|
438 |
ArrayList v = new ArrayList(); |
|
439 |
v.add(new Integer(offset + 8)); |
|
440 |
v.add(new Integer(charr)); |
|
441 |
return v; |
|
442 |
} |
|
443 |
|
|
444 |
/** |
|
445 |
* Read a char value from a group of unsigned bytes |
|
446 |
* |
|
447 |
* @param data Array of unsigned bytes obtained from the DWG binary file |
|
448 |
* @param offset The current bit offset where the value begins |
|
449 |
* @throws RuntimeException If an unexpected bit value is found in the DWG file. Occurs |
|
450 |
* when we are looking for LwPolylines. |
|
451 |
* @return ArrayList This ArrayList has two parts. First is an int value that represents |
|
452 |
* the new offset, and second is the char value |
|
453 |
*/ |
|
454 |
public static ArrayList getModularChar(int[] data, int offset) throws RuntimeException { |
|
455 |
int val = 0; |
|
456 |
ArrayList bytes = new ArrayList(); |
|
457 |
boolean read = true; |
|
458 |
int offsett = offset; |
|
459 |
int fac = 1; |
|
460 |
while (read) { |
|
461 |
int bytee = ((Integer) getBits(data, 8, offsett)).intValue(); |
|
462 |
offsett = offsett + 8; |
|
463 |
if ((bytee & 0x80) == 0) { |
|
464 |
read = false; |
|
465 |
if ((bytee & 0x40) > 0) { |
|
466 |
fac = -1; |
|
467 |
bytee = bytee & 0xbf; |
|
468 |
} |
|
469 |
} |
|
470 |
bytes.add(new Integer(bytee & 0x7f)); |
|
471 |
} |
|
472 |
if (bytes.size()==1) val = ((Integer)bytes.get(0)).intValue(); |
|
473 |
else if (bytes.size()==2) val = ((Integer)bytes.get(0)).intValue() | (((Integer)bytes.get(1)).intValue() << 7); |
|
474 |
else if (bytes.size()==3) val = ((Integer)bytes.get(0)).intValue() | (((Integer)bytes.get(1)).intValue() << 7) | (((Integer)bytes.get(2)).intValue() << 14); |
|
475 |
else if (bytes.size()==4) val = ((Integer)bytes.get(0)).intValue() | (((Integer)bytes.get(1)).intValue() << 7) | (((Integer)bytes.get(2)).intValue() << 14) | (((Integer)bytes.get(3)).intValue() << 21); |
|
476 |
else System.out.println("Unexpected byte array length: " + bytes.size()); |
|
477 |
ArrayList v = new ArrayList(); |
|
478 |
v.add(new Integer(offsett)); |
|
479 |
v.add(new Integer(fac * val)); |
|
480 |
return v; |
|
481 |
} |
|
482 |
|
|
483 |
/** |
|
484 |
* Read a String from a group of unsigned bytes |
|
485 |
* |
|
486 |
* @param data Array of unsigned bytes obtained from the DWG binary file |
|
487 |
* @param offset The current bit offset where the value begins |
|
488 |
* @throws RuntimeException If an unexpected bit value is found in the DWG file. Occurs |
|
489 |
* when we are looking for LwPolylines. |
|
490 |
* @return ArrayList This ArrayList has two parts. First is an int value that represents |
|
491 |
* the new offset, and second is the String |
|
492 |
*/ |
|
493 |
public static ArrayList getTextString(int[] data, int offset) throws RuntimeException { |
|
494 |
int bitPos = offset; |
|
495 |
ArrayList bitShort = DwgUtil.getBitShort(data, bitPos); |
|
496 |
int newBitPos = ((Integer) bitShort.get(0)).intValue(); |
|
497 |
int len = ((Integer) bitShort.get(1)).intValue(); |
|
498 |
bitPos = newBitPos; |
|
499 |
int bitLen = len * 8; |
|
500 |
Object cosa = DwgUtil.getBits(data, bitLen, bitPos); |
|
501 |
String string; |
|
502 |
if (cosa instanceof byte[]) { |
|
503 |
string = new String((byte[]) cosa); |
|
504 |
} else { |
|
505 |
// string = ((Integer)cosa).toString(); |
|
506 |
byte[] bytes = new byte[] { ((Integer) cosa).byteValue() }; |
|
507 |
string = new String((byte[]) bytes); |
|
508 |
} |
|
509 |
bitPos = bitPos + bitLen; |
|
510 |
ArrayList v = new ArrayList(); |
|
511 |
v.add(new Integer(bitPos)); |
|
512 |
v.add(string); |
|
513 |
return v; |
|
514 |
} |
|
515 |
|
|
516 |
/** |
|
517 |
* Read a CmColor from a group of unsigned bytes |
|
518 |
* |
|
519 |
* @param data |
|
520 |
* Array of unsigned bytes obtained from the DWG binary file |
|
521 |
* @param offset |
|
522 |
* The current bit offset where the value begins |
|
523 |
* @throws RuntimeException |
|
524 |
* If an unexpected bit value is found in the DWG file. Occurs |
|
525 |
* when we are looking for LwPolylines. |
|
526 |
* @return ArrayList This ArrayList has two parts. First is an int value |
|
527 |
* that represents the new offset, and second is the int value |
|
528 |
* (handle of a DWG object) |
|
529 |
*/ |
|
530 |
public static ArrayList getCmColor(int[] intData, int offset, String version) throws RuntimeException { |
|
531 |
|
|
532 |
ArrayList v = new ArrayList(); |
|
533 |
int bitPos = offset; |
|
534 |
List val = getBitShort(intData, bitPos); |
|
535 |
bitPos = ((Integer) val.get(0)).intValue(); |
|
536 |
v.add((Integer) val.get(1)); //color index |
|
537 |
|
|
538 |
//FIXME: para versiones superiores habrá que ampliar la condición |
|
539 |
if (version.equalsIgnoreCase("Autocad R2004, R2005, R2006")){ |
|
540 |
|
|
541 |
val = getBitLong(intData, bitPos); |
|
542 |
bitPos = ((Integer) val.get(0)).intValue(); |
|
543 |
v.add((Integer) val.get(1)); //RGB value |
|
544 |
|
|
545 |
val = getRawChar(intData, bitPos); |
Also available in: Unified diff