Revision 6508

View differences:

org.gvsig.raster/branches/org.gvsig.raster.2.4/org.gvsig.raster/org.gvsig.raster.tilecache/org.gvsig.raster.tilecache.app/org.gvsig.raster.tilecache.app.mainplugin/src/main/java/org/gvsig/raster/tilecache/app/mainplugin/AddTestRasterLayerExtension.java
59 59
import org.gvsig.raster.lib.buffer.api.Buffer;
60 60
import org.gvsig.raster.lib.buffer.api.exceptions.BufferException;
61 61
import org.gvsig.raster.tilecache.provider.TileCacheStoreProvider;
62
import org.gvsig.tools.dispose.DisposeUtils;
62 63
import org.gvsig.tools.dynobject.DynObject;
63 64

  
64 65
/**
......
90 91
        final MapContextManager mapContextManager = MapContextLocator.getMapContextManager();
91 92
        FLayer layer = null;
92 93
        DataManager dataManager = DALLocator.getDataManager();
93
//        DataStore dataStore = openFileCached(new File("/home/paco/data/cartography/raster/ecw/valencia_1980_tif.tif"));
94
        DataStore dataStore = openFileCached(new File("/home/paco/data/Testdata/raster/JPG/relieve_andalucia.png"));
94
        DataStore dataStore = null;
95
        try {
96
//        dataStore = openFileCached(new File("/home/paco/data/cartography/raster/ecw/valencia_1980_tif.tif"));
97
        dataStore = openFileCached(new File("/home/paco/data/Testdata/raster/JPG/relieve_andalucia.png"));
95 98
        String layerName = dataStore.getName();
96 99
        try {
97 100
            layer = mapContextManager.createLayer(layerName, dataStore);
......
103 106
        mapContext.getLayers().add(layer);
104 107
        mapContext.callLegendChanged();
105 108
        document.setModified(true);
109
        } finally {
110
            if (dataStore!=null){
111
                DisposeUtils.dispose(dataStore);
112
                dataStore = null;
113
            }
114
            if (layer!=null){
115
                DisposeUtils.dispose(layer);
116
                layer = null;
117
            }
118
        }
106 119
    }
107 120

  
108 121
    @Override
......
288 301
    private RasterStore openFileCached(File file){
289 302
        DataManagerProviderServices manager = DALSPILocator.getDataManagerProviderServices();
290 303
//        DataStoreProviderFactory providerFactory = manager.getStoreProviderFactory("GTiff");
291
        DataStoreProviderFactory providerFactory = manager.getStoreProviderFactory("JIMI");
304
        DataStoreProviderFactory providerFactory = manager.getStoreProviderFactory("PNG");
292 305
        DynObject params = providerFactory.createParameters();
293 306

  
294 307
        if (params.getDynClass().getDynField("file") != null) {
......
301 314
        RasterStore store = null;
302 315
        try {
303 316
//            store = (RasterStore) manager.openStore("GTiff", params);
304
            store = (RasterStore) manager.openStore("JIMI", params);
317
            store = (RasterStore) manager.openStore("PNG", params);
305 318
        } catch (ValidateDataParametersException | InitializeException | ProviderNotRegisteredException e) {
306 319
            logger.info("**** error opening store *****", e);
307 320
        }
org.gvsig.raster/branches/org.gvsig.raster.2.4/org.gvsig.raster/org.gvsig.fmap.dal.file.jimi/src/main/resources/org/gvsig/fmap/dal/file/jimi/JimiMetadata.xml
6 6
  <version>1.0.0</version>
7 7
  <classes>
8 8

  
9
    <class name="JIMI" namespace="Metadata">
9
    <class name="PNG" namespace="Metadata">
10 10
      <extends>
11 11
      	<class namespace="Metadata" name="SpatialProvider"/>
12 12
      </extends>
13
      <description>Metadata of a JIMI store</description>
13
      <description>Metadata of a PNG store</description>
14 14
      <fields>
15 15
      </fields>
16 16
    </class>
org.gvsig.raster/branches/org.gvsig.raster.2.4/org.gvsig.raster/org.gvsig.fmap.dal.file.jimi/src/main/java/org/gvsig/fmap/dal/file/jimi/JimiRasterStoreProvider.java
32 32
import java.io.File;
33 33
import java.util.ArrayList;
34 34
import java.util.Hashtable;
35
import java.util.LinkedHashMap;
35 36
import java.util.List;
36 37
import java.util.Map;
38
import java.util.Set;
37 39

  
38 40
import org.apache.commons.io.FileUtils;
39 41
import org.apache.commons.io.FilenameUtils;
40 42
import org.cresques.cts.IProjection;
43

  
41 44
import org.gvsig.fmap.dal.DALLocator;
42 45
import org.gvsig.fmap.dal.DataManager;
43 46
import org.gvsig.fmap.dal.DataServerExplorer;
......
84 87
import org.gvsig.tools.locator.LocatorException;
85 88
import org.gvsig.tools.task.SimpleTaskStatus;
86 89
import org.gvsig.tools.task.TaskStatusManager;
90

  
87 91
import org.slf4j.Logger;
88 92
import org.slf4j.LoggerFactory;
89 93

  
......
103 107
    private static final Logger logger =
104 108
        LoggerFactory.getLogger(JimiRasterStoreProvider.class);
105 109

  
106
    public static String NAME = "JIMI";
107
    public static String DESCRIPTION = "JIMI file";
110
    public static String NAME = "PNG";
111
    public static String DESCRIPTION = "PNG file";
108 112
    public static final String METADATA_DEFINITION_NAME = NAME;
109 113

  
110 114
    private ResourceProvider resource;
......
228 232

  
229 233
    @Override
230 234
    public BandInfo getBandInfo(int band) {
231
        return null;
235

  
236
        BufferManager bufferManager = BufferLocator.getBufferManager();
237
        String description;
238
        try {
239
            description = resource.getName()+ "- band "+band;
240
        } catch (AccessResourceException e) {
241
            description = "band "+band;
242
        }
243

  
244
        Map<Object, Object> values = new LinkedHashMap<Object, Object>();
245
        values.put("X size", image.columns);
246
        values.put("Y size", image.rows);
247
        values.put("NoData value", null);
248

  
249
        return bufferManager.createBandInfo(band, String.valueOf(band),
250
            description,
251
            image.dataType,
252
            new ArrayList<Map.Entry<Object, Object>>(values.entrySet()));
253

  
254

  
232 255
    }
233 256

  
234 257
    @Override

Also available in: Unified diff