fix #2233

jef · jef · commit 9401c1069f61 · 2009-12-11T20:45:22.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12412 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp
@@ -281,14 +281,14 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer *lyr, QWidget *p
       if (( *myRasterPyramidIterator ).exists == true )
       {
         lbxPyramidResolutions->addItem( new QListWidgetItem( myPyramidPixmap,
-                                        QString::number(( *myRasterPyramidIterator ).xDim ) + QString( " x " ) +
-                                        QString::number(( *myRasterPyramidIterator ).yDim ) ) );
+                                        QString::number( myRasterPyramidIterator->xDim ) + QString( " x " ) +
+                                        QString::number( myRasterPyramidIterator->yDim ) ) );
       }
       else
       {
         lbxPyramidResolutions->addItem( new QListWidgetItem( myNoPyramidPixmap,
-                                        QString::number(( *myRasterPyramidIterator ).xDim ) + QString( " x " ) +
-                                        QString::number(( *myRasterPyramidIterator ).yDim ) ) );
+                                        QString::number( myRasterPyramidIterator->xDim ) + QString( " x " ) +
+                                        QString::number( myRasterPyramidIterator->yDim ) ) );
       }
     }
   }
@@ -557,14 +557,28 @@ void QgsRasterLayerProperties::sync()
 
   if ( mRasterLayerIsWms )
   {
-    tabBar->setCurrentWidget( tabPageMetadata );
-    tabBar->removeWidget( tabPageColormap );
+    QListWidgetItem *symbologyItem = listWidget->item( 0 );
+    QListWidgetItem *colormapItem = listWidget->item( 2 );
+    QListWidgetItem *metadataItem = listWidget->item( 4 );
+    QListWidgetItem *pyramidItem = listWidget->item( 5 );
+    QListWidgetItem *histogramItem = listWidget->item( 6 );
+
+    delete symbologyItem;
+    delete colormapItem;
+    delete pyramidItem;
+    delete histogramItem;
+
     tabBar->removeWidget( tabPageSymbology );
+    tabBar->removeWidget( tabPageColormap );
+    tabBar->removeWidget( tabPagePyramids );
+    tabBar->removeWidget( tabPageHistogram );
+
     gboxNoDataValue->setEnabled( false );
     gboxCustomTransparency->setEnabled( false );
-    tabBar->removeWidget( tabPageHistogram );
-    tabBar->removeWidget( tabPagePyramids );
+
+    listWidget->setCurrentItem( metadataItem );
   }
+
 #if 0
   if ( mRasterLayer->rasterType() == QgsRasterLayer::Multiband )
   {
@@ -1607,14 +1621,14 @@ void QgsRasterLayerProperties::on_buttonBuildPyramids_clicked()
     if (( *myRasterPyramidIterator ).exists == true )
     {
       lbxPyramidResolutions->addItem( new QListWidgetItem( myPyramidPixmap,
-                                      QString::number(( *myRasterPyramidIterator ).xDim ) + QString( " x " ) +
-                                      QString::number(( *myRasterPyramidIterator ).yDim ) ) );
+                                      QString::number( myRasterPyramidIterator->xDim ) + QString( " x " ) +
+                                      QString::number( myRasterPyramidIterator->yDim ) ) );
     }
     else
     {
       lbxPyramidResolutions->addItem( new QListWidgetItem( myNoPyramidPixmap,
-                                      QString::number(( *myRasterPyramidIterator ).xDim ) + QString( " x " ) +
-                                      QString::number(( *myRasterPyramidIterator ).yDim ) ) );
+                                      QString::number( myRasterPyramidIterator->xDim ) + QString( " x " ) +
+                                      QString::number( myRasterPyramidIterator->yDim ) ) );
     }
   }
   //update the legend pixmap

Original file line number	Diff line number	Diff line change
`@@ -281,14 +281,14 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer lyr, QWidget p`
`281`	`281`	`if (( *myRasterPyramidIterator ).exists == true )`
`282`	`282`	`{`
`283`	`283`	`lbxPyramidResolutions->addItem( new QListWidgetItem( myPyramidPixmap,`
`284`		`- QString::number(( *myRasterPyramidIterator ).xDim ) + QString( " x " ) +`
`285`		`- QString::number(( *myRasterPyramidIterator ).yDim ) ) );`
	`284`	`+ QString::number( myRasterPyramidIterator->xDim ) + QString( " x " ) +`
	`285`	`+ QString::number( myRasterPyramidIterator->yDim ) ) );`
`286`	`286`	`}`
`287`	`287`	`else`
`288`	`288`	`{`
`289`	`289`	`lbxPyramidResolutions->addItem( new QListWidgetItem( myNoPyramidPixmap,`
`290`		`- QString::number(( *myRasterPyramidIterator ).xDim ) + QString( " x " ) +`
`291`		`- QString::number(( *myRasterPyramidIterator ).yDim ) ) );`
	`290`	`+ QString::number( myRasterPyramidIterator->xDim ) + QString( " x " ) +`
	`291`	`+ QString::number( myRasterPyramidIterator->yDim ) ) );`
`292`	`292`	`}`
`293`	`293`	`}`
`294`	`294`	`}`
`@@ -557,14 +557,28 @@ void QgsRasterLayerProperties::sync()`
`557`	`557`
`558`	`558`	`if ( mRasterLayerIsWms )`
`559`	`559`	`{`
`560`		`- tabBar->setCurrentWidget( tabPageMetadata );`
`561`		`- tabBar->removeWidget( tabPageColormap );`
	`560`	`+ QListWidgetItem *symbologyItem = listWidget->item( 0 );`
	`561`	`+ QListWidgetItem *colormapItem = listWidget->item( 2 );`
	`562`	`+ QListWidgetItem *metadataItem = listWidget->item( 4 );`
	`563`	`+ QListWidgetItem *pyramidItem = listWidget->item( 5 );`
	`564`	`+ QListWidgetItem *histogramItem = listWidget->item( 6 );`
	`565`	`+`
	`566`	`+ delete symbologyItem;`
	`567`	`+ delete colormapItem;`
	`568`	`+ delete pyramidItem;`
	`569`	`+ delete histogramItem;`
	`570`	`+`
`562`	`571`	`tabBar->removeWidget( tabPageSymbology );`
	`572`	`+ tabBar->removeWidget( tabPageColormap );`
	`573`	`+ tabBar->removeWidget( tabPagePyramids );`
	`574`	`+ tabBar->removeWidget( tabPageHistogram );`
	`575`	`+`
`563`	`576`	`gboxNoDataValue->setEnabled( false );`
`564`	`577`	`gboxCustomTransparency->setEnabled( false );`
`565`		`- tabBar->removeWidget( tabPageHistogram );`
`566`		`- tabBar->removeWidget( tabPagePyramids );`
	`578`	`+`
	`579`	`+ listWidget->setCurrentItem( metadataItem );`
`567`	`580`	`}`
	`581`	`+`
`568`	`582`	`#if 0`
`569`	`583`	`if ( mRasterLayer->rasterType() == QgsRasterLayer::Multiband )`
`570`	`584`	`{`
`@@ -1607,14 +1621,14 @@ void QgsRasterLayerProperties::on_buttonBuildPyramids_clicked()`
`1607`	`1621`	`if (( *myRasterPyramidIterator ).exists == true )`
`1608`	`1622`	`{`
`1609`	`1623`	`lbxPyramidResolutions->addItem( new QListWidgetItem( myPyramidPixmap,`
`1610`		`- QString::number(( *myRasterPyramidIterator ).xDim ) + QString( " x " ) +`
`1611`		`- QString::number(( *myRasterPyramidIterator ).yDim ) ) );`
	`1624`	`+ QString::number( myRasterPyramidIterator->xDim ) + QString( " x " ) +`
	`1625`	`+ QString::number( myRasterPyramidIterator->yDim ) ) );`
`1612`	`1626`	`}`
`1613`	`1627`	`else`
`1614`	`1628`	`{`
`1615`	`1629`	`lbxPyramidResolutions->addItem( new QListWidgetItem( myNoPyramidPixmap,`
`1616`		`- QString::number(( *myRasterPyramidIterator ).xDim ) + QString( " x " ) +`
`1617`		`- QString::number(( *myRasterPyramidIterator ).yDim ) ) );`
	`1630`	`+ QString::number( myRasterPyramidIterator->xDim ) + QString( " x " ) +`
	`1631`	`+ QString::number( myRasterPyramidIterator->yDim ) ) );`
`1618`	`1632`	`}`
`1619`	`1633`	`}`
`1620`	`1634`	`//update the legend pixmap`