remove table and graph tabs only if there are no raster layers identi…

…fied (qgis#10376)
SKrywinski · Jun 10, 2014 · 7f30ad2 · 7f30ad2
1 parent f97fa90
commit 7f30ad2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
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 )