Revision 1057

View differences:

org.gvsig.geoprocess/branches/refactor-2018/org.gvsig.geoprocess/org.gvsig.geoprocess.lib/org.gvsig.geoprocess.lib.sextante/src/main/java/org/gvsig/geoprocess/lib/sextante/SimpleTaskStatusDelegated.java
183 183
        status.setCancellable(cancellable);
184 184
    }
185 185

  
186
    @Override
186 187
    public boolean isCancelled() {
187 188
        return status.isCancelled()
188 189
            || (monitor != null && monitor.isCanceled());
......
243 244
		status.setIndeterminate();
244 245
	}
245 246

  
247
    @Override
248
    public void restart() {
249
        status.restart();
250
    }
251

  
246 252
}
org.gvsig.geoprocess/branches/refactor-2018/org.gvsig.geoprocess/org.gvsig.geoprocess.lib/org.gvsig.geoprocess.lib.sextante/src/main/java/org/gvsig/geoprocess/lib/sextante/dataObjects/RasterDriver.java
35 35
import org.gvsig.fmap.dal.DALLocator;
36 36
import org.gvsig.fmap.dal.DataManager;
37 37
import org.gvsig.fmap.dal.DataServerExplorerParameters;
38
import org.gvsig.fmap.dal.DataStore;
38 39
import org.gvsig.fmap.dal.raster.api.NewRasterStoreParameters;
39 40
import org.gvsig.fmap.dal.serverexplorer.filesystem.FilesystemServerExplorer;
40 41
import org.gvsig.raster.lib.buffer.api.Buffer;
......
64 65
        int[] listDataType; //TODO check how listDataType is made.
65 66
        listDataType = new int[1];
66 67
        listDataType[0] = (iDataType);
67
        buf = BufferLocator.getBufferManager().createBuffer(ae.getNX(), ae.getNY(), listDataType, projection);
68
        buf = BufferLocator.getBufferManager().createBuffer(ae.getNY(),ae.getNX(), listDataType, projection);
68 69
        m_GridExtent = ae;
69 70

  
70 71
    }
......
130 131
    }
131 132

  
132 133
    public void setNoDataValue(final double dNoDataValue) {
133
        // TODO: hablar con NACHO
134 134
        for (int i = 0; i < buf.getBandCount(); i++) {
135 135
                if (buf.getBand(i).getNoData()== null) {
136 136
                    NoData nodata = BufferLocator.getBufferManager().createNoData(dNoDataValue, null);
......
230 230
            FilesystemServerExplorer server = (FilesystemServerExplorer) dm.openServerExplorer(FilesystemServerExplorer.NAME, serverParameters);
231 231
            File file = new File(sFilename);
232 232
            NewRasterStoreParameters parameters = (NewRasterStoreParameters) server.getAddParameters(file);
233
            parameters.setDynValue("crs", projection);
233
            parameters.setDynValue(DataStore.METADATA_CRS, projection);
234 234
            parameters.setBuffer(buf);
235 235
            server.add(parameters.getDataStoreName(), parameters, true);
236 236
            
237
            
237 238
            return true;
238 239
        } catch (Exception e) {
239 240
            Sextante.addErrorToLog(e);
org.gvsig.geoprocess/branches/refactor-2018/org.gvsig.geoprocess/org.gvsig.geoprocess.lib/org.gvsig.geoprocess.lib.sextante/src/main/java/org/gvsig/geoprocess/lib/sextante/dataObjects/BufferWriteOnlyIRasterLayer.java
57 57

  
58 58
      final RasterDriver rmd = new RasterDriver(ae, iDataType, iNumBands);
59 59
      rmd.setName(sName);
60
        rmd.setNoDataValue(SextanteGUI.getOutputFactory()
61
            .getDefaultNoDataValue());
60
      rmd.setNoDataValue(SextanteGUI.getOutputFactory().getDefaultNoDataValue());
62 61

  
63 62
      m_RasterDriver = rmd;
64 63
      m_sFilename = sFilename;
org.gvsig.geoprocess/branches/refactor-2018/org.gvsig.geoprocess/org.gvsig.geoprocess.lib/org.gvsig.geoprocess.lib.sextante/src/main/java/org/gvsig/geoprocess/lib/sextante/dataObjects/FLyrRasterIRasterLayer.java
108 108

  
109 109
    }
110 110

  
111
    @Override
112
    public double getNoDataValue() {
111
    public double getNoDataValue(final int iBand) {
113 112
        NoData noData = getDataStore().getBandDescriptor(0).getNoData();
114 113
    	if(noData!=null && noData.getValue() != null)
115 114
                return noData.getValue().doubleValue();
116 115
    	return -99999.0;
117 116
    }
117
    
118
    @Override
119
    public double getNoDataValue() {
120
        return getNoDataValue(0);
121
    }
118 122

  
119 123
    @Override
120 124
    public double getCellValueInLayerCoords(final int x, final int y,
......
127 131
    	if (m_Buffer.isInside(newx, newy)) {
128 132
    		switch (getDataStore().getBandDescriptor(iBand).getDataType()) {
129 133
    		case BufferManager.TYPE_BYTE:
130
    			return (m_Buffer.getBandByte(iBand).getValue(newx, newy) & 0xff);
134
    			return (m_Buffer.getBandByte(iBand).getValue(newy, newx) & 0xff);
131 135
    		case BufferManager.TYPE_SHORT:
132
    			return m_Buffer.getBandShort(iBand).getValue(newx, newy);
136
    			return m_Buffer.getBandShort(iBand).getValue(newy, newx);
133 137
    		case BufferManager.TYPE_INT:
134
    			return m_Buffer.getBandInt(iBand).getValue(newx, newy);
138
    			return m_Buffer.getBandInt(iBand).getValue(newy, newx);
135 139
    		case BufferManager.TYPE_FLOAT:
136
    			return m_Buffer.getBandFloat(iBand).getValue(newx, newy);
140
    			return m_Buffer.getBandFloat(iBand).getValue(newy, newx);
137 141
    		case BufferManager.TYPE_DOUBLE:
138 142
    		default:
139
    			return m_Buffer.getBandFloat(iBand).getValue(newx, newy);    		}
143
    			return m_Buffer.getBandDouble(iBand).getValue(newy, newx);    	
144
                }
140 145
    	} else {
141 146
    		return getNoDataValue();
142 147
    	}

Also available in: Unified diff