Revision 21545
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/map3d/MapContext3D.java | ||
---|---|---|
11 | 11 |
import java.awt.image.ImagingOpException; |
12 | 12 |
import java.io.File; |
13 | 13 |
import java.io.IOException; |
14 |
import java.sql.PreparedStatement; |
|
14 | 15 |
import java.util.ArrayList; |
15 | 16 |
|
16 | 17 |
import javax.print.attribute.PrintRequestAttributeSet; |
... | ... | |
20 | 21 |
import org.cresques.cts.ICoordTrans; |
21 | 22 |
import org.cresques.cts.IProjection; |
22 | 23 |
import org.gvsig.cacheservice.TileNum; |
24 |
import org.gvsig.fmap.raster.layers.FLyrRasterSE; |
|
25 |
import org.gvsig.fmap.raster.layers.NotAvailableStateException; |
|
23 | 26 |
import org.gvsig.osgvp.Image; |
24 | 27 |
import org.gvsig.osgvp.Node; |
25 | 28 |
import org.gvsig.osgvp.Vec3; |
... | ... | |
187 | 190 |
int y = (int) getViewPort().getOffset().getY(); |
188 | 191 |
int w = (int) g.getClipBounds().getWidth(); |
189 | 192 |
int h = (int) g.getClipBounds().getHeight(); |
190 |
// int w = (int) (getViewPort().getImageSize().getWidth());
|
|
191 |
// int h = (int) (getViewPort().getImageSize().getHeight());
|
|
193 |
// int w = (int) (getViewPort().getImageSize().getWidth());
|
|
194 |
// int h = (int) (getViewPort().getImageSize().getHeight());
|
|
192 | 195 |
|
193 | 196 |
draw(g, new Rectangle(x, y, w, h)); |
194 | 197 |
} |
... | ... | |
454 | 457 |
if (order == -1) |
455 | 458 |
return; |
456 | 459 |
|
457 |
Layer3DProps props3D = getLayer3DProps(layer);
|
|
460 |
this.pepareLayerToRefresh(layer);
|
|
458 | 461 |
|
459 |
if (props3D.getType() == Layer3DProps.layer3DVector) { |
|
460 |
DeleteVectors(layer, props3D); |
|
461 |
} else if (props3D.getType() == Layer3DProps.layer3DImage) { |
|
462 |
m_planet.removeTextureLayer(props3D.getPlanetOrder()); |
|
463 |
ArrayList layerList = (ArrayList) m_layerLists.get(props3D |
|
464 |
.getType()); |
|
465 |
|
|
466 |
for (int iLayer = 0; iLayer < layerList.size(); iLayer++) { |
|
467 |
FLayer eachLayer = (FLayer) layerList.get(iLayer); |
|
468 |
Layer3DProps eachProps3D = getLayer3DProps(eachLayer); |
|
469 |
if (eachProps3D.getPlanetOrder() > props3D.getPlanetOrder()) |
|
470 |
eachProps3D |
|
471 |
.setPlanetOrder(eachProps3D.getPlanetOrder() - 1); |
|
472 |
} |
|
473 |
props3D.setPlanetOrder(-1); |
|
474 |
} else if (props3D.getType() == Layer3DProps.layer3DElevation) { |
|
475 |
m_planet.removeHeightfieldLayer(order); |
|
476 |
} |
|
477 |
|
|
478 | 462 |
// REPAINTING VIEWER |
479 | 463 |
if (m_canvas3d != null) |
480 | 464 |
m_canvas3d.repaint(); |
... | ... | |
1399 | 1383 |
// REPAINTING VIEWWER |
1400 | 1384 |
if (m_canvas3d != null) |
1401 | 1385 |
m_canvas3d.repaint(); |
1402 |
|
|
1386 |
|
|
1403 | 1387 |
} |
1404 | 1388 |
|
1405 | 1389 |
public void requestVectorLayer(RequestLayerEvent arg0) { |
... | ... | |
1407 | 1391 |
|
1408 | 1392 |
} |
1409 | 1393 |
|
1394 |
public void pepareLayerToRefresh(FLayer layer) { |
|
1395 |
// TODO Auto-generated method stub |
|
1396 |
Layer3DProps props3D = getLayer3DProps(layer); |
|
1397 |
|
|
1398 |
if (props3D.getType() == Layer3DProps.layer3DVector) { |
|
1399 |
DeleteVectors(layer, props3D); |
|
1400 |
} else if (props3D.getType() == Layer3DProps.layer3DImage) { |
|
1401 |
m_planet.removeTextureLayer(props3D.getPlanetOrder()); |
|
1402 |
ArrayList layerList = (ArrayList) m_layerLists.get(props3D |
|
1403 |
.getType()); |
|
1404 |
|
|
1405 |
for (int iLayer = 0; iLayer < layerList.size(); iLayer++) { |
|
1406 |
FLayer eachLayer = (FLayer) layerList.get(iLayer); |
|
1407 |
Layer3DProps eachProps3D = getLayer3DProps(eachLayer); |
|
1408 |
if (eachProps3D.getPlanetOrder() > props3D.getPlanetOrder()) |
|
1409 |
eachProps3D |
|
1410 |
.setPlanetOrder(eachProps3D.getPlanetOrder() - 1); |
|
1411 |
} |
|
1412 |
props3D.setPlanetOrder(-1); |
|
1413 |
} else if (props3D.getType() == Layer3DProps.layer3DElevation) { |
|
1414 |
m_planet.removeHeightfieldLayer(props3D.getTocOrder()); |
|
1415 |
} |
|
1416 |
|
|
1417 |
} |
|
1418 |
|
|
1419 |
public void refreshLayer3DProps(FLayer layer) { |
|
1420 |
// TODO Auto-generated method stub |
|
1421 |
addLayerByType(layer); |
|
1422 |
addLayerToPlanet(layer, Layer3DProps.getLayer3DProps(layer) |
|
1423 |
.getTocOrder(), true); |
|
1424 |
|
|
1425 |
} |
|
1426 |
|
|
1410 | 1427 |
} |
Also available in: Unified diff