Revision 11392

View differences:

trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/properties/dialog/PropertiesRasterRegistrableDialog.java
80 80
	 * @see com.iver.andami.ui.mdiManager.IWindow#getWindowInfo()
81 81
	 */
82 82
	public WindowInfo getWindowInfo() {
83
		WindowInfo m_viewinfo=new WindowInfo(WindowInfo.MODALDIALOG | WindowInfo.RESIZABLE);
84
    	m_viewinfo.setTitle(title);
85
      	m_viewinfo.setHeight(sizePanelY);
86
      	m_viewinfo.setWidth(sizePanelX);
83
		WindowInfo m_viewinfo = new WindowInfo(WindowInfo.MODALDIALOG
84
				| WindowInfo.RESIZABLE);
85
		m_viewinfo.setTitle(title);
86
		m_viewinfo.setHeight(sizePanelY);
87
		m_viewinfo.setWidth(sizePanelX);
87 88
		return m_viewinfo;
88 89
	}	
89 90
	
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/cutting/CuttingProcess.java
49 49
	private Extent								extent = null;
50 50
	private boolean								oneLayerPerBand = false;
51 51
	private int[]									drawableBands = null;
52
	private CuttingPanelListener	cuttingPanelListener = null; 
52
	private CuttingPanelListener	cuttingPanelListener = null;
53
	private int[]									dValues = null;
53 54
	
54 55
	/**
55 56
	 * Constructor
......
59 60
	 * @param fName Nombre del fichero de salida
60 61
	 * @param params Par?metros del escritor
61 62
	 */	
62
	public CuttingProcess(CuttingPanelListener cuttingPanelListener, String fileName, WriterBufferServer writerBufferServer, RasterMultiDataset rasterMultiDataset, Extent extent, int[] drawableBands, boolean oneLayerPerBand) {
63
	public CuttingProcess(CuttingPanelListener cuttingPanelListener, int[] dValues, String fileName, WriterBufferServer writerBufferServer, RasterMultiDataset rasterMultiDataset, Extent extent, int[] drawableBands, boolean oneLayerPerBand) {
63 64
		this.fileName = fileName;
64 65
		this.writerBufferServer = writerBufferServer;
65 66
		this.rasterMultiDataset = rasterMultiDataset;
......
67 68
		this.oneLayerPerBand = oneLayerPerBand;
68 69
		this.drawableBands = drawableBands;
69 70
		this.cuttingPanelListener = cuttingPanelListener;
71
		this.dValues = dValues;
70 72
	}
71 73
	
72 74
	/**
......
90 92

  
91 93
		BufferFactory bufferFactory = new BufferFactory(rasterMultiDataset);
92 94
		bufferFactory.addDrawableBands(bands);
93
		bufferFactory.setAreaOfInterest(extent.minX(), extent.maxY(), extent.width(), extent.height(), true);
95
		bufferFactory.setAreaOfInterest(dValues[0], dValues[3], dValues[2] - dValues[0], dValues[1] - dValues[3], (int) cuttingPanelListener.getCuttingPanel().getWidthText(), (int) cuttingPanelListener.getCuttingPanel().getHeightText());
96
		
94 97
		IBuffer buffer = bufferFactory.getRasterBuf();
95 98

  
96 99
		writerBufferServer.setBuffer(buffer);
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/cutting/ui/listener/CuttingPanelListener.java
32 32
import javax.swing.JFileChooser;
33 33
import javax.swing.JOptionPane;
34 34

  
35
import org.gvsig.fmap.drivers.GenericRasterDriver;
35 36
import org.gvsig.fmap.layers.FLyrRasterSE;
36 37
import org.gvsig.gui.beans.buttonspanel.ButtonsPanel;
37 38
import org.gvsig.gui.beans.buttonspanel.ButtonsPanelEvent;
......
53 54
import com.iver.andami.Utilities;
54 55
import com.iver.andami.ui.mdiManager.IWindow;
55 56
import com.iver.cit.gvsig.exceptions.expansionfile.ExpansionFileReadException;
56
import com.iver.cit.gvsig.exceptions.layers.LoadLayerException;
57
import com.iver.cit.gvsig.fmap.drivers.RasterDriver;
58 57
import com.iver.cit.gvsig.fmap.layers.FLayer;
59 58
import com.iver.cit.gvsig.fmap.layers.LayerFactory;
60 59
import com.iver.cit.gvsig.fmap.tools.BehaviorException;
......
95 94
	public void keyPressed(KeyEvent e) {
96 95
	}
97 96

  
97
	/**
98
	 * Cuando se presiona la tecla enter sobre los campos de texto se recalculan
99
	 * las coordenadas. Si se ha presionado sobre los cuadro correspondientes a
100
	 * las coordenadas pixel se recalculan las coordenadas del mundo real y
101
	 * viceversa.
102
	 */
98 103
	public void keyReleased(KeyEvent e) {
99
		if(e.getKeyCode() == 10){
104
		if (e.getKeyCode() == 10) {
100 105
			if (e.getSource() == panel.getCoor_pixel().getPDataInput11().getJTextField()
101 106
				|| e.getSource() == panel.getCoor_pixel().getPDataInput12().getJTextField()
102 107
				|| e.getSource() == panel.getCoor_pixel().getPDataInput21().getJTextField()
......
116 121
				double ps = 0;
117 122
				try {
118 123
					ps = Double.parseDouble(panel.getPResolution().getCCellSize().getJTextField().getText());
119
				}catch(NumberFormatException ex){
124
				} catch (NumberFormatException ex) {
120 125
					return;
121 126
				}
122 127
				Rectangle2D mapWindow = getMapWindow();
......
481 486
		WriterBufferServer dataWriter1 = new WriterBufferServer();
482 487
		Extent extent = new Extent(minX, maxY, maxX, minY);
483 488

  
484
		CuttingProcess cuttingProcess = new CuttingProcess(this, filename, dataWriter1, rasterMultiDataset, extent, drawableBands, getCuttingPanel().getCbOneLyrPerBand().isSelected());
489
		CuttingProcess cuttingProcess = new CuttingProcess(this, dValues, filename, dataWriter1, rasterMultiDataset, extent, drawableBands, getCuttingPanel().getCbOneLyrPerBand().isSelected());
485 490
		IncrementableTask incrementableTask = new IncrementableTask(dataWriter1);
486 491
		cuttingProcess.setIncrementableTask(incrementableTask);
487 492
		incrementableTask.showWindow();
......
516 521
		// Cargamos las capas
517 522
		theView.getMapControl().getMapContext().beginAtomicEvent();
518 523
		try {
519
			Driver driver = LayerFactory.getDM().getDriver("gvSIG Image Driver");
524
			Driver driver = LayerFactory.getDM().getDriver("gvSIG Raster Driver");
520 525
			int endIndex = fileNames.lastIndexOf(".");
521 526
			if (endIndex < 0)
522 527
				endIndex = fileNames.length();
523
			FLayer lyr = LayerFactory.createLayer(fileNames.substring(
528
			FLayer lyr = FLyrRasterSE.createLayer(fileNames.substring(
524 529
					fileNames.lastIndexOf(File.separator) + 1, endIndex),
525
					(RasterDriver) driver, new File(fileNames), theView
530
					(GenericRasterDriver) driver, new File(fileNames), theView
526 531
							.getMapControl().getProjection());
527 532
			theView.getMapControl().getMapContext().getLayers().addLayer(lyr);
528 533
			theView.getMapControl().getMapContext().endAtomicEvent();
......
531 536
//			grid.free();
532 537
		} catch (DriverLoadException e) {
533 538
			e.printStackTrace();
534
		} catch (LoadLayerException e) {
535
			e.printStackTrace();
536 539
		}
537 540
	}
538 541
}
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/cutting/ui/CuttingPanel.java
694 694
	public String getViewName() {
695 695
		return viewName;
696 696
	}
697
	
698
	/**
699
	 * Devuelve el valor del campo "tama?o de celda"
700
	 * @return
701
	 */
702
	public double getWidthText(){
703
		return realWidth;
704
	}
705
	
706
	/**
707
	 * Devuelve el valor del campo "tama?o de celda"
708
	 * @return
709
	 */
710
	public double getHeightText(){
711
		return realHeight;
712
	}
697 713
}
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/saveraster/map/SaveRasterListener.java
30 30
import com.iver.cit.gvsig.fmap.layers.FLayers;
31 31
import com.iver.cit.gvsig.fmap.layers.FLyrRaster;
32 32
import com.iver.cit.gvsig.fmap.tools.Events.RectangleEvent;
33
import com.iver.cit.gvsig.project.documents.view.gui.View;
34 33

  
35 34

  
36 35
/**
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/saveraster/ui/SaveRasterPanel.java
29 29
import javax.swing.JTextField;
30 30

  
31 31
import org.cresques.cts.IProjection;
32
import org.gvsig.rastertools.saveraster.ui.main.DoubleJTextInputPanel;
32 33
import org.gvsig.rastertools.saveraster.ui.main.FormatPropertiesButtonsPanel;
33
import org.gvsig.rastertools.saveraster.ui.main.DoubleJTextInputPanel;
34 34
import org.gvsig.rastertools.saveraster.ui.main.InputScaleDataPanel;
35 35
import org.gvsig.rastertools.saveraster.ui.main.InputSizeDataPanel;
36 36
import org.gvsig.rastertools.saveraster.ui.main.MethodDataInputPanel;
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/saveraster/ui/main/InputSizeDataPanel.java
18 18
*/
19 19
package org.gvsig.rastertools.saveraster.ui.main;
20 20

  
21
import java.awt.Color;
22
import java.awt.FlowLayout;
23

  
24
import javax.swing.JComboBox;
25
import javax.swing.JLabel;
21 26
import javax.swing.JPanel;
22
import javax.swing.JLabel;
23 27
import javax.swing.JTextField;
24
import javax.swing.JComboBox;
25 28

  
26
import java.awt.Color;
27
import java.awt.FlowLayout;
28

  
29 29
/**
30 30
 * 
31 31
 * @version 18/04/2007
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/saveraster/ui/listener/SaveRasterDialogListener.java
23 23
import java.awt.event.ActionEvent;
24 24
import java.awt.geom.Rectangle2D;
25 25
import java.io.File;
26
import java.util.ArrayList;
27 26

  
28
import javax.swing.JFrame;
29 27
import javax.swing.JOptionPane;
30 28

  
31 29
import org.gvsig.gui.beans.buttonspanel.ButtonsPanel;
......
39 37
import org.gvsig.raster.dataset.NotSupportedExtensionException;
40 38
import org.gvsig.raster.dataset.RasterDriverException;
41 39
import org.gvsig.raster.dataset.WriterParams;
42
import org.gvsig.raster.dataset.WriterParams.Param;
43 40
import org.gvsig.raster.util.RasterUtilities;
44 41
import org.gvsig.rastertools.saveraster.operations.RasterizerLayer;
45 42
import org.gvsig.rastertools.saveraster.operations.SaveRasterProcess;
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/saveraster/ui/info/EndInfoDialog.java
24 24
import com.iver.andami.PluginServices;
25 25
import com.iver.andami.ui.mdiManager.IWindow;
26 26
import com.iver.andami.ui.mdiManager.WindowInfo;
27
import com.iver.cit.gvsig.project.documents.gui.FOpenDialog;
28 27

  
29 28
/**
30 29
 * Dialogo de finalizaci?n del salvado a raster. En el se muestra la informaci?n de 
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/saveraster/operations/RasterizerLayer.java
30 30

  
31 31
import com.hardcode.gdbms.driver.exceptions.ReadDriverException;
32 32
import com.iver.andami.PluginServices;
33
import com.iver.cit.gvsig.fmap.MapControl;
34 33
import com.iver.cit.gvsig.fmap.ViewPort;
35 34
import com.iver.cit.gvsig.fmap.layers.FLayers;
36 35
import com.iver.cit.gvsig.fmap.layers.FLyrRaster;
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/saveraster/operations/CopyDatasetThread.java
18 18
*/
19 19
package org.gvsig.rastertools.saveraster.operations;
20 20

  
21
import java.io.File;
22 21
import java.io.IOException;
23 22

  
24 23
import org.gvsig.raster.dataset.io.GdalWriter;

Also available in: Unified diff