Revision 168
| trunk/libraries/libCq CMS for java.old/src/org/cresques/px/dxf/DxfFeatureMaker.java | ||
|---|---|---|
| 993 | 993 |
feature.setGeometry(insert); |
| 994 | 994 |
secondFeat.setGeometry(secondGeom); |
| 995 | 995 |
|
| 996 |
gestionaInsert(feature); |
|
| 996 |
if (insert.getBlockFound()==true) gestionaInsert(feature);
|
|
| 997 | 997 |
|
| 998 | 998 |
if (addingToBlock == false) {
|
| 999 | 999 |
features.add(secondFeat); |
| 1000 | 1000 |
} |
| 1001 |
//if (addingToBlock == true && feature.getProp("blockFound").equals("true")) {
|
|
| 1002 |
if (addingToBlock == true && insert.getBlockFound() == true) {
|
|
| 1001 |
// 040929: Modificado para a?adir el insert aunque no se haya encontrado |
|
| 1002 |
// el bloque. |
|
| 1003 |
if (addingToBlock == true/* && insert.getBlockFound() == true*/) {
|
|
| 1003 | 1004 |
//System.out.println("createInsert(): A?adimos un insert al bloque " + iterator);
|
| 1004 | 1005 |
blk.add(feature); |
| 1005 | 1006 |
} |
| ... | ... | |
| 1223 | 1224 |
//if (feature.getProp("blockFound") == "false") {
|
| 1224 | 1225 |
if (insert.getBlockFound() == false) {
|
| 1225 | 1226 |
System.out.println("compruebaBloques(): Ahora se ocupa del DxfInsert " + nomBlock);
|
| 1226 |
boolean aux_bool = insert.encuentraBloque(nomBlock);
|
|
| 1227 |
gestionaInsert(feature); |
|
| 1228 |
block.add(feature); |
|
| 1227 |
insert.encuentraBloque(nomBlock); |
|
| 1228 |
//gestionaInsert(feature);
|
|
| 1229 |
//block.add(feature);
|
|
| 1229 | 1230 |
} |
| 1230 | 1231 |
|
| 1231 | 1232 |
} |
| ... | ... | |
| 1242 | 1243 |
insert = (InsPoint)feature.getGeometry(); |
| 1243 | 1244 |
double bPointX = 0.0; |
| 1244 | 1245 |
double bPointY = 0.0; |
| 1245 |
if (insert.getBlockFound() == true) {
|
|
| 1246 |
//if (insert.getBlockFound() == true) {
|
|
| 1246 | 1247 |
bPointX = Double.parseDouble(insert.getBlock().getProp("basePointX"));
|
| 1247 | 1248 |
bPointY = Double.parseDouble(insert.getBlock().getProp("basePointY"));
|
| 1248 |
} |
|
| 1249 |
//}
|
|
| 1249 | 1250 |
double sFactorX = insert.getScaleFactor().getX(); |
| 1250 | 1251 |
double sFactorY = insert.getScaleFactor().getY(); |
| 1251 | 1252 |
double rAngleGra = insert.getRotAngle(); |
| ... | ... | |
| 1262 | 1263 |
// de las entities dentro de in bloque es la del bloque. La |
| 1263 | 1264 |
// layer especifica para estos elementos en la defincion del |
| 1264 | 1265 |
// bloque se ignora. |
| 1265 |
feature2.setProp("layer", feature.getProp("layer"));
|
|
| 1266 |
if (feature2.getProp("colorByLayer").equals("false")/* || feature2.getProp("layer").equals("0")*/) {
|
|
| 1266 |
System.out.println("TTTTTT: layer = " + feature2.getProp("layer"));
|
|
| 1267 |
if ((feature2.getProp("colorByLayer").equals("false") || feature2.getProp("layer").equals("0")) && !feature.getProp("layer").equals("0")) {
|
|
| 1267 | 1268 |
feature2.setProp("color", feature.getProp("color"));
|
| 1268 | 1269 |
} |
| 1270 |
feature2.setProp("layer", feature.getProp("layer"));
|
|
| 1269 | 1271 |
|
| 1270 | 1272 |
Point2D point1 = new Point2D.Double(); |
| 1271 | 1273 |
Point2D point11 = new Point2D.Double(); |
Also available in: Unified diff