From 1097e2e9eaedc6f749d91f0262fa5840a5f3bd01 Mon Sep 17 00:00:00 2001 From: timlinux Date: Fri, 21 May 2004 23:16:18 +0000 Subject: [PATCH] Nailed a serious bug - the gdal dataset was bing closed prematurely during pyramid generation causing it to fail. Refresh metadata in raster props tab after rasters created. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@1450 c8812cc2-4d05-0410-92ff-de0c093fc19c --- src/qgsrasterlayer.cpp | 10 +++++----- src/qgsrasterlayerproperties.cpp | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/qgsrasterlayer.cpp b/src/qgsrasterlayer.cpp index 23cad92a2ca..2539fdc83ca 100644 --- a/src/qgsrasterlayer.cpp +++ b/src/qgsrasterlayer.cpp @@ -2377,13 +2377,13 @@ void QgsRasterLayer::buildPyramids(RasterPyramidList theRasterPyramidList) //make sure the raster knows it has pyramids hasPyramidsFlag=true; } - std::cout << "Pyramid overviews built" << std::endl; - //close the gdal dataset and reopen it in read only mode - delete gdalDataset; - gdalDataset = (GDALDataset *) GDALOpen(dataSource, GA_ReadOnly); - emit setProgress(0,0); } + std::cout << "Pyramid overviews built" << std::endl; + //close the gdal dataset and reopen it in read only mode + delete gdalDataset; + gdalDataset = (GDALDataset *) GDALOpen(dataSource, GA_ReadOnly); + emit setProgress(0,0); } RasterPyramidList QgsRasterLayer::buildRasterPyramidList() { diff --git a/src/qgsrasterlayerproperties.cpp b/src/qgsrasterlayerproperties.cpp index 5db87092b40..24d38e620c9 100644 --- a/src/qgsrasterlayerproperties.cpp +++ b/src/qgsrasterlayerproperties.cpp @@ -754,7 +754,7 @@ void QgsRasterLayerProperties::buttonBuildPyramids_clicked() if ( myItem->isSelected() ) { //mark to be pyramided - myPyramidList[myCounterInt].existsFlag=true; + myPyramidList[myCounterInt+1].existsFlag=true; } } // @@ -791,5 +791,7 @@ void QgsRasterLayerProperties::buttonBuildPyramids_clicked() pixmapLegend->repaint(false); QgsLegendItem *myLegendItem = rasterLayer->legendItem(); ((QCheckListItem *) myLegendItem)->setPixmap(0, *rasterLayer->legendPixmap()); + //populate the metadata tab's text browser widget with gdal metadata info + txtbMetadata->setText(rasterLayer->getMetadata()); }