Revision 25236

View differences:

trunk/libraries/lib3DMap/src/org/gvsig/gvsig3d/cacheservices/OSGCacheService.java
2 2

  
3 3
import java.awt.geom.Rectangle2D;
4 4
import java.io.File;
5
import java.io.FileNotFoundException;
5 6

  
6 7
import javax.swing.JOptionPane;
7 8

  
......
21 22
import org.gvsig.osgvp.Node;
22 23
import org.gvsig.osgvp.PositionAttitudeTransform;
23 24
import org.gvsig.osgvp.Vec3;
25
import org.gvsig.osgvp.osgDB;
24 26
import org.gvsig.osgvp.exceptions.node.NodeException;
25 27
import org.gvsig.osgvp.manipulator.EditionManager;
26 28
import org.gvsig.osgvp.manipulator.ManipulatorHandler;
27 29
import org.gvsig.osgvp.manipulator.RemoveAllSelectionCommand;
28
import org.gvsig.osgvp.manipulator.Manipulator.DraggerType;
29 30
import org.gvsig.osgvp.planets.Planet;
30 31
import org.gvsig.osgvp.planets.PlanetViewer;
31 32
import org.gvsig.osgvp.viewer.IViewerContainer;
......
57 58

  
58 59
	private static Logger logger = Logger.getLogger(OSGCacheService.class
59 60
			.getName());
60

  
61
	
61 62
	// private ISymbol _currentSymbol;
62 63

  
63 64
	public OSGCacheService(IViewerContainer canvas3D, Planet planet,
......
116 117
				File file = osgD.getFile();
117 118
				Node n = null;
118 119

  
119
				// try {
120
				// n = osgDB.readNodeFile(file.getAbsolutePath());
121
				// } catch (FileNotFoundException e) {
122
				// // TODO Auto-generated catch block
123
				// e.printStackTrace();
124
				// }
120
				 try {
121
					n = osgDB.readNodeFile(file.getAbsolutePath());
122
				} catch (FileNotFoundException e) {
123
					// TODO Auto-generated catch block
124
					e.printStackTrace();
125
				}
125 126
				MultiGeometry root = osgD.getOSGDriver().getRootFeature();
126 127
				// Insert the geometry in the root node of the graph.
127
				Group g = new Group();
128
				buildGeometry(root, g);
129
				// g.addChild(n);
130
				_layerNode.addChild(g);
128
//				Group g = new Group();
129
//				buildGeometry(root, g);
130
//				 g.addChild(n);
131
//				_layerNode.addChild(g);
132
				_layerNode.addChild(n);
131 133
			} catch (NodeException e) {
132 134
				// TODO Auto-generated catch block
133 135
				e.printStackTrace();
......
143 145

  
144 146
	public void DeleteFeaturesToPlanet() {
145 147
		try {
148
			endEditing();
146 149
			_planetViewer.removeSpecialNode(_layerNode);
147 150
		} catch (NodeException e) {
148 151
			logger.error("Command: "
......
173 176
			}else{
174 177
				_layerNode.addChild(posAttTrasn);
175 178
			}
176
			// _layerNode.addChild(group);
179
//			 _layerNode.addChild(group);
177 180
		} catch (NodeException e1) {
178 181
			// TODO Auto-generated catch block
179 182
			e1.printStackTrace();
......
227 230
				props3D.setEditing(true);
228 231
				props3D.setNewLayerOSG(true);
229 232
				JOptionPane.showMessageDialog(null,
230
						"la capa ha sido puesta en edicion automaticamente");
233
						"La capa ha sido puesta en edicion");
231 234
				
232 235
				editionManager = new EditionManager();
233 236
				for (int i = 0; i < _layerNode.getNumChildren(); i++) {
234 237
					Node node = _layerNode.getChild(i);
235 238
					editionManager.setScene(node);
236
					
239
					_layerNode.removeChild(node);
237 240
				}
238
				Group parent = _layerNode.getParent(0);
239
				parent.removeChild(_layerNode);
240
				parent.addChild(editionManager);
241
				
242
//				editionManager = new EditionManager();
243
//				editionManager.setScene(_layerNode);
241
				_layerNode.addChild(editionManager);
244 242
//				Group parent = _layerNode.getParent(0);
245 243
//				parent.removeChild(_layerNode);
246 244
//				parent.addChild(editionManager);
245
				
247 246

  
248 247
				ManipulatorHandler manipulatorHandler = new ManipulatorHandler();
249 248
				manipulatorHandler.setActive(true);
......
275 274
					&& (props3D.isEditing())) {
276 275
				props3D.setEditing(false);
277 276

  
278
				if (props3D.isNewLayerOSG())
277
				if (props3D.isNewLayerOSG()) 
279 278
					JOptionPane
280 279
							.showMessageDialog(null,
281 280
									"La capa ha sido modificada, recuerde salvar los cambios.");
......
284 283
				command.execute();
285 284

  
286 285
				Group scene = editionManager.getTransformedScene();
287
				Group parent = _layerNode.getParent(0);
288
				parent.removeChild(_layerNode);
289
				parent.addChild(scene);
286
				
287
				for (int i = 0; i < _layerNode.getNumChildren(); i++) {
288
					Node node = _layerNode.getChild(i);
289
					_layerNode.removeChild(node);
290
					
291
				}
292
				_layerNode.addChild(scene);
293
				
294
//				Group parent = _layerNode.getParent(0);
295
//				parent.removeChild(_layerNode);
296
//				parent.addChild(scene);
290 297
				// public void changeDragger(String draggerType)
291 298
				//editionManager.changeDragger(DraggerType.ROTATE_SPHERE_DRAGGER
292 299
				// );

Also available in: Unified diff