Revision 36232
| trunk/extensions/extRasterTools-SE/src/org/gvsig/raster/gui/wizards/FileOpenRaster.java | ||
|---|---|---|
| 108 | 108 |
|
| 109 | 109 |
try {
|
| 110 | 110 |
FLyrRasterSE lyrRaster = null; |
| 111 |
lyrRaster = FLyrRasterSE.createLayer(file.getName(), file, null); |
|
| 112 | 111 |
|
| 112 |
String lyr_name = RasterToolsUtil.getLayerNameFromFile(file); |
|
| 113 |
lyrRaster = FLyrRasterSE.createLayer(lyr_name, file, null); |
|
| 114 |
|
|
| 113 | 115 |
// Si hay que generar las overviews por el panel de preferencias |
| 114 | 116 |
// if (Configuration.getValue("overviews_ask_before_loading", Boolean.FALSE).booleanValue() == true) {
|
| 115 | 117 |
// try {
|
| ... | ... | |
| 174 | 176 |
public Rectangle2D createLayer(File file, MapControl mapControl, String driverName, IProjection proj) {
|
| 175 | 177 |
this.mapControl = mapControl; |
| 176 | 178 |
FLyrRasterSE lyr = null; |
| 177 |
String layerName = file.getName(); |
|
| 179 |
|
|
| 180 |
String layerName = RasterToolsUtil.getLayerNameFromFile(file); |
|
| 178 | 181 |
int nLayer = -1; |
| 179 | 182 |
|
| 180 | 183 |
// Si hay capas en la lista la buscamos all? |
| trunk/extensions/extRasterTools-SE/src/org/gvsig/raster/FileNotFoundSolve.java | ||
|---|---|---|
| 4 | 4 |
|
| 5 | 5 |
import org.gvsig.fmap.raster.layers.FLyrRasterSE; |
| 6 | 6 |
import org.gvsig.fmap.raster.layers.ISolveErrorListener; |
| 7 |
import org.gvsig.raster.util.RasterToolsUtil; |
|
| 7 | 8 |
|
| 8 | 9 |
import com.hardcode.driverManager.Driver; |
| 9 | 10 |
import com.hardcode.gdbms.driver.exceptions.FileNotFoundDriverException; |
| ... | ... | |
| 42 | 43 |
*/ |
| 43 | 44 |
public void createLayer(File file){
|
| 44 | 45 |
try {
|
| 45 |
layer = FLyrRasterSE.createLayer(file.getName(), file.getAbsolutePath(), null); |
|
| 46 |
String lyr_name = RasterToolsUtil.getLayerNameFromFile(file); |
|
| 47 |
layer = FLyrRasterSE.createLayer(lyr_name, file.getAbsolutePath(), null); |
|
| 46 | 48 |
} catch (LoadLayerException e) {
|
| 47 | 49 |
solved = false; |
| 48 | 50 |
} |
| trunk/extensions/extRasterTools-SE/src/org/gvsig/raster/util/RasterToolsUtil.java | ||
|---|---|---|
| 42 | 42 |
import com.iver.cit.gvsig.fmap.layers.FLayers; |
| 43 | 43 |
import com.iver.cit.gvsig.project.Project; |
| 44 | 44 |
import com.iver.cit.gvsig.project.documents.view.gui.BaseView; |
| 45 |
import com.iver.utiles.XMLEntity; |
|
| 45 | 46 |
|
| 46 | 47 |
/** |
| 47 | 48 |
* Herramientas de uso general y que son dependientes de gvSIG, FMap o de |
| ... | ... | |
| 520 | 521 |
} |
| 521 | 522 |
return null; |
| 522 | 523 |
} |
| 524 |
|
|
| 525 |
/** |
|
| 526 |
* Returns layer name from raster file, checking user |
|
| 527 |
* layer naming preferences |
|
| 528 |
* |
|
| 529 |
* @param raster_file |
|
| 530 |
* @return |
|
| 531 |
*/ |
|
| 532 |
public static String getLayerNameFromFile(File raster_file) {
|
|
| 533 |
|
|
| 534 |
String layerName = raster_file.getName(); |
|
| 535 |
|
|
| 536 |
XMLEntity xml = PluginServices.getPluginServices("com.iver.cit.gvsig").getPersistentXML();
|
|
| 537 |
|
|
| 538 |
boolean showFileExtension; |
|
| 539 |
|
|
| 540 |
if (!xml.contains("ShowFileExtensions")) {
|
|
| 541 |
//not show by def |
|
| 542 |
showFileExtension = false; |
|
| 543 |
} else {
|
|
| 544 |
showFileExtension = xml.getBooleanProperty("ShowFileExtensions");
|
|
| 545 |
} |
|
| 546 |
|
|
| 547 |
int dot_index = layerName.lastIndexOf(".");
|
|
| 548 |
if (!showFileExtension && dot_index > 0) {
|
|
| 549 |
layerName = layerName.substring(0, dot_index); |
|
| 550 |
} |
|
| 551 |
return layerName; |
|
| 552 |
} |
|
| 553 |
|
|
| 554 |
|
|
| 523 | 555 |
} |
Also available in: Unified diff