Revision 31643

View differences:

branches/gvSIG_19_ext3D_osgVP_2_2_0/libraries/lib3DMap-share/src/main/java/com/iver/ai2/gvsig3d/map3d/layers/Layer3DProps.java
15 15
import org.exolab.castor.xml.Marshaller;
16 16
import org.gvsig.cacheservice.CacheService;
17 17
import org.gvsig.fmap.raster.layers.FLyrRasterSE;
18
import org.gvsig.osgvp.terrain.HeightfieldLayer;
19
import org.gvsig.osgvp.terrain.Layer;
20
import org.gvsig.osgvp.terrain.RasterLayer;
18 21

  
19 22
import com.iver.ai2.gvsig3d.gui.VectorLayerMenu;
20 23
import com.iver.andami.PluginServices;
......
54 57
	// public static String m_cacheDir = "c:/data/cache"; // TEST
55 58
	// Create a .data directorio in user home for caching elements
56 59
	public static String m_cacheDir = System.getProperty("user.home")
57
			+ "/gvSIG/.data/cache";
60
			+ File.separator+"gvSIG"+File.separator+".data"+File.separator+"cache";
58 61

  
59 62
	protected int m_tocOrder; // index of layer in TOC (drawing priority)
60 63
	protected int m_terrainOrder; // current stage of layer in terrain.
......
161 164
			m_type = layer3DImage;
162 165
			boolean bCanBeElev = false;
163 166

  
164
			// TODO Un toggle this comment to use WMS extensions
165

  
166 167
			if (layer instanceof FLyrWMS) {
167 168
				FLyrWMS wmsLayer = (FLyrWMS) layer;
168 169
				String format = wmsLayer.getFormat();
......
188 189
					vectorLayerMenu.setVisible(true);
189 190
				}
190 191

  
191
				// PluginServices.getMDIManager().addWindow(vectorLayerMenu);
192

  
193
				// // choose rasterization of 3D
194
				// option = JOptionPane.showConfirmDialog(
195
				// (Component) PluginServices.getMainFrame(),
196
				// PluginServices
197
				// .getText(this, "Rasterize_layer_question"),
198
				// PluginServices.getText(this, "Layer_options"),
199
				// JOptionPane.YES_NO_OPTION);
200
				//
201
				// if (option == JOptionPane.YES_OPTION)
202
				// m_type = layer3DImage;
203
				// else
204
				// m_type = layer3DVector;
205
				//
206
				// if (m_type == layer3DVector) {
207
				// String Altura = JOptionPane.showInputDialog(PluginServices
208
				// .getText(this, PluginServices.getText(this,
209
				// "Heigth_layer_question")), "1000");
210
				//
211
				// if (Altura != null) {
212
				// int h = Integer.parseInt(Altura);
213
				// if (h >= 0)
214
				// m_heigth = h;
215
				// }
216
				// }
217

  
218 192
			} else if (layer instanceof FLyrRasterSE) {
219 193
				FLyrRasterSE rasterLayer = (FLyrRasterSE) layer;
220 194
				if (rasterLayer.getBandCount() == 1)
......
230 204
						PluginServices.getText(this, "Layer_options"),
231 205
						JOptionPane.YES_NO_OPTION);
232 206

  
233
				if (option == JOptionPane.YES_OPTION)
207
				if (option == JOptionPane.YES_OPTION) {
234 208
					m_type = layer3DElevation;
209
				}	
235 210
			}
236

  
237 211
		}
238 212
	}
239 213

  

Also available in: Unified diff