remove table and graph tabs only if there are no raster layers identified (#10376)

etiennesky · etiennesky · commit 7f30ad2d730c · 2014-06-10T11:50:18.000-03:00
diff --git a/src/app/qgsidentifyresultsdialog.cpp b/src/app/qgsidentifyresultsdialog.cpp
@@ -1041,6 +1041,7 @@ void QgsIdentifyResultsDialog::expandColumnsToFit()
 
 void QgsIdentifyResultsDialog::clear()
 {
+  QgsDebugMsg( "Entered" );
   for ( int i = 0; i < lstResults->topLevelItemCount(); i++ )
   {
     disconnectLayer( lstResults->topLevelItem( i )->data( 0, Qt::UserRole ).value<QObject *>() );
@@ -1052,9 +1053,6 @@ void QgsIdentifyResultsDialog::clear()
   tblResults->clearContents();
   tblResults->setRowCount( 0 );
 
-  tabWidget->removeTab( 1 );
-  tabWidget->removeTab( 1 );
-
   mPlot->setVisible( false );
   foreach ( QgsIdentifyPlotCurve *curve, mPlotCurves )
     delete curve;
@@ -1065,6 +1063,12 @@ void QgsIdentifyResultsDialog::clear()
   mPrintToolButton->setDisabled( true );
 }
 
+void QgsIdentifyResultsDialog::clearTabs()
+{
+  tabWidget->removeTab( 1 );
+  tabWidget->removeTab( 1 );
+}
+
 void QgsIdentifyResultsDialog::clearHighlights()
 {
   foreach ( QgsHighlight *h, mHighlights )
diff --git a/src/app/qgsidentifyresultsdialog.h b/src/app/qgsidentifyresultsdialog.h
@@ -155,6 +155,7 @@ class APP_EXPORT QgsIdentifyResultsDialog: public QDialog, private Ui::QgsIdenti
   public slots:
     /** Remove results */
     void clear();
+    void clearTabs();
 
     void show();
 
diff --git a/src/app/qgsmaptoolidentifyaction.cpp b/src/app/qgsmaptoolidentifyaction.cpp
@@ -95,6 +95,8 @@ void QgsMapToolIdentifyAction::canvasReleaseEvent( QMouseEvent *e )
   disconnect( this, SIGNAL( identifyProgress( int, int ) ), QgisApp::instance(), SLOT( showProgress( int, int ) ) );
   disconnect( this, SIGNAL( identifyMessage( QString ) ), QgisApp::instance(), SLOT( showStatusMessage( QString ) ) );
 
+  bool identifiedRaster = false;
+
   if ( !results.isEmpty() )
   {
     // Show the dialog before items are inserted so that items can resize themselves
@@ -106,6 +108,8 @@ void QgsMapToolIdentifyAction::canvasReleaseEvent( QMouseEvent *e )
     for ( result = results.begin(); result != results.end(); ++result )
     {
       resultsDialog()->addFeature( *result );
+      if ( result->mLayer->type() == QgsMapLayer::RasterLayer )
+        identifiedRaster = true;
     }
 
     // Call QgsIdentifyResultsDialog::show() to adjust with items
@@ -116,6 +120,9 @@ void QgsMapToolIdentifyAction::canvasReleaseEvent( QMouseEvent *e )
     resultsDialog()->clear();
     QgisApp::instance()->statusBar()->showMessage( tr( "No features at this position found." ) );
   }
+  // remove table and graph tabs if there are no rasters
+  if ( ! identifiedRaster )
+    resultsDialog()->clearTabs();
 }
 
 void QgsMapToolIdentifyAction::handleChangedRasterResults( QList<IdentifyResult> &results )

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,8 @@ void QgsMapToolIdentifyAction::canvasReleaseEvent( QMouseEvent *e )`
`95`	`95`	`disconnect( this, SIGNAL( identifyProgress( int, int ) ), QgisApp::instance(), SLOT( showProgress( int, int ) ) );`
`96`	`96`	`disconnect( this, SIGNAL( identifyMessage( QString ) ), QgisApp::instance(), SLOT( showStatusMessage( QString ) ) );`
`97`	`97`
	`98`	`+ bool identifiedRaster = false;`
	`99`	`+`
`98`	`100`	`if ( !results.isEmpty() )`
`99`	`101`	`{`
`100`	`102`	`// Show the dialog before items are inserted so that items can resize themselves`
`@@ -106,6 +108,8 @@ void QgsMapToolIdentifyAction::canvasReleaseEvent( QMouseEvent *e )`
`106`	`108`	`for ( result = results.begin(); result != results.end(); ++result )`
`107`	`109`	`{`
`108`	`110`	`resultsDialog()->addFeature( *result );`
	`111`	`+ if ( result->mLayer->type() == QgsMapLayer::RasterLayer )`
	`112`	`+ identifiedRaster = true;`
`109`	`113`	`}`
`110`	`114`
`111`	`115`	`// Call QgsIdentifyResultsDialog::show() to adjust with items`
`@@ -116,6 +120,9 @@ void QgsMapToolIdentifyAction::canvasReleaseEvent( QMouseEvent *e )`
`116`	`120`	`resultsDialog()->clear();`
`117`	`121`	`QgisApp::instance()->statusBar()->showMessage( tr( "No features at this position found." ) );`
`118`	`122`	`}`
	`123`	`+ // remove table and graph tabs if there are no rasters`
	`124`	`+ if ( ! identifiedRaster )`
	`125`	`+ resultsDialog()->clearTabs();`
`119`	`126`	`}`
`120`	`127`
`121`	`128`	`void QgsMapToolIdentifyAction::handleChangedRasterResults( QList<IdentifyResult> &results )`