Revision 4196

View differences:

trunk/extensions/extRasterTools/src/com/iver/cit/gvsig/fmap/rasterTools/saveRaster/operations/SaveRasterThread.java
53 53

  
54 54
import org.cresques.cts.IProjection;
55 55
import org.cresques.geo.ViewPortData;
56
import org.cresques.io.EcwWriter;
56
import org.cresques.io.ErmapperWriter;
57 57
import org.cresques.io.GdalWriter;
58 58
import org.cresques.io.GeoRasterWriter;
59 59
import org.cresques.io.IDataWriter;
......
110 110
				Extent ex = new Extent(vp.getAdjustedExtent());
111 111
				Dimension imgSz = vp.getImageSize();
112 112
				ViewPortData vpData = new ViewPortData(vp.getProjection(), ex, imgSz );
113
				writer = new EcwWriter( ((IDataWriter)p), 
113
				writer = new ErmapperWriter( ((IDataWriter)p), 
114 114
										vpData, 
115 115
										fName,
116 116
										sizeBlock,
......
120 120
				String[] prp = driverProps.getProperties("ecw"); 
121 121
				if(prp!=null)
122 122
					writer.setProps(prp);
123
				((EcwWriter)writer).dataWrite();
124
				((EcwWriter)writer).writeClose(); 
123
				((ErmapperWriter)writer).dataWrite();
124
				((ErmapperWriter)writer).writeClose(); 
125 125
						
126 126
					
127 127
			}catch(IOException ev){
trunk/extensions/extRasterTools/src/com/iver/cit/gvsig/rasterTools/saveRaster/gui/toolListeners/SaveRasterListener.java
87 87
		if(Math.abs(rect.getMaxY()-rect.getMinY())>10 && Math.abs(rect.getMaxX()-rect.getMinX())>10){
88 88
			saveRaster.setProjection(((View) PluginServices.getMDIManager().getActiveView()).getProjection());
89 89
			
90
			DataInputSaveRaster dialog = (DataInputSaveRaster)saveRaster.getContentPanel(); 
90
			DataInputSaveRaster dialog = (DataInputSaveRaster)saveRaster.getContentPanel();
91
			dialog.getBPropiedades().setEnabled(false);
91 92
						
92 93
			int indexPoint = String.valueOf(rect.getMaxX()).indexOf('.');
93 94
			dialog.getTinf_derX().setText(String.valueOf(rect.getMaxX()).substring(0,indexPoint+2));
......
98 99
			indexPoint = String.valueOf(rect.getMinY()).indexOf('.');
99 100
			dialog.getTsup_izqY().setText(String.valueOf(rect.getMaxY()).substring(0,indexPoint+2));
100 101
			
101
			/*dialog.getTinf_derX().setText(String.valueOf(rect.getMaxX()));
102
			dialog.getTinf_derY().setText(String.valueOf(rect.getMaxY()));
103
			dialog.getTsup_izqX().setText(String.valueOf(rect.getMinX()));
104
			dialog.getTsup_izqY().setText(String.valueOf(rect.getMinY()));*/
105
			
106 102
			PluginServices.getMDIManager().addView(saveRaster);
107 103
		}
108 104
	}
trunk/extensions/extRasterTools/src/com/iver/cit/gvsig/rasterTools/saveRaster/gui/toolListeners/DataInputSaveListener.java
268 268
                        saveRaster.getBPropiedades().setText("Propiedades Jp2");
269 269
                    }
270 270
                }
271

  
271
                saveRaster.getBPropiedades().setEnabled(true);
272
                
272 273
                if (!fName.endsWith(".ecw") && 
273 274
                	!fName.endsWith(".tif") &&
274 275
					!fName.endsWith(".jpg") && 
trunk/extensions/extRasterTools/src/com/iver/cit/gvsig/rasterTools/saveRaster/gui/SaveRasterDialog.java
52 52
import java.awt.geom.Rectangle2D;
53 53

  
54 54
import org.cresques.cts.IProjection;
55
import org.cresques.io.EcwWriter;
55
import org.cresques.io.ErmapperWriter;
56 56
import org.cresques.io.GdalWriter;
57 57
import org.cresques.io.GeoRasterWriter;
58 58

  
......
70 70
public class SaveRasterDialog extends SaveRasterDialogPanel implements View {
71 71
	 
72 72
	private GeoRasterWriter				writer=null;
73
	private GeoRasterWriter				writerProps=null;
74 73
	private IProjection 				currentProjection = null;
75 74
	private SaveRasterPropsDialog 		frameSaveRasterProps = null;
76 75
	private int 						compresion = 1;
......
229 228
	
230 229
	private void propsButtonActionPerformed(ActionEvent e){
231 230
		DataInputSaveRaster dialog = (DataInputSaveRaster)((SaveRasterDialogPanel)this.getContentPane()).getContentPanel();
231
		String name = ((SaveRasterDialogPanel)this.getContentPane()).getListener().getFileName();
232
		
233
		//Si no se ha seleccionado ning?n fichero salimos
234
		if(name == null || name.equals(""))
235
			return;
236
		
237
		GeoRasterWriter writer = GeoRasterWriter.getWriter(name);
238

  
232 239
		if(dialog.getBPropiedades().getText().endsWith("Ecw")){
233
			writerProps = new EcwWriter();
234 240
			if(driverProps.getProperties("ecw")!=null){
235
				writerProps.setProps(driverProps.getProperties("ecw"));
241
				writer.setProps(driverProps.getProperties("ecw"));
236 242
			}
237 243
		}
238 244
				
239 245
		if(	dialog.getBPropiedades().getText().endsWith("GeoTiff") || 
240 246
			dialog.getBPropiedades().getText().endsWith("Jpeg")){
241
			writerProps = new GdalWriter("GTiff");
242 247
			if(driverProps.getProperties("tif")!=null){
243
				writerProps.setProps(driverProps.getProperties("tif"));
248
				writer.setProps(driverProps.getProperties("tif"));
244 249
			}
245 250
		}
246 251
		
247 252
		if(dialog.getBPropiedades().getText().endsWith("Jp2")){
248
			writerProps = new EcwWriter();
249 253
			if(driverProps.getProperties("jp2")!=null){
250
				writerProps.setProps(driverProps.getProperties("jp2"));
254
				writer.setProps(driverProps.getProperties("jp2"));
251 255
			}
252 256
		}
253 257

  
254
		frameSaveRasterProps = new SaveRasterPropsDialog(writerProps);
258
		frameSaveRasterProps = new SaveRasterPropsDialog(writer);
255 259
		frameSaveRasterProps.setParentDialog(this);
256 260
		frameSaveRasterProps.show();
257 261
	}
trunk/extensions/extRasterTools/src/com/iver/cit/gvsig/rasterTools/saveRaster/gui/SaveRasterPropsDialog.java
8 8

  
9 9
import javax.swing.JDialog;
10 10

  
11
import org.cresques.cts.IProjection;
12 11
import org.cresques.io.CXMLParser;
13 12
import org.cresques.io.GeoRasterWriter;
14
import org.cresques.px.PxLayerList;
15 13

  
16
import com.iver.cit.gvsig.rasterTools.saveRaster.gui.toolListeners.DataInputPropsListener;
17 14

  
18

  
19 15
/**
20 16
 * Dialogo para abrir fichero.
21 17
 * @author Nacho Brodin (brodin_ign@gva.es)
......
25 21
	private SaveRasterPropsDialogPanel 	contentPane = null;  
26 22
	private GeoRasterWriter 			writer=null;
27 23
	private String 						formato = null;
28
	private IProjection 				currentProjection = null;
29
	private PxLayerList 				layerList = null;
30 24
	private int 						widthWindow=386;
31 25
	private int 						heightWindow=300;
32 26
	private String[]					properties = null;
......
99 93
			//contentPane.addAncestorListener(this);
100 94
		}
101 95
		return contentPane;
102
	}
103
	
104
	/**
105
	 * Asigna la proyecci?n
106
	 * @param prj Proyecci?n
107
	 */
108
	
109
	public void setProjection(IProjection prj) {
110
		this.currentProjection = prj;
111
	}
112
	
113
	/**
114
	 * 
115
	 * @param layerList
116
	 */
117
	
118
	public void setLayerList(PxLayerList layerList){
119
		this.layerList = layerList;
120
	}
121
	
96
	}	
122 97
		
123 98
	public void closeJDialog() {
124 99
		this.hide();
trunk/extensions/extRasterTools/src/com/iver/cit/gvsig/rasterTools/saveRaster/gui/SaveRasterPropsDialogPanel.java
65 65
     */
66 66
    public void initialize() {
67 67
    	super.initialize();
68
        this.setBounds(0, 0, 355, 230);
68
        this.setBounds(0, 0, 360, 230);
69 69

  
70 70
        //Ocultamos el bot?n de aplicar
71 71
        this.getApplyButton().setVisible(false);
......
77 77
    public JPanel getContentPanel() {
78 78
        if (contentPane == null) {
79 79
        	contentPane = new DataInputProps(this.writer);
80
            contentPane.setBounds(14, 12, 345, 174);
80
            contentPane.setBounds(14, 12, 360, 174);
81 81
        }
82 82
        return contentPane;
83 83
    }

Also available in: Unified diff