Revision 17687
| trunk/extensions/extRemoteSensing/src/org/gvsig/remotesensing/gui/beans/OptionsPanel.java | ||
|---|---|---|
| 642 | 642 |
getJTextRangoY2().setText(new Double(dCoord).toString()); |
| 643 | 643 |
if (rasterLayer instanceof FLyrRasterSE){
|
| 644 | 644 |
getJTextCellSize().setText(new Double( |
| 645 |
((FLyrRasterSE) rasterLayer).getBufferFactory().getXCellSize())
|
|
| 645 |
((FLyrRasterSE) rasterLayer).getCellSize()) |
|
| 646 | 646 |
.toString()); |
| 647 | 647 |
} |
| 648 | 648 |
extentHasChanged(); |
| ... | ... | |
| 691 | 691 |
layerName = layerName.substring(0,layerName.indexOf("["));
|
| 692 | 692 |
rasterLayer = (FLyrRasterSE)mapContext.getLayers().getLayer(layerName); |
| 693 | 693 |
if (rasterLayer!=null){
|
| 694 |
xMin =rasterLayer.getBufferFactory().getExtent().minX();
|
|
| 695 |
xMax =rasterLayer.getBufferFactory().getExtent().maxX();
|
|
| 696 |
yMin =rasterLayer.getBufferFactory().getExtent().minY();
|
|
| 697 |
yMax =rasterLayer.getBufferFactory().getExtent().maxY();
|
|
| 698 |
cellSize=rasterLayer.getBufferFactory().getXCellSize();
|
|
| 694 |
xMin =rasterLayer.getFullRasterExtent().minX();
|
|
| 695 |
xMax =rasterLayer.getFullRasterExtent().maxX();
|
|
| 696 |
yMin =rasterLayer.getFullRasterExtent().minY();
|
|
| 697 |
yMax =rasterLayer.getFullRasterExtent().maxY();
|
|
| 698 |
cellSize=rasterLayer.getCellSize(); |
|
| 699 | 699 |
existLayers = true; |
| 700 | 700 |
} |
| 701 | 701 |
} |
| ... | ... | |
| 706 | 706 |
rasterLayer = (FLyrRasterSE)mapContext.getLayers().getLayer(layerName); |
| 707 | 707 |
|
| 708 | 708 |
if(rasterLayer != null){
|
| 709 |
xMin = Math.min(xMin,rasterLayer.getBufferFactory().getExtent().minX());
|
|
| 710 |
xMax = Math.max(rasterLayer.getBufferFactory().getExtent().maxX(),xMax);
|
|
| 711 |
yMin = Math.min(yMin,rasterLayer.getBufferFactory().getExtent().minY());
|
|
| 712 |
yMax = Math.max(yMax,rasterLayer.getBufferFactory().getExtent().maxY());
|
|
| 713 |
cellSize = Math.min(cellSize,rasterLayer.getBufferFactory().getXCellSize());
|
|
| 709 |
xMin = Math.min(xMin,rasterLayer.getFullRasterExtent().minX());
|
|
| 710 |
xMax = Math.max(rasterLayer.getFullRasterExtent().maxX(),xMax);
|
|
| 711 |
yMin = Math.min(yMin,rasterLayer.getFullRasterExtent().minY());
|
|
| 712 |
yMax = Math.max(yMax,rasterLayer.getFullRasterExtent().maxY());
|
|
| 713 |
cellSize = Math.min(cellSize,rasterLayer.getCellSize()); |
|
| 714 | 714 |
} |
| 715 | 715 |
} |
| 716 | 716 |
|
| trunk/extensions/extRemoteSensing/src/org/gvsig/remotesensing/calculator/gui/CalculatorPanel.java | ||
|---|---|---|
| 480 | 480 |
for (i = 0; i < layers.getLayersCount(); i++){
|
| 481 | 481 |
if (layers.getLayer(i) instanceof FLyrRasterSE){
|
| 482 | 482 |
sName = "Tama?o celda [" + layers.getLayer(i).getName() + "]"; |
| 483 |
dCellsize =((FLyrRasterSE)layers.getLayer(i)).getBufferFactory().getXCellSize();
|
|
| 483 |
dCellsize =((FLyrRasterSE)layers.getLayer(i)).getCellSize(); |
|
| 484 | 484 |
m_Constants.put(sName, " " + Double.toString(dCellsize) + " "); |
| 485 | 485 |
} |
| 486 | 486 |
} |
| ... | ... | |
| 569 | 569 |
layerName = s.substring(0,s.indexOf("["));
|
| 570 | 570 |
rasterLayer2 = (FLyrRasterSE)m_MapContext.getLayers().getLayer(layerName); |
| 571 | 571 |
|
| 572 |
if ((rasterLayer1.getBufferFactory().getExtent().height() == rasterLayer2.getBufferFactory().getExtent().height()) && (rasterLayer1.getBufferFactory().getExtent().width() == rasterLayer2.getBufferFactory().getExtent().width())){// iguales){
|
|
| 572 |
if ((rasterLayer1.getFullRasterExtent().height() == rasterLayer2.getFullRasterExtent().height()) && (rasterLayer1.getFullRasterExtent().width() == rasterLayer2.getFullRasterExtent().width())){// iguales){
|
|
| 573 | 573 |
|
| 574 | 574 |
jTableVariables.actualizarVariable(row,s); |
| 575 | 575 |
jTableVariables.setEnEspera(false); |
| ... | ... | |
| 653 | 653 |
layerName = valor.substring(0,valor.indexOf("["));
|
| 654 | 654 |
rasterLayer2 = (FLyrRasterSE)m_MapContext.getLayers().getLayer(layerName); |
| 655 | 655 |
// Se compara si tienen las mismas dimensiones |
| 656 |
if ((rasterLayer1.getBufferFactory().getExtent().height() == rasterLayer2.getBufferFactory().getExtent().height()) && (rasterLayer1.getBufferFactory().getExtent().width() == rasterLayer2.getBufferFactory().getExtent().width()) )// && (qWindow.getNY()== qWindow1.getNY())
|
|
| 656 |
if ((rasterLayer1.getFullRasterExtent().height() == rasterLayer2.getFullRasterExtent().height()) && (rasterLayer1.getFullRasterExtent().width() == rasterLayer2.getFullRasterExtent().width()) )// && (qWindow.getNY()== qWindow1.getNY())
|
|
| 657 | 657 |
{
|
| 658 | 658 |
s=jTableVariables.InsertRow(null,valor); |
| 659 | 659 |
getQWindowsHash().put(s,null); |
| trunk/extensions/extRemoteSensing/src/org/gvsig/remotesensing/gridmath/gui/OutputOptionsPanel.java | ||
|---|---|---|
| 682 | 682 |
getJTextRangoY2().setText(new Double(dCoord).toString()); |
| 683 | 683 |
if (rasterLayer instanceof FLyrRasterSE){
|
| 684 | 684 |
getJTextCellSize().setText(new Double( |
| 685 |
((FLyrRasterSE) rasterLayer).getBufferFactory().getXCellSize())
|
|
| 685 |
((FLyrRasterSE) rasterLayer).getCellSize()) |
|
| 686 | 686 |
.toString()); |
| 687 | 687 |
} |
| 688 | 688 |
extentHasChanged(); |
| ... | ... | |
| 704 | 704 |
layerName = layerName.substring(0,layerName.indexOf("["));
|
| 705 | 705 |
FLyrRasterSE rasterLayer = (FLyrRasterSE)mapContext.getLayers().getLayer(layerName); |
| 706 | 706 |
|
| 707 |
double xMin =rasterLayer.getBufferFactory().getExtent().minX();
|
|
| 708 |
double xMax =rasterLayer.getBufferFactory().getExtent().maxX();
|
|
| 709 |
double yMin =rasterLayer.getBufferFactory().getExtent().minY();
|
|
| 710 |
double yMax =rasterLayer.getBufferFactory().getExtent().maxY();
|
|
| 711 |
double cellSize=rasterLayer.getBufferFactory().getXCellSize();
|
|
| 707 |
double xMin =rasterLayer.getFullRasterExtent().minX();
|
|
| 708 |
double xMax =rasterLayer.getFullRasterExtent().maxX();
|
|
| 709 |
double yMin =rasterLayer.getFullRasterExtent().minY();
|
|
| 710 |
double yMax =rasterLayer.getFullRasterExtent().maxY();
|
|
| 711 |
double cellSize=rasterLayer.getBufferFactory().getDataSource().getCellSize();
|
|
| 712 | 712 |
|
| 713 | 713 |
for (int i=0;i<cp.getCalculatorPanel().getJTableVariables().getTableFormat().getRowCount();i++){
|
| 714 | 714 |
layerName = cp.getCalculatorPanel().getJTableVariables().getTableFormat().getValueAt(i,1).toString(); |
| 715 | 715 |
layerName = layerName.substring(0,layerName.indexOf("["));
|
| 716 | 716 |
rasterLayer = (FLyrRasterSE)mapContext.getLayers().getLayer(layerName); |
| 717 | 717 |
|
| 718 |
xMin = Math.min(xMin,rasterLayer.getBufferFactory().getExtent().minX());
|
|
| 719 |
xMax = Math.max(rasterLayer.getBufferFactory().getExtent().maxX(),xMax);
|
|
| 720 |
yMin = Math.min(yMin,rasterLayer.getBufferFactory().getExtent().minY());
|
|
| 721 |
yMax = Math.max(yMax,rasterLayer.getBufferFactory().getExtent().maxY());
|
|
| 722 |
cellSize = Math.min(cellSize,rasterLayer.getBufferFactory().getXCellSize());
|
|
| 718 |
xMin = Math.min(xMin,rasterLayer.getFullRasterExtent().minX());
|
|
| 719 |
xMax = Math.max(rasterLayer.getFullRasterExtent().maxX(),xMax);
|
|
| 720 |
yMin = Math.min(yMin,rasterLayer.getFullRasterExtent().minY());
|
|
| 721 |
yMax = Math.max(yMax,rasterLayer.getFullRasterExtent().maxY());
|
|
| 722 |
cellSize = Math.min(cellSize,rasterLayer.getCellSize()); |
|
| 723 | 723 |
} |
| 724 | 724 |
|
| 725 | 725 |
cp.getOutputExtent().setXRange(xMin,xMax); |
| trunk/extensions/extRasterTools-SE/src-test-ui/org/gvsig/imagenavigator/TestImageNavigator.java | ||
|---|---|---|
| 29 | 29 |
import org.gvsig.gui.beans.imagenavigator.ImageNavigator; |
| 30 | 30 |
import org.gvsig.raster.RasterLibrary; |
| 31 | 31 |
import org.gvsig.raster.buffer.BufferFactory; |
| 32 |
import org.gvsig.raster.buffer.RasterBufferInvalidException; |
|
| 32 | 33 |
import org.gvsig.raster.dataset.InvalidSetViewException; |
| 33 | 34 |
import org.gvsig.raster.dataset.NotSupportedExtensionException; |
| 34 | 35 |
import org.gvsig.raster.dataset.RasterDataset; |
| 35 | 36 |
import org.gvsig.raster.dataset.io.RasterDriverException; |
| 36 | 37 |
import org.gvsig.raster.datastruct.Extent; |
| 37 | 38 |
import org.gvsig.raster.datastruct.ViewPortData; |
| 39 |
import org.gvsig.raster.grid.Grid; |
|
| 38 | 40 |
import org.gvsig.raster.grid.render.Rendering; |
| 39 | 41 |
|
| 40 | 42 |
import com.iver.cit.gvsig.fmap.ViewPort; |
| ... | ... | |
| 48 | 50 |
private String baseDir = "./test-images/"; |
| 49 | 51 |
private String path = baseDir + "03AUG23153350-M2AS-000000122423_01_P001-BROWSE.jpg"; |
| 50 | 52 |
private RasterDataset f = null; |
| 51 |
private BufferFactory ds = null;
|
|
| 53 |
private BufferFactory bf = null;
|
|
| 52 | 54 |
private Rendering rendering = null; |
| 53 | 55 |
private Extent extent2 = null; |
| 56 |
private Grid grid = null; |
|
| 54 | 57 |
|
| 55 | 58 |
private JFrame jFrame = null; |
| 56 | 59 |
private ImageNavigator imageNavigator = null; |
| ... | ... | |
| 70 | 73 |
e.printStackTrace(); |
| 71 | 74 |
return; |
| 72 | 75 |
} |
| 73 |
ds = new BufferFactory(f); |
|
| 74 |
ds.setDrawableBands(drawableBands); |
|
| 76 |
bf = new BufferFactory(f); |
|
| 77 |
bf.setDrawableBands(drawableBands); |
|
| 78 |
try {
|
|
| 79 |
grid = new Grid(bf); |
|
| 80 |
} catch (RasterBufferInvalidException e) {
|
|
| 81 |
e.printStackTrace(); |
|
| 82 |
return; |
|
| 83 |
} |
|
| 75 | 84 |
|
| 76 | 85 |
//ds.setAreaOfInterest(645817.0, 4923851.0, 645853.0, 4923815.0, 100, 100, true); |
| 77 |
rendering = new Rendering(ds);
|
|
| 78 |
extent2 = ds.getExtent();
|
|
| 86 |
rendering = new Rendering(bf);
|
|
| 87 |
extent2 = f.getExtent();
|
|
| 79 | 88 |
// a.draw(g, vp) |
| 80 | 89 |
initialize(); |
| 81 | 90 |
} |
| ... | ... | |
| 87 | 96 |
jFrame.setVisible(true); |
| 88 | 97 |
|
| 89 | 98 |
getImageNavigator().setViewDimensions(extent2.getMin().getX(), extent2.getMax().getY(), extent2.getMax().getX(), extent2.getMin().getY()); |
| 90 |
getImageNavigator().setZoom(1.0/ds.getXCellSize());
|
|
| 99 |
getImageNavigator().setZoom(1.0 / grid.getCellSize());
|
|
| 91 | 100 |
getImageNavigator().updateBuffer(); |
| 92 | 101 |
jFrame.setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); |
| 93 | 102 |
} |
| trunk/extensions/extRasterTools-SE/config/text.properties | ||
|---|---|---|
| 305 | 305 |
loadlayer_aplicar=Al cargar un MDT, aplicarle |
| 306 | 306 |
global=Global |
| 307 | 307 |
capa=Capa |
| 308 |
nodata_modificado_continuar=El valor NoData predeterminado de la capa raster va a ser modificado. ?Desea continuar? |
|
| 308 |
nodata_modificado_continuar=El valor NoData predeterminado de la capa raster va a ser modificado. ?Desea continuar? |
|
| 309 |
transf=Transformaci?n |
|
| 310 |
corners=Esquinas |
|
| trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/geolocation/ui/GeoLocationOpeningRasterDialog.java | ||
|---|---|---|
| 47 | 47 |
private GeoLocationOpeningRasterPanel geolocationPanel = null; |
| 48 | 48 |
|
| 49 | 49 |
private int widthWindow = 260; |
| 50 |
private int heightWindow = 145;
|
|
| 50 |
private int heightWindow = 165;
|
|
| 51 | 51 |
|
| 52 | 52 |
/** |
| 53 | 53 |
* Constructor |
| trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/saveraster/operations/RasterizerLayer.java | ||
|---|---|---|
| 147 | 147 |
for (int i = 0; i < flayers.getLayersCount(); i++) {
|
| 148 | 148 |
if (flayers.getLayer(i) instanceof FLyrRasterSE) {
|
| 149 | 149 |
FLyrRasterSE raster = (FLyrRasterSE) flayers.getLayer(i); |
| 150 |
if (raster.getBufferFactory().getDataType() == IBuffer.TYPE_SHORT || raster.getBufferFactory().getDataType() == IBuffer.TYPE_USHORT) {
|
|
| 150 |
if (raster.getDataType()[0] == IBuffer.TYPE_SHORT || raster.getDataType()[0] == IBuffer.TYPE_USHORT) {
|
|
| 151 | 151 |
//Statistic stats = raster.getSource().getFilterStack().getStats(); |
| 152 | 152 |
//stats.history.add(stats.new History(raster.getName(), stats.minBandValue, stats.maxBandValue, stats.secondMinBandValue, stats.secondMaxBandValue)); |
| 153 | 153 |
} |
| ... | ... | |
| 172 | 172 |
for (int i = 0; i < flayers.getLayersCount(); i++) {
|
| 173 | 173 |
if (flayers.getLayer(i) instanceof FLyrRasterSE) {
|
| 174 | 174 |
FLyrRasterSE raster = (FLyrRasterSE) flayers.getLayer(i); |
| 175 |
if (raster.getBufferFactory().getDataType() == IBuffer.TYPE_SHORT || raster.getBufferFactory().getDataType() == IBuffer.TYPE_USHORT) {
|
|
| 175 |
if (raster.getDataType()[0] == IBuffer.TYPE_SHORT || raster.getDataType()[0] == IBuffer.TYPE_USHORT) {
|
|
| 176 | 176 |
//raster.getDatasource().getFilterStack().getStats().history.clear(); |
| 177 | 177 |
//Statistic stats = raster.getSource().getFilterStack().getStats(); |
| 178 | 178 |
} |
| trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/filter/FilterListener.java | ||
|---|---|---|
| 463 | 463 |
ViewPortData vp2 = new ViewPortData(vp.getProjection(), extent, dimension); |
| 464 | 464 |
vp2.setMat(new AffineTransform(zoom, 0.0, 0.0, zoom, -x1*zoom, -y1*zoom)); |
| 465 | 465 |
|
| 466 |
Extent extent2 = ((FLyrRasterSE) getFilterPanel().getLayer()).getBufferFactory().getExtent();
|
|
| 466 |
Extent extent2 = ((FLyrRasterSE) getFilterPanel().getLayer()).getFullRasterExtent();//.getBufferFactory().getDataSource().getExtent();
|
|
| 467 | 467 |
|
| 468 | 468 |
AffineTransform trans = g.getTransform(); |
| 469 | 469 |
// Calcular cuanto sobresale la imagen y rectificar ese desplazamiento |
| trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/filter/ui/FilterPanel.java | ||
|---|---|---|
| 533 | 533 |
RasterToolsUtil.messageBoxInfo("file_too_big", this);
|
| 534 | 534 |
filterListener.setCompress(true); |
| 535 | 535 |
} |
| 536 |
Extent extent2 = ((FLyrRasterSE) fLayer).getBufferFactory().getExtent(); |
|
| 536 |
Extent extent2 = ((FLyrRasterSE) fLayer).getFullRasterExtent();//.getBufferFactory().getExtent();
|
|
| 537 | 537 |
|
| 538 | 538 |
double x1 = extent2.getULX(); |
| 539 | 539 |
double y1 = extent2.getULY(); |
| ... | ... | |
| 541 | 541 |
double y2 = extent2.getLRY(); |
| 542 | 542 |
|
| 543 | 543 |
getImageNavigator().setViewDimensions(x1, y1, x2, y2); |
| 544 |
getImageNavigator().setZoom(1.0/((FLyrRasterSE) fLayer).getBufferFactory().getXCellSize());
|
|
| 544 |
getImageNavigator().setZoom(1.0/((FLyrRasterSE) fLayer).getBufferFactory().getDataSource().getCellSize());
|
|
| 545 | 545 |
getImageNavigator().imageCenter(); |
| 546 | 546 |
getImageNavigator().updateBuffer(); |
| 547 | 547 |
|
| trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/colortable/ColorTableListener.java | ||
|---|---|---|
| 112 | 112 |
ViewPortData vp2 = new ViewPortData(vp.getProjection(), extent, dimension); |
| 113 | 113 |
vp2.setMat(new AffineTransform(zoom, 0.0, 0.0, zoom, -x1 * zoom, -y1 * zoom)); |
| 114 | 114 |
|
| 115 |
Extent extent2 = previewLayer.getBufferFactory().getExtent(); |
|
| 115 |
Extent extent2 = previewLayer.getBufferFactory().getDataSource().getExtent();
|
|
| 116 | 116 |
|
| 117 | 117 |
AffineTransform trans = g.getTransform(); |
| 118 | 118 |
// Calcular cuanto sobresale la imagen y rectificar ese desplazamiento |
| trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/colortable/ui/ColorTablePanel.java | ||
|---|---|---|
| 709 | 709 |
getColorTableListener().setLayer(fLayer); |
| 710 | 710 |
|
| 711 | 711 |
// Especificar las dimensiones de la capa en la vista previa |
| 712 |
Extent extent2 = ((FLyrRasterSE) fLayer).getBufferFactory().getExtent();
|
|
| 712 |
Extent extent2 = ((FLyrRasterSE) fLayer).getFullRasterExtent();//.getBufferFactory().getDataSource().getExtent();
|
|
| 713 | 713 |
getImageNavigator().setViewDimensions(extent2.getMin().getX(), extent2.getMax().getY(), extent2.getMax().getX(), extent2.getMin().getY()); |
| 714 |
getImageNavigator().setZoom(1.0/((FLyrRasterSE) fLayer).getBufferFactory().getXCellSize());
|
|
| 714 |
getImageNavigator().setZoom(1.0/((FLyrRasterSE) fLayer).getBufferFactory().getDataSource().getCellSize());
|
|
| 715 | 715 |
getImageNavigator().setAutoAdjusted(); |
| 716 | 716 |
|
| 717 | 717 |
RasterFilterList rasterFilterList = ((FLyrRasterSE) getLayer()).getRenderFilterList(); |
| trunk/extensions/extRasterTools-SE/src/org/gvsig/fmap/raster/layers/FLyrRasterSE.java | ||
|---|---|---|
| 135 | 135 |
private RasterDrawStrategy strategy = null; |
| 136 | 136 |
|
| 137 | 137 |
/** |
| 138 |
* Posicion en la que se encuentra el comboBox del panel de propiedades.
|
|
| 138 |
* Tipo de valor no data asociado a la capa.
|
|
| 139 | 139 |
* Sirve para diferenciar los estados seleccionados por el usuario. Siendo |
| 140 | 140 |
* estos estado General, Capa (Por defecto) y Personalizado |
| 141 | 141 |
*/ |
| ... | ... | |
| 1084 | 1084 |
} |
| 1085 | 1085 |
|
| 1086 | 1086 |
/** |
| 1087 |
* Obtiene el valor NoData asociado al raster.
|
|
| 1088 |
* @return |
|
| 1087 |
* Asigna el valor noData asociado a la capa
|
|
| 1088 |
* @return double que representa el valor noData asociado a la capa
|
|
| 1089 | 1089 |
*/ |
| 1090 | 1090 |
public double getNoDataValue() {
|
| 1091 | 1091 |
return dataset.getNoDataValue(0); |
| ... | ... | |
| 1095 | 1095 |
* Asigna el valor no data asociado a la capa |
| 1096 | 1096 |
* @param nd |
| 1097 | 1097 |
*/ |
| 1098 |
public void setNoDataValue(double nd){
|
|
| 1099 |
if (bufferFactory != null) |
|
| 1100 |
bufferFactory.setNoDataValue(nd); |
|
| 1098 |
public void setNoDataValue(double nd) {
|
|
| 1101 | 1099 |
dataset.setNoDataValue(0, nd); |
| 1102 | 1100 |
} |
| 1103 | 1101 |
|
| ... | ... | |
| 1332 | 1330 |
} |
| 1333 | 1331 |
return new Grid(bf, interpolated); |
| 1334 | 1332 |
} |
| 1335 |
|
|
| 1333 |
|
|
| 1334 |
/** |
|
| 1335 |
* Obtiene el tama?o de celda de la fuente de datos |
|
| 1336 |
* @return double con el tama?o de celda |
|
| 1337 |
*/ |
|
| 1338 |
public double getCellSize() {
|
|
| 1339 |
return (getDataSource() != null) ? getDataSource().getCellSize() : 1; |
|
| 1340 |
} |
|
| 1341 |
|
|
| 1336 | 1342 |
/* |
| 1337 | 1343 |
* (non-Javadoc) |
| 1338 | 1344 |
* @see org.gvsig.raster.shared.IRasterGeoOperations#getFullRasterExtent() |
Also available in: Unified diff