Revision 2115

View differences:

org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.algorithm/src/main/java/org/gvsig/raster/algorithm/process/ProcessUtils.java
47 47
import org.gvsig.fmap.dal.coverage.store.RasterQuery;
48 48
import org.gvsig.fmap.dal.coverage.store.RasterWriter;
49 49
import org.gvsig.fmap.dal.coverage.store.props.ColorInterpretation;
50
import org.gvsig.fmap.dal.exception.InitializeException;
51
import org.gvsig.fmap.dal.exception.ProviderNotRegisteredException;
50 52
import org.gvsig.i18n.Messages;
51 53
import org.slf4j.LoggerFactory;
52 54
/**
......
121 123
	 * @param minX
122 124
	 * @param minY
123 125
	 * @return
126
	 * @throws ProviderNotRegisteredException 
127
	 * @throws InitializeException 
124 128
	 */
125 129
	public boolean exportRaster(final String sFilename, 
126 130
			Buffer buf, 
131
			double cellsize, 
132
			double minX, 
133
			double minY,
134
			NoData nodata) {
135
		boolean result = exportRaster(sFilename, buf, cellsize, minX, minY);
136
		nodata.setFileName(sFilename);
137
		nodata.save();
138
		return result;
139
		/*DataManager manager = DALLocator.getDataManager();
140
		String provider = "Gdal Store";
141
		DataServerExplorerParameters eparams = manager.createServerExplorerParameters("FilesystemExplorer");
142
		
143
		DataServerExplorer serverExplorer = manager.openServerExplorer(eparams.getExplorerName(), eparams);
144

  
145
		NewRasterStoreParameters sparams = (NewRasterStoreParameters)serverExplorer.getAddParameters(provider);
146
		sparams.setDataServer((DataServerWriter)processIncrement);
147
		sparams.setDestination(path, file);
148
		sparams.setBuffer(buffer);
149
		sparams.setColorInterpretation(new String[]{ColorInterpretation.GRAY_BAND});
150
		sparams.setWktProjection(dstoreCopy.getWktProjection());
151
		sparams.setBand(i);
152
		sparams.setAffineTransform(affineTransform);
153
		sparams.setDriverParams(params);*/
154
	}
155
	
156
	/**
157
	 * Exports a raster buffer to disk
158
	 * @param sFilename
159
	 * @param buf
160
	 * @param cellsize
161
	 * @param minX
162
	 * @param minY
163
	 * @return
164
	 */
165
	@SuppressWarnings("deprecation")
166
	public boolean exportRaster(final String sFilename, 
167
			Buffer buf, 
127 168
			Buffer alphaBuffer, 
128 169
			double cellsize, 
129 170
			double minX, 
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/store/AbstractNewRasterStoreParameters.java
116 116
		return this.delegatedDynObject;
117 117
	}
118 118
	
119
	/*
120
	 * (non-Javadoc)
121
	 * @see org.gvsig.fmap.dal.coverage.store.parameter.NewRasterStoreParameters#getBuffer()
122
	 */
123 119
	public Buffer getBuffer() {
124 120
		return buffer;
125 121
	}
126 122

  
127
	/*
128
	 * (non-Javadoc)
129
	 * @see org.gvsig.fmap.dal.coverage.store.parameter.NewRasterStoreParameters#getColorInterpretation()
130
	 */
131 123
	public String[] getColorInterpretation() {
132 124
		return (String[])getDynValue(FIELD_COLORINTERPRETATION);
133 125
	}
134 126

  
135
	/*
136
	 * (non-Javadoc)
137
	 * @see org.gvsig.fmap.dal.coverage.store.parameter.NewRasterStoreParameters#getFileName()
138
	 */
139 127
	public String getFileName() {
140 128
		String s = getFile().toString();
141 129
		int n = s.lastIndexOf(File.separator);
......
144 132
		return s;
145 133
	}
146 134
	
147
	/*
148
	 * (non-Javadoc)
149
	 * @see org.gvsig.fmap.dal.coverage.store.parameter.NewRasterStoreParameters#getPath()
150
	 */
151 135
	public String getPath() {
152 136
		String s = getFile().toString();
153 137
		int n = s.lastIndexOf(File.separator);
......
156 140
		return s;
157 141
	}
158 142
	
159
	/*
160
	 * (non-Javadoc)
161
	 * @see org.gvsig.fmap.dal.coverage.store.parameter.NewRasterStoreParameters#getProjection()
162
	 */
163 143
	public IProjection getProjection() {
164 144
		return (IProjection) getDynValue(FIELD_SRS);
165 145
	}
166 146
	
167
	/*
168
	 * (non-Javadoc)
169
	 * @see org.gvsig.fmap.dal.coverage.store.parameter.NewRasterStoreParameters#getDriverParams()
170
	 */
171 147
	public Params getDriverParams() {
172 148
		return (Params)getDynValue(FIELD_PARAMS);
173 149
	}
174 150
	
175
	/*
176
	 * (non-Javadoc)
177
	 * @see org.gvsig.fmap.dal.coverage.store.parameter.NewRasterStoreParameters#setDriverParams(org.gvsig.fmap.dal.coverage.datastruct.Params)
178
	 */
179 151
	public void setDriverParams(Params params) {
180 152
		this.setDynValue(FIELD_PARAMS, params);
181 153
	}
182 154
	
183
	/*
184
	 * (non-Javadoc)
185
	 * @see org.gvsig.fmap.dal.coverage.store.parameter.NewRasterStoreParameters#setBuffer(org.gvsig.fmap.dal.coverage.dataset.Buffer)
186
	 */
187 155
	public void setBuffer(Buffer buffer) {
188 156
		this.buffer = buffer;
189 157
	}
190 158
	
191
	/*
192
	 * (non-Javadoc)
193
	 * @see org.gvsig.fmap.dal.coverage.store.parameter.NewRasterStoreParameters#getBand()
194
	 */
195 159
	public int getBand() {
196 160
		if(getDynValue(FIELD_BAND) == null)
197 161
			return -1;
198 162
		return (Integer)getDynValue(FIELD_BAND);
199 163
	}
200 164
	
201
	/*
202
	 * (non-Javadoc)
203
	 * @see org.gvsig.fmap.dal.coverage.store.parameter.NewRasterStoreParameters#setBand(int)
204
	 */
205 165
	public void setBand(int n) {
206 166
		this.setDynValue(FIELD_BAND, n);
207 167
	}
208 168
	
209
	/*
210
	 * (non-Javadoc)
211
	 * @see org.gvsig.fmap.dal.coverage.store.parameter.NewRasterStoreParameters#setAffineTransform(java.awt.geom.AffineTransform)
212
	 */
213 169
	public void setAffineTransform(AffineTransform at) {
214 170
		StringBuilder str = new StringBuilder();
215 171
		str.append(at.getScaleX());
......
226 182
		this.setDynValue(FIELD_AFFINETRANSFORM, str);
227 183
	}
228 184
	
229
	/*
230
	 * (non-Javadoc)
231
	 * @see org.gvsig.fmap.dal.coverage.store.parameter.NewRasterStoreParameters#getAffineTransform()
232
	 */
233 185
	public AffineTransform getAffineTransform() {
234 186
		if(getDynValue(FIELD_AFFINETRANSFORM) != null) {
235 187
			String str = (String)getDynValue(FIELD_AFFINETRANSFORM);
......
245 197
		return null;
246 198
	}
247 199
	
248
	/*
249
	 * (non-Javadoc)
250
	 * @see org.gvsig.fmap.dal.coverage.store.parameter.NewRasterStoreParameters#setWktProjection(java.lang.String)
251
	 */
252 200
	public void setWktProjection(String wkt) {
253 201
		this.setDynValue(FIELD_WKT, wkt);
254 202
	}
255 203
	
256
	/*
257
	 * (non-Javadoc)
258
	 * @see org.gvsig.fmap.dal.coverage.store.parameter.NewRasterStoreParameters#getWktProjection()
259
	 */
260 204
	public String getWktProjection() {
261 205
		return (String)getDynValue(FIELD_WKT);
262 206
	}
263 207

  
264
	/*
265
	 * (non-Javadoc)
266
	 * @see org.gvsig.fmap.dal.coverage.store.parameter.NewRasterStoreParameters#setColorInterpretation(java.lang.String[])
267
	 */
268 208
	public void setColorInterpretation(String[] colorInterpretation) {
269 209
		this.setDynValue(FIELD_COLORINTERPRETATION, colorInterpretation);
270 210
	}
271 211

  
272
	/*
273
	 * (non-Javadoc)
274
	 * @see org.gvsig.fmap.dal.coverage.store.parameter.NewRasterStoreParameters#setDestination(java.lang.String, java.lang.String)
275
	 */
276 212
	public void setDestination(String path, String fileName) {
277 213
		this.setFile(new File(path, fileName));
278 214
	}
279 215

  
280
	/*
281
	 * (non-Javadoc)
282
	 * @see org.gvsig.fmap.dal.coverage.store.parameter.NewRasterStoreParameters#setProjection(org.cresques.cts.IProjection)
283
	 */
284 216
	public void setProjection(IProjection projection) {
285 217
		this.setDynValue(FIELD_SRS, projection);
286 218
	}
......
291 223
		return true;
292 224
	}
293 225
	
294
	/*
295
	 * (non-Javadoc)
296
	 * @see org.gvsig.fmap.dal.coverage.store.parameter.NewRasterStoreParameters#getDataServer()
297
	 */
298 226
	public DataServerWriter getDataServer() {
299 227
		return (DataServerWriter)getDynValue(FIELD_DATA_SERVER);
300 228
	}
301 229

  
302
	/*
303
	 * (non-Javadoc)
304
	 * @see org.gvsig.fmap.dal.coverage.store.parameter.NewRasterStoreParameters#setDataServer(org.gvsig.fmap.dal.coverage.store.DataServerWriter)
305
	 */
306 230
	public void setDataServer(DataServerWriter dataServer) {
307 231
		this.setDynValue(FIELD_DATA_SERVER, dataServer);
308 232
	}
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/datastruct/DefaultNoData.java
121 121
			this.bandCount = bandCount;
122 122
	}
123 123
	
124
	/*
125
	 * (non-Javadoc)
126
	 * @see org.gvsig.fmap.dal.coverage.datastruct.NoData#getValue()
127
	 */
128 124
	public Number getValue() {
129 125
		try {
130 126
			return noDataByBand.get(0);
......
133 129
		}
134 130
	}
135 131
	
136
	/*
137
	 * (non-Javadoc)
138
	 * @see org.gvsig.fmap.dal.coverage.datastruct.NoData#isDefined()
139
	 */
140 132
	public boolean isDefined() {
141 133
		return (getValue() != null);
142 134
	}
143

  
144
	/*
145
	 * (non-Javadoc)
146
	 * @see org.gvsig.fmap.dal.coverage.datastruct.NoData#setValue(java.lang.Number)
147
	 */
135
	
148 136
	public void setValue(Number noData) {
149 137
		noDataByBand.clear();
150 138
		for (int i = 0; i < bandCount; i++) {
......
161 149
		}
162 150
	}
163 151
	
164
	/*
165
	 * (non-Javadoc)
166
	 * @see org.gvsig.fmap.dal.coverage.datastruct.NoData#setNativeValue(double)
167
	 */
168 152
	public void setNativeValue(Number nativeNoDataValue) {
169 153
		nativeNoDataByBand.clear();
170 154
		for (int i = 0; i < bandCount; i++) {
......
173 157
		setDataType(nativeNoDataValue);
174 158
	}
175 159

  
176
	/*
177
	 * (non-Javadoc)
178
	 * @see org.gvsig.fmap.dal.coverage.datastruct.NoData#delete()
179
	 */
180 160
	public void delete() {
181 161
		noDataByBand.clear();
182 162
		for (int i = 0; i < bandCount; i++) {
......
184 164
		}
185 165
	}
186 166

  
187
	/*
188
	 * (non-Javadoc)
189
	 * @see org.gvsig.fmap.dal.coverage.datastruct.NoData#restore()
190
	 */
191 167
	public void restore() {
192 168
		if(nativeNoDataByBand != null && nativeNoDataByBand.size() == bandCount) {
193 169
			noDataByBand.clear();
......
197 173
		}
198 174
	}
199 175

  
200
	/*
201
	 * (non-Javadoc)
202
	 * @see org.gvsig.fmap.dal.coverage.datastruct.NoData#save()
203
	 */
204 176
	public void save() {
205 177
		try {
206 178
			String fileRMF = RasterLocator.getManager().getFileUtils().getNameWithoutExtension(fileName) + ".rmf";
......
225 197
		}
226 198
	}
227 199
	
228
	/*
229
	 * (non-Javadoc)
230
	 * @see org.gvsig.fmap.dal.coverage.datastruct.NoData#load()
231
	 */
232 200
	public void load() {
233 201
		try {
234 202
			String fileRMF = RasterLocator.getManager().getFileUtils().getNameWithoutExtension(fileName) + ".rmf";
......
255 223
		}
256 224
	}
257 225
	
258
	/*
259
	 * (non-Javadoc)
260
	 * @see org.gvsig.fmap.dal.coverage.datastruct.NoData#setFileName(java.lang.String)
261
	 */
262 226
	public void setFileName(String fileName) {
263 227
		this.fileName = fileName;
264 228
	}
265 229
	
266
	/*
267
	 * (non-Javadoc)
268
	 * @see org.gvsig.fmap.dal.coverage.datastruct.NoData#isNoDataTransparent()
269
	 */
270 230
	public boolean isNoDataTransparent() {
271 231
		return noDataAsTransparent;
272 232
	}
273 233

  
274
	/*
275
	 * (non-Javadoc)
276
	 * @see org.gvsig.fmap.dal.coverage.datastruct.NoData#setNoDataTransparent(boolean)
277
	 */
278 234
	public void setNoDataTransparent(boolean noDataAsTransparent) {
279 235
		this.noDataAsTransparent = noDataAsTransparent;
280 236
	}
281 237
	
282
	/*
283
	 * (non-Javadoc)
284
	 * @see org.gvsig.fmap.dal.coverage.datastruct.NoData#getDataType()
285
	 */
286 238
	public int getDataType() {
287 239
		return dataType;
288 240
	}
289 241
	
290
	/*
291
	 * (non-Javadoc)
292
	 * @see org.gvsig.fmap.dal.coverage.datastruct.NoData#setDataType(int)
293
	 */
294 242
	public void setDataType(int datatype) {
295 243
		this.dataType = datatype;
296 244
	}
297 245
	
298
	/*
299
	 * (non-Javadoc)
300
	 * @see org.gvsig.fmap.dal.coverage.datastruct.NoData#compare(org.gvsig.fmap.dal.coverage.datastruct.NoData)
301
	 */
302 246
	@SuppressWarnings("unchecked")
303 247
	public boolean compare(NoData noData) {	
304 248
		String f = ((DefaultNoData)noData).fileName;
......
327 271
		return true;
328 272
	}
329 273
	
330
	/*
331
	 * (non-Javadoc)
332
	 * @see java.lang.Object#clone()
333
	 */
334 274
	public Object clone() {
335 275
		return new DefaultNoData(getValue(), getNativeValue(), fileName, bandCount);
336 276
	}
......
338 278
	//***********************************************
339 279
	//Only for file with more than one band
340 280
	
341
	/*
342
	 * (non-Javadoc)
343
	 * @see org.gvsig.fmap.dal.coverage.datastruct.NoData#getValueByBand(int)
344
	 */
345 281
	public Number getValueByBand(int nBand) {
346 282
		try {
347 283
			return noDataByBand.get(nBand);
......
350 286
		}
351 287
	}
352 288
	
353
	/*
354
	 * (non-Javadoc)
355
	 * @see org.gvsig.fmap.dal.coverage.datastruct.NoData#setValueByBand(java.lang.Number, int)
356
	 */
357 289
	public void setValueByBand(Number noDataValue, int nBand) {
358 290
		noDataByBand.add(nBand, noDataValue);
359 291
		setDataType(noDataValue);
360 292
	}
361 293

  
362
	/*
363
	 * (non-Javadoc)
364
	 * @see org.gvsig.fmap.dal.coverage.datastruct.NoData#getBandCount()
365
	 */
366 294
	public int getBandCount() {
367 295
		return bandCount;
368 296
	}
369 297
	
370
	/*
371
	 * (non-Javadoc)
372
	 * @see org.gvsig.fmap.dal.coverage.datastruct.NoData#setBandCount(int)
373
	 */
374 298
	public void setBandCount(int bandCount) {
375 299
		this.bandCount = bandCount;
376 300
	}
org.gvsig.raster.principalcomponents/trunk/org.gvsig.raster.principalcomponents/org.gvsig.raster.principalcomponents.app/org.gvsig.raster.principalcomponents.app.client/src/main/java/org/gvsig/raster/principalcomponents/app/PrincipalComponentsExtension.java
39 39
    private BasicAPISwingPanel   componentsPanel        = null;
40 40
    private MainWindow           windowMainPanel        = null;
41 41
    private MainWindow           windowComponentsPanel  = null;
42
    private MainWindow           statisticsPanel        = null;
42 43
    private FLyrRaster           lyr                    = null; 
43 44
    private PCStatsDataStructure stats                  = null; 
44 45
    
......
166 167
						(Boolean)result[1], 
167 168
						(Boolean)result[2], 
168 169
						(Boolean)result[3]);
169
				windowComponentsPanel = new MainWindow(statsPanel, 
170
				statisticsPanel = new MainWindow(statsPanel, 
170 171
	    				Messages.getText("stats"), 
171 172
	    				800, 500, 
172 173
	    				this,
173 174
	    				true);
174 175
	    		
175
	    		PluginServices.getMDIManager().addWindow(windowComponentsPanel);
176
	    		PluginServices.getMDIManager().addWindow(statisticsPanel);
176 177
			} catch (Exception e1) {
177 178
				RasterSwingLibrary.messageBoxError(Messages.getText("problems_creating_process"), null);
178 179
				return;
org.gvsig.raster.principalcomponents/trunk/org.gvsig.raster.principalcomponents/org.gvsig.raster.principalcomponents.algorithm/src/main/java/org/gvsig/raster/principalcomponents/algorithm/PrincipalComponentsProcess.java
145 145
					outputBuffer, 
146 146
					cellSize, 
147 147
					extentResult.getULX(), 
148
					extentResult.getULY());
148
					extentResult.getULY(),
149
					nodata);
149 150
			
150 151
			addOutputValue(FILENAME, filename);
151 152
			addOutputValue(GRAPHIC_DATA, filename);

Also available in: Unified diff