Revision 318 2.0/trunk/org.gvsig.gvsig3d.app/org.gvsig.gvsig3d.app.extension/src/main/java/org/gvsig/gvsig3d/app/view/ViewProperties3D.java

View differences:

ViewProperties3D.java
39 39
import org.gvsig.gvsig3d.app.extension.DefaultView3DPanel;
40 40
import org.gvsig.gvsig3d.map3d.Layer3DProps;
41 41
import org.gvsig.gvsig3d.map3d.layers.FLayers3D;
42
import org.gvsig.osgvp.exceptions.node.ChildIndexOutOfBoundsExceptions;
42 43
import org.gvsig.osgvp.terrain.HeightfieldLayer;
43 44
import org.gvsig.osgvp.terrain.Terrain;
45
import org.gvsig.osgvp.terrain.TerrainViewer;
44 46

  
45 47
/**
46 48
 * Dialogo donde se muestran las propiedades de una vista
47 49
 * 
48 50
 * @author AI2
49 51
 */
50
public class ViewProperties3D extends GridBagLayoutPanel  implements IWindow{
52
public class ViewProperties3D extends GridBagLayoutPanel implements IWindow {
51 53

  
52 54
	/**
53 55
	 * 
......
61 63

  
62 64
	private boolean _editable;
63 65
	private boolean _projectEditable = false;
64
	
65
	
66 66

  
67 67
	private JTextField txtName;
68 68
	private JTextField txtDate;
......
81 81
	private JButton okButton;
82 82
	private JButton cancelButton;
83 83
	private JPanel jPanelSelectProjectionView;
84
	
85
	
84

  
86 85
	/**
87 86
	 * This is the default constructor
88 87
	 * 
......
474 473
					_view3D.setVerticalExaggeration(Float.parseFloat(verEx
475 474
							.getText()));
476 475
					_view3D.setProjection(_proj);
477
					setPropertiesCreated(true);
476

  
478 477
					PluginServices.getMDIManager().closeWindow(
479 478
							ViewProperties3D.this);
480 479
				}
......
523 522

  
524 523
	public void setVerticalEx(float exa) {
525 524

  
526
		SingleLayerIterator lyrIterator = new SingleLayerIterator(
527
				(FLayers3D) _view3D.getMapContext().getLayers());
528
		while (lyrIterator.hasNext()) {
529
			FLayer lyr = lyrIterator.next();
525
		// SingleLayerIterator lyrIterator = new SingleLayerIterator(
526
		// (FLayers3D) _view3D.getMapContext().getLayers());
527
		// while (lyrIterator.hasNext()) {
528
		// FLayer lyr = lyrIterator.next();
529
		//
530
		// Object propsObj = lyr.getProperty("3DLayerExtension");
531
		// Layer3DProps props = null;
532
		// if (propsObj != null) {
533
		// try {
534
		// props = (Layer3DProps) propsObj;
535
		// } catch (Exception e) {
536
		// props = null;
537
		// }
538
		// }
539
		//
540
		// int type = props.getType();
541
		// if (exa != props.getVerticalEx()) {
542
		// if (type == Layer3DProps.layer3DElevation) {
543
		// props.setVerticalEx(exa);
544
		// HeightfieldLayer layer = (HeightfieldLayer) props
545
		// .getTerrainLayer();
546
		// if (layer == null)
547
		// return;
548
		// layer.setScaleFactor(exa);
549
		// // _view3D.getTerrain().getLayerManager().updateLayers();
550
		// } else if (type == Layer3DProps.layer3DVector) {
551
		// props.setVerticalEx(exa);
552
		// }
553
		// }
554
		//
555
		// }
530 556

  
531
			Object propsObj = lyr.getProperty("3DLayerExtension");
532
			Layer3DProps props = null;
533
			if (propsObj != null) {
534
				try {
535
					props = (Layer3DProps) propsObj;
536
				} catch (Exception e) {
537
					props = null;
538
				}
539
			}
557
		if (_view3D.getCanvas3d() != null) {
540 558

  
541
			int type = props.getType();
542
			if (exa != props.getVerticalEx()) {
543
				if (type == Layer3DProps.layer3DElevation) {
544
					props.setVerticalEx(exa);
545
					HeightfieldLayer layer = (HeightfieldLayer) props
546
							.getTerrainLayer();
547
					if (layer == null)
548
						return;
549
					layer.setScaleFactor(exa);
550
			//		_view3D.getTerrain().getLayerManager().updateLayers();
551
				} else if (type == Layer3DProps.layer3DVector) {
552
					props.setVerticalEx(exa);
553
				}
559
			try {
560
				((TerrainViewer) _view3D.getCanvas3d().getOSGViewer())
561
						.getTerrain(0).setVerticalExaggeration(exa);
562
			} catch (ChildIndexOutOfBoundsExceptions e) {
563
				// TODO Auto-generated catch block
564
				e.printStackTrace();
554 565
			}
555 566

  
556 567
		}
568

  
557 569
	}
558 570

  
559 571
	private CRSSelectPanel getJPanelProj() {
......
619 631
		return WindowInfo.PROPERTIES_PROFILE;
620 632
	}
621 633

  
622
	public void setPropertiesCreated(boolean propertiesCreated) {
623
		_view3D.setPropertiesCreated(propertiesCreated);
624
	}
625

  
626
	public boolean isPropertiesCreated() {
627
		return _view3D.getPropertiesCreated();
628
	}
629 634
}

Also available in: Unified diff